diff --git a/Makefile b/Makefile index cc3344bef4b1d6d31a920a7b00d1c89efbeab759..8e4578934744a73166a8deeac87ea078622cf4ab 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ include local/dirs.inc include local/make.inc -MKLROOT = /usr/local/intel/composerxe/composer_xe_2015/mkl - EXEC = $(BINDIR)/helaz F90 = mpif90 @@ -23,7 +21,6 @@ dirs: mkdir -p $(BINDIR) mkdir -p $(OBJDIR) mkdir -p $(MODDIR) - mkdir -p $(CHCKPTDIR) src/srcinfo.h: ( cd src/srcinfo; $(MAKE);) @@ -77,7 +74,7 @@ $(OBJDIR)/utility_mod.o $(OBJDIR)/control.o : src/control.F90 $(OBJDIR)/auxval.o $(OBJDIR)/prec_const_mod.o $(OBJDIR)/basic_mod.o $(OBJDIR)/ppexit.o $(OBJDIR)/ppinit.o $(OBJDIR)/readinputs.o $(OBJDIR)/tesend.o $(F90) -c $(F90FLAGS) $(FPPFLAGS) $(EXTMOD) $(EXTINC) src/control.F90 -o $@ - $(OBJDIR)/fourier_mod.o : src/fourier_mod.F90 $(OBJDIR)/basic_mod.o $(OBJDIR)/prec_const_mod.o $(OBJDIR)/mkl_dfti.o $(OBJDIR)/grid_mod.o + $(OBJDIR)/fourier_mod.o : src/fourier_mod.F90 $(OBJDIR)/basic_mod.o $(OBJDIR)/prec_const_mod.o $(OBJDIR)/grid_mod.o $(F90) -c $(F90FLAGS) $(FPPFLAGS) $(EXTMOD) $(EXTINC) src/fourier_mod.F90 -o $@ $(OBJDIR)/diagnose.o : src/diagnose.F90 $(OBJDIR)/prec_const_mod.o $(OBJDIR)/array_mod.o $(OBJDIR)/basic_mod.o $(OBJDIR)/diagnostics_par_mod.o $(OBJDIR)/fields_mod.o $(OBJDIR)/grid_mod.o $(OBJDIR)/initial_par_mod.o $(OBJDIR)/model_mod.o $(OBJDIR)/time_integration_mod.o @@ -107,9 +104,6 @@ $(OBJDIR)/utility_mod.o $(OBJDIR)/memory.o : src/memory.F90 $ $(OBJDIR)/array_mod.o $(OBJDIR)/basic_mod.o $(OBJDIR)/fields_mod.o $(OBJDIR)/model_mod.o $(OBJDIR)/time_integration_mod.o $(OBJDIR)/grid_mod.o $(F90) -c $(F90FLAGS) $(FPPFLAGS) $(EXTMOD) $(EXTINC) src/memory.F90 -o $@ - $(OBJDIR)/mkl_dfti.o : $(MKLROOT)/include/mkl_dfti.f90 - $(F90) -c $(F90FLAGS) $(FPPFLAGS) $(EXTMOD) $(EXTINC) $(MKLROOT)/include/mkl_dfti.f90 -o $@ - $(OBJDIR)/model_mod.o : src/model_mod.F90 $(OBJDIR)/prec_const_mod.o $(F90) -c $(F90FLAGS) $(FPPFLAGS) $(EXTMOD) $(EXTINC) src/model_mod.F90 -o $@ diff --git a/local/dirs.inc b/local/dirs.inc index e5471f07bc17e63fa0f3fe8beadefa574ce266b1..ab2256e855bd6e69b9d1251b2b7131a24ac0ab59 100644 --- a/local/dirs.inc +++ b/local/dirs.inc @@ -7,7 +7,7 @@ LIBDIR = $(PREFIX)/lib MODDIR = $(PREFIX)/mod FMDIR = $(PREFIX)/FM FFTW3DIR = /home/ahoffman/lib/fftw-3.3.8 -CHCKPTDIR = $(PREFIX)/checkpoint +INTEL_LOCAL = /home/ahoffman/local/spcpc/intel FUTILS = /home/ahoffman/lib/futils_1.4/src # Naming ideas : HeLaZ, MoNoLiT (Moment Non Linear Torroidal) diff --git a/local/make.inc b/local/make.inc index bf16e391f6c60ae6d7c68b910c95323ec8652810..0aec7e26cdcb715bbc6e98e4baf18da7d84a0747 100644 --- a/local/make.inc +++ b/local/make.inc @@ -54,10 +54,10 @@ endif # ################################################################ -IDIRS := -I$(SPC_LOCAL)/include/$(OPTLEVEL) +IDIRS := -I$(INTEL_LOCAL)/include/$(OPTLEVEL) LIBS := -lfutils -lhdf5_fortran -lhdf5 -lz -ldl -lpthread -LDIRS := -L$(SPC_LOCAL)/lib/$(OPTLEVEL) -L$(HDF5)/lib +LDIRS := -L$(INTEL_LOCAL)/lib/$(OPTLEVEL) -L$(HDF5)/lib # Add Multiple-Precision Library LIBS += -lfm diff --git a/src/srcinfo.h b/src/srcinfo.h index a6564e943784033d91b96ac8cf1eecfa2ddc3fa6..0cc4fa8dda5bcec982ebb8e844ab533080959ad8 100644 --- a/src/srcinfo.h +++ b/src/srcinfo.h @@ -3,8 +3,8 @@ character(len=40) BRANCH character(len=20) AUTHOR character(len=40) EXECDATE character(len=40) HOST -parameter (VERSION='2c9ad20-dirty') +parameter (VERSION='fde3f88-dirty') parameter (BRANCH='MPI') parameter (AUTHOR='ahoffman') -parameter (EXECDATE='Wed Nov 25 17:26:17 CET 2020') +parameter (EXECDATE='Fri Nov 27 15:29:47 CET 2020') parameter (HOST ='spcpc606') diff --git a/src/srcinfo/srcinfo.h b/src/srcinfo/srcinfo.h index a6564e943784033d91b96ac8cf1eecfa2ddc3fa6..0cc4fa8dda5bcec982ebb8e844ab533080959ad8 100644 --- a/src/srcinfo/srcinfo.h +++ b/src/srcinfo/srcinfo.h @@ -3,8 +3,8 @@ character(len=40) BRANCH character(len=20) AUTHOR character(len=40) EXECDATE character(len=40) HOST -parameter (VERSION='2c9ad20-dirty') +parameter (VERSION='fde3f88-dirty') parameter (BRANCH='MPI') parameter (AUTHOR='ahoffman') -parameter (EXECDATE='Wed Nov 25 17:26:17 CET 2020') +parameter (EXECDATE='Fri Nov 27 15:29:47 CET 2020') parameter (HOST ='spcpc606')