diff --git a/makefile b/makefile index 3d2eb6f..6c0e9fa 100644 --- a/makefile +++ b/makefile @@ -109,6 +109,16 @@ else ifeq ($(CLUSTER),RAVEN) # For batch systems, set the following variable to the command used to run jobs. This variable is used by 'make test'. REGCOIL_COMMAND_TO_SUBMIT_JOB = srun +else ifeq ($(CLUSTER),lazerson) + REGCOIL_HOST=macports + FC = mpif90 + NETCDF_INC = $(shell nc-config --fflags) + NETCDF_LIB = $(shell nc-config --flibs) + EXTRA_COMPILE_FLAGS = -O2 -fexternal-blas -fopenmp -fallow-argument-mismatch -ffree-line-length-none $(NETCDF_INC) + EXTRA_LINK_FLAGS = -fopenmp -L/opt/local/lib -lopenblas $(NETCDF_LIB) + LIBSTELL_DIR = /Users/lazerson/bin/libstell_dir + LIBSTELL_FOR_REGCOIL = /Users/lazerson/bin/libstell.a + else REGCOIL_HOST=macports FC = mpif90 diff --git a/regcoil_read_input.f90 b/regcoil_read_input.f90 index ec18f30..29bc43e 100644 --- a/regcoil_read_input.f90 +++ b/regcoil_read_input.f90 @@ -34,6 +34,10 @@ subroutine regcoil_read_input if (didFileAccessWork /= 0) then print *,"Error! I was able to open the file ", trim(inputFilename), & " but not read data from the regcoil_nml namelist in it." + backspace(fileUnit) + read(fileUnit, fmt="(A)") inputFilename + print *, "Invalid line in namelist: ", trim(inputFilename) + print *, "(Error may be earlier)" if (didFileAccessWork==-1) then print *,"Make sure there is a carriage return after the / at the end of the namelist!" end if