managing portability

Makefile

 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 $@
 

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)

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

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')

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')