Merge pull request #5 from transp/config-updates

Config file updates

Makefile

@@ -63,15 +63,19 @@ install:
 	@test -d $(INCDIR) || mkdir -p $(INCDIR)
 	@test -d $(TESTDR) || mkdir -p $(TESTDR)
 	@cp *.mod $(INCDIR)
+	@cp $(CZSDIR)/czspline_capi.h $(INCDIR)
 	@test ! -f $(LIBAR) || cp $(LIBAR) $(LIBDIR)
 	@test ! -f $(LIBSO) || cp $(LIBSO) $(LIBDIR)
 	@cp $(PSPDIR)/pspltest.output $(TESTDR)
+	@cp $(PSPDIR)/lookup_test.output $(TESTDR)
 	@cp $(EZSDIR)/ezspline_test.ref $(TESTDR)
 	@cp $(EZSDIR)/qk_pspline.output $(TESTDR)
+	@cp $(CZSDIR)/czspline_test.out $(TESTDR)
 	@test ! -f $(EXELUP) || cp $(EXELUP) $(TESTDR)
 	@test ! -f $(EXEPSP) || cp $(EXEPSP) $(TESTDR)
 	@test ! -f $(EXEQKS) || cp $(EXEQKS) $(TESTDR)
 	@test ! -f $(EXEEZS) || cp $(EXEEZS) $(TESTDR)
+	@test ! -f $(EXECZS) || cp $(EXECZS) $(TESTDR)
 
 debug:	FFLAGS += $(DFFLAGS)
 debug:	LDFLAGS += $(DFFLAGS)
@@ -83,7 +87,7 @@ debug:	$(EXEEZS)
 debug:	$(EXECZS)
 
 shared:	FFLAGS += $(SFFLAGS)
-shared:	LDFLAGS += $(SFFLAGS)
+shared:	LDFLAGS += $(SLDFLAGS)
 shared:	$(OBJS)
 	$(FC) $(LDFLAGS) -o $(LIBSO) $(OBJS)
 

README.md

@@ -32,7 +32,10 @@ Test programs are included in the source directories.
 
 ## Configuration
 
-See the sample configuration used at PPPL: pppl-bashrc
+See the sample configuration files in the config directory:
+
+pppl-bashrc   - configuration file used at PPPL (modules based)
+sample-bashrc - basic example configuration file
 
 
 ## Build

config/pppl-bashrc

@@ -0,0 +1,38 @@
+module purge
+module load git
+
+# Specify compiler (GCC, ICC, PGC):
+export COMPILER=ICC15
+
+if [ $COMPILER = 'ICC' -o $COMPILER = 'ICC19' ]; then
+    module load intel/2019.u3
+elif [ $COMPILER = 'ICC15' ]; then
+    module load intel/2015.u1
+elif [ $COMPILER = 'PGC' ]; then
+    module load pgf/19.1
+elif [ $COMPILER = 'GCC6' ]; then
+    module load gcc/6.1.0
+else
+    module load gcc/9.1.0
+fi
+
+module load szip
+module load curl
+module load hdf
+module load hdf5-serial
+module load netcdf-c
+module load netcdf-fortran
+
+if [ $COMPILER = 'ICC15' ]; then
+   export NETCDF_FORTRAN_HOME=$NETCDFHOME
+   export COMPILER=ICC
+elif [ $COMPILER = 'GCC6' ]; then
+   export NETCDF_FORTRAN_HOME=$NETCDFHOME
+   export COMPILER=GCC
+fi
+
+if [ ! -z "$NETCDF_FORTRAN_HOME" ]; then
+   export NETCDF_FLAGS=" -D_NETCDF"
+   export L_NETCDF=" -L$NETCDF_FORTRAN_HOME/lib -lnetcdff"
+   export I_NETCDF=" -I$NETCDF_FORTRAN_HOME/include"
+fi

config/sample-bashrc

@@ -0,0 +1,6 @@
+export COMPILER=GCC
+export FC=gfortran
+export CXX=g++
+export NETCDF_FLAGS=" -D_NETCDF"
+export L_NETCDF=" -L/usr/lib/x86_64-linux-gnu/lib -lnetcdff"
+export I_NETCDF=" -I/usr/include"