Skip to content

Commit

Permalink
Merge pull request #25 from landreman/feature/NML_ERROUT
Browse files Browse the repository at this point in the history
Feature/nml errout
  • Loading branch information
landreman authored Jan 28, 2025
2 parents 2ff93fc + 6ba663c commit 6f5e3f7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
10 changes: 10 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions regcoil_read_input.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6f5e3f7

Please sign in to comment.