Merge branch 'develop' into main

noaa-ocs-modeling · Jul 11, 2023 · aed739d · aed739d
2 parents 9aa706f + db3fade
commit aed739d
Show file tree

Hide file tree

Showing 12 changed files with 426 additions and 43 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -35,3 +35,6 @@
 [submodule "SCHISM/schism-esmf"]
 	path = SCHISM/schism-esmf
 	url = https://github.com/schism-dev/schism-esmf.git
+[submodule "FVCOM"]
+	path = FVCOM
+	url = https://github.com/pvelissariou1/FVCOM
diff --git a/FVCOM b/FVCOM
diff --git a/NEMS b/NEMS
diff --git a/images/coastalapp_models.png b/images/coastalapp_models.png
diff --git a/modulefiles/envmodules_gnu.tacc b/modulefiles/envmodules_gnu.tacc
@@ -7,12 +7,12 @@
 ### Date:   June 26 2021
 ###########################################################################
 
-#----------
-[[ "$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
+##----------
 
 ####################
 # Get the directory where the script is located

diff --git a/modulefiles/envmodules_intel.hera b/modulefiles/envmodules_intel.hera
@@ -31,9 +31,9 @@ module load cmake
 module use /scratch2/STI/coastal/common/apps/modulefiles
 module load hpc-common
 
-module load hpc-intel/19.0.5.281 hpc-impi
+#module load hpc-intel/19.0.5.281 hpc-impi
 #module load hpc-intel/2020.2 hpc-impi
-#module load hpc-intel/2022.1.2 hpc-impi
+module load hpc-intel/2022.1.2 hpc-impi
 #module load hpc-intel/2022.3.0 hpc-impi
 
 module load hdf5/1.10.9 netcdf/4.7.4

diff --git a/modulefiles/envmodules_intel.hera.sys b/modulefiles/envmodules_intel.hera.sys
@@ -28,9 +28,9 @@ myDIRS="${myDIRS} . ${APPMODS_DIR}"
 module purge
 module load cmake
 
-module load intel/19.0.5.281 impi/2019.0.5
+#module load intel/19.0.5.281 impi/2019.0.5
 #module load intel/2020.2    impi/2020.2
-#module load intel/2022.1.2  impi/2022.1.2
+module load intel/2022.1.2  impi/2022.1.2
 #module load intel/2022.3.0  impi/2022.3.0
 
 module load hdf5/1.10.6 netcdf/4.7.0

diff --git a/modulefiles/envmodules_intel.orion b/modulefiles/envmodules_intel.orion
@@ -31,9 +31,9 @@ module load cmake
 module use /work/noaa/nosofs/pvelissa/apps/modulefiles
 module load hpc-common
 
-module load hpc-intel/2019.5 hpc-impi
+#module load hpc-intel/2019.5 hpc-impi
 #module load hpc-intel/2020.2 hpc-impi
-#module load hpc-intel/2022.1.2 hpc-impi
+module load hpc-intel/2022.1.2 hpc-impi
 
 module load hdf5/1.10.9 netcdf/4.7.4
 module load proj/4.8.0

diff --git a/modulefiles/envmodules_intel.orion.sys b/modulefiles/envmodules_intel.orion.sys
@@ -28,10 +28,10 @@ myDIRS="${myDIRS} . ${APPMODS_DIR}"
 module purge
 module load cmake
 
-module load intel/2019.5   impi/2019.6
+#module load intel/2019.5   impi/2019.6
 #module load intel/2020.2   impi/2020.2
 #module load intel/2021.2   impi/2021.2
-#module load intel/2022.1.2 impi/2022.1.2
+module load intel/2022.1.2 impi/2022.1.2
 
 module load hdf5/1.10.6  netcdf/4.7.4
 # NOT AVAILABLE module load proj

diff --git a/modulefiles/envmodules_intel.pworks b/modulefiles/envmodules_intel.pworks
@@ -31,9 +31,9 @@ module load cmake
 module use /contrib/coastal/common/apps/modulefiles
 module load hpc-common
 
-module load hpc-intel/19.0.5.281 hpc-impi
+#module load hpc-intel/19.0.5.281 hpc-impi
 #module load hpc-intel/2020.2 hpc-impi
-#module load hpc-intel/2022.1.2 hpc-impi
+module load hpc-intel/2022.1.2 hpc-impi
 #module load hpc-intel/2022.3.0 hpc-impi
 
 module load hdf5/1.10.9 netcdf/4.7.4

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -235,6 +235,9 @@ compileDateTime
 
 compileMetis
   compileERR=$(( ${compileERR:-0} + $? ))
+
+compileFVCOMLibs
+  compileERR=$(( ${compileERR:-0} + $? ))
 ###========================================
 ### END :: install thirdparty_open libraries and programs
 ###========================================