Merge pull request #6 from thomas-robinson/esm2021.02

Esm2021.02 update1
NOAA-GFDL · May 26, 2021 · eeede76 · eeede76
2 parents 6713f5c + 5f15b73
commit eeede76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/containers/Dockerfile.intel_sources b/containers/Dockerfile.intel_sources
@@ -103,7 +103,7 @@ ENV LIBRARY_PATH=${LD_LIBRARY_PATH}
 RUN mkdir -p /opt/ESM4
 RUN git clone --recursive https://github.com/NOAA-GFDL/ESM4.git -b 2021.02 \
  && cd ESM4/exec \
- && make HDF_INCLUDE=-I/opt/hdf5/include \
+ && make HDF_INCLUDE=-I/opt/hdf5/include HDF_LIBS="-L/opt/hdf5/lib -lhdf5 -lhdf5_fortran -lhdf5_hl -lhdf5hl_fortran" SH=sh \
  && cp esm4.1.x /opt/ESM4 \
  && make clean_all
 

diff --git a/exec/templates/gnu.mk b/exec/templates/gnu.mk
@@ -189,7 +189,7 @@ LDFLAGS += $(LIBS)
 # The macro TMPFILES is provided to slate files like the above for removal.
 
 RM = rm -f
-SHELL = /bin/sh
+SH = /bin/sh
 TMPFILES = .*.m *.B *.L *.i *.i90 *.l *.s *.mod *.opt
 
 .SUFFIXES: .F .F90 .H .L .T .f .f90 .h .i .i90 .l .o .s .opt .x

diff --git a/exec/templates/intel.mk b/exec/templates/intel.mk
@@ -242,7 +242,7 @@ LDFLAGS += $(LIBS)
 # The macro TMPFILES is provided to slate files like the above for removal.
 
 RM = rm -f
-SHELL = /bin/csh -f
+SH = /bin/csh -f
 TMPFILES = .*.m *.B *.L *.i *.i90 *.l *.s *.mod *.opt
 
 .SUFFIXES: .F .F90 .H .L .T .f .f90 .h .i .i90 .l .o .s .opt .x