support SCHISM and SCHISM-ESMF (#108)

* add PaHM as submodule * add SCHISM submodules * Test ground for the inclusion of SCHISM into the NEMS application * Added infrastructure for platiform macports * update submodules * update README.md * update submodules (after pushing) * update submodules after amending * update submodules after merging / amending * removed `schism-esmf` submodule * update schism-esmf * update modulefile for Orion * updated SCHISM submodule pointer to master branch * added cmake to some modulefiles * reorder * update `schism-esmf` location in `SCHISM` * changes to modulefiles * updated modules for Orion * updated PaHM submodule to point to newest commit + changed name to PAHM * updated PaHM sources to include the nuopc folder * update modulefile to use stable parallel ESMF build * modules are under emc-nemspara * updated build scripts to fix compilation errors * added nuopc/Makefile.in and modified distclean.cmake to not delete the top level Makefiles * modified the work/cmprflags.mk file for intel * updated the modulefiles/* files to be more general and mofified the file scripts/functions_build to include the additional supported platforms * fixed the bug for use_defaults * fixed conf/configure.nems* files to set the NETCDF libraries properly * fixed orion compiling issues * fixed MACHINE_ID variables * switched the hera and orion environment modulefiles to theis sys state * commended out the LICENSE line in the orion cmake file * updated submodule * update submodule * fixed the missing nemsio issue * deleted the old build scripts * updated the modulefile for intel in orion * updated the build and function scripts * modified the build script to find the functions_build file; in some systems was failing to find it * modified PAHM build scripts * updates PaHM build scripts * update modules * updated submodules * fixed the build script to allow the user to define customized names for the parallel compilers * fixed functions_build to remove NEMS/exe/NEMS*.x if requested * modified component_ADCIRC.mk so distclean cleans properly the nuopc folder * updated submodule * Added environment file for femto/intel (#52) * Added environment file for femto/intel * Removed hardcoded CC/FC env variables form build script Co-authored-by: Carsten Lemmen <[email protected]> * updated ESMF to latest parallel build * updated the envmodules_*.linux files to load the proper modules * fixed the gnu configure file to include the correct compilers and compiler flags * fixed make_nuopc.sh to set the compiler variable correctly * minor fix of module_EARTH_GRID_COMP.F90 line 2956 to comile with gfortran * fix module_EARTH_GRID_COMP.F90 to compile with gfortran * fix component_ADCIRC.mk to pass the correct compiler option to make_nuopc.sh script * updated submodules * Support Mac gnu compiler options (#67) * Added environment file for femto/intel * Removed hardcoded CC/FC env variables form build script * Removed fp-model strict from mac configure.nems.mac*.gnu files Co-authored-by: Carsten Lemmen <[email protected]> * updated ADCIRC to cherry-pick .gitignore organization * make build script executable * updated pointer for filename rename * change name to `CoastalApp` * updated strand configuration for CoastalApp * Added configure.nems.femto.intel to repo * Added configure.nems.strand.intel * Set NETCDF variable for strand/intel * update pointer to the latest SCHISM commit * On `feature/schism` Added configure.nems.femto.intel to repo (#87) * Added configure.nems.femto.intel to repo * Added configure.nems.strand.intel * Set NETCDF variable for strand/intel Co-authored-by: Carsten Lemmen <[email protected]> Co-authored-by: Zachary Burnett <[email protected]> * added PaHM submodule * updated pointers for PaHM and NEMS * updated NEMS pointer * updated pointers * added submodule pointer to `schism-esmf` on the toplevel * updated SCHISM-ESMF submodule * updated SCHISM-ESMF submodule * removed submodules * changed SCHISM submodule to point to schism-esmf * updated SCHISM submodule to fix URL * Fixed netcdf c libs on mistral * remove submodule * moved SCHISM submodules into shared SCHISM folder in root directory * Disable error checking on gnu/macosx * Ignore build directory in SCHISM subdir * Updated pointer to SCHISM/schism-esmf * updated SCHISM and SCHISM-ESMF submodules to point to new multicore code * Added draft envmodules files for levante * Added draft envmodules files for levante (#104) Co-authored-by: Carsten Lemmen <[email protected]> * restore SCHISM build * updated SCHISM ESMF pointer to new commit * updated NEMS and SCHISM pointers * Updated schism-esmf pointer * Updated nems pointer on feature/schism (needs also upstream PR) * updated NEMS submodule to point to new SCHISM commits * updated ADCIRC submodule to point to new notre_dame branch * updated WW3 submodule to point to same commit as develop Co-authored-by: Panagiotis Velissariou <[email protected]> Co-authored-by: Carsten Lemmen <[email protected]> Co-authored-by: Carsten Lemmen <[email protected]> Co-authored-by: Carsten Lemmen <[email protected]> Co-authored-by: zacharyburnett <[email protected]>
noaa-ocs-modeling · Apr 28, 2022 · 56baa02 · 56baa02
1 parent ff1269c
commit 56baa02
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/NEMS b/NEMS
diff --git a/SCHISM/schism b/SCHISM/schism
diff --git a/SCHISM/schism-esmf b/SCHISM/schism-esmf
diff --git a/modulefiles/envmodules_gnu.levante b/modulefiles/envmodules_gnu.levante
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash-*-Shell-script-functions*-
+#!/bin/bash-*-Shell-script-modules*-
 
 ###########################################################################
 ### Module File to load the required environment modules for the NEMS application

diff --git a/modulefiles/envmodules_gnu.macosx b/modulefiles/envmodules_gnu.macosx
@@ -8,10 +8,10 @@
 ###########################################################################
 
 #----------
-[[ "$0" == "bash" || "$0" == "-bash" ]] && retv=return || retv=exit
-echo "$(basename ${BASH_SOURCE[0]}) :: This environment is either not configured or not supported"
-echo "  Exiting ..."
-${retv} 1
+#[[ "$0" == "bash" || "$0" == "-bash" ]] && retv=return || retv=exit
+#echo "$(basename ${BASH_SOURCE[0]}) :: This environment is either not configured or not supported"
+#echo "  Exiting ..."
+#${retv} 1
 #----------
 
 # This script is responsible for loading modules that are

diff --git a/modulefiles/envmodules_intel.femto b/modulefiles/envmodules_intel.femto
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash-*-Shell-script-functions*-
+#!/bin/bash-*-Shell-script-modules*-
 
 # This script is responsible for loading modules that are
 # compatible with the NUOPC Layer version used in NEMS.

diff --git a/modulefiles/envmodules_intel.levante b/modulefiles/envmodules_intel.levante
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash-*-Shell-script-functions*-
+#!/bin/bash-*-Shell-script-modules*-
 
 ###########################################################################
 ### Module File to load the required environment modules for the NEMS application

diff --git a/modulefiles/envmodules_intel.mistral b/modulefiles/envmodules_intel.mistral
@@ -55,7 +55,7 @@ export NETCDFPATH=$(nc-config --prefix)
 export NETCDF_CONFIG=${NETCDFHOME:+${NETCDFHOME}/bin/nc-config}
 
 export NETCDF_INCDIR="$(nc-config --includedir) -I$(nf-config --includedir)"
-export NETCDF_LIBDIR="$(nc-config --prefix)/lib $(nf-config --flibs)"
+export NETCDF_LIBDIR="$(nc-config --prefix)/lib $(nc-config --libs) $(nf-config --flibs)"
 
 export ESMFMKFILE=${ESMFMKFILE}
 ########## END:: PLATFORM CUSTOMIZED SETTINGS ##########
diff --git a/modulefiles/envmodules_intel.strand b/modulefiles/envmodules_intel.strand
@@ -50,6 +50,7 @@ unset funcs
 # (this should be done automatically when loading this file - todo).
 #export HDF5_USE_FILE_LOCKING=FALSE
 
+export NETCDF=$(nc-config --prefix)
 export NETCDFHOME=$(nc-config --prefix)
 export NETCDF_CONFIG=${NETCDFHOME:+${NETCDFHOME}/bin/nc-config}
 export NETCDF_INCDIR=${NETCDFHOME:+${NETCDFHOME}/include}

diff --git a/scripts/functions_build b/scripts/functions_build
@@ -70,7 +70,7 @@ MY_ATM_MODS="ATMESH PAHM"
 #MY_ATM_MODS="ATMESH WRF HWRF PAHM"
 
 ##### Ocean components
-MY_OCN_MODS="ADCIRC"
+MY_OCN_MODS="ADCIRC SCHISM"
 #MY_OCN_MODS="ADCIRC SCHISM FVCOM ROMS"
 
 ##### Hydrologic components