Merge NOAA-GSL gsl/develop into develop, update all GSL regression te…

…sts to use new GFS v16 C96L127 ICs, update macOS build config (ufs-community#937) *This PR is a major overhaul of the regression tests employing the physics developed at NOAA-GSL. The new control for these suites is now rap_control to move away from institutional names. Based on this new control, the analog to the operational requirements tests are added for decomposition, threading, restart etc. Feature tests are added that swap out individual physics one at a time. Most tests are created in DEBUG mode and run only for 1h to speed up the testing. Update .gitmodules and submodule pointer for fv3atm for gsl/develop branch
NOAA-GSL · Dec 13, 2021 · 56f3483 · 56f3483
1 parent ad95b73
commit 56f3483
Show file tree

Hide file tree

Showing 88 changed files with 6,648 additions and 10,527 deletions.
diff --git a/FV3 b/FV3
diff --git a/cmake/configure_macosx.gnu.cmake b/cmake/configure_macosx.gnu.cmake
@@ -1,4 +1,5 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
+set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
+set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
 
 # OpenMP broken for clang compiler
 if(${CMAKE_C_COMPILER_ID} MATCHES "^(Clang|AppleClang)$")

diff --git a/cmake/configure_macosx.intel.cmake b/cmake/configure_macosx.intel.cmake
@@ -0,0 +1,3 @@
+set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
+set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
+set(DEBUG_LINKMPI  OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/modulefiles/ufs_macosx.gnu b/modulefiles/ufs_macosx.gnu
@@ -22,20 +22,3 @@ export MPIF90=${MPIF90:-mpif90}
 ## load cmake
 ##
 export CMAKE_Platform=macosx.gnu
-
-##
-## use SIONlib library if installed and environment variable is set
-##
-SIONLIB=${SIONLIB:-}
-if [ ! "x$SIONLIB" == "x" ]; then
-  echo "Use SIONlib installation in ${SIONLIB}"
-  export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64"
-  export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none"
-fi
-
-##
-## Intel MKL library
-##
-#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
-#export MKL_INC="-m64 -I${MKL_DIR}/include"
-#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
diff --git a/modulefiles/ufs_macosx.gnu_debug b/modulefiles/ufs_macosx.gnu_debug
@@ -22,20 +22,3 @@ export MPIF90=${MPIF90:-mpif90}
 ## load cmake
 ##
 export CMAKE_Platform=macosx.gnu
-
-##
-## use SIONlib library if installed and environment variable is set
-##
-SIONLIB=${SIONLIB:-}
-if [ ! "x$SIONLIB" == "x" ]; then
-  echo "Use SIONlib installation in ${SIONLIB}"
-  export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64"
-  export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none"
-fi
-
-##
-## Intel MKL library
-##
-#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
-#export MKL_INC="-m64 -I${MKL_DIR}/include"
-#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
diff --git a/modulefiles/ufs_macosx.intel b/modulefiles/ufs_macosx.intel
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#%Module######################################################################
+##
+##    UFS prerequisites: MACOSX with clang/gfortran compilers
+
+echo "Setting environment variables for NEMSfv3gfs on MACOSX with icc/ifort"
+
+##
+## load programming environment: compiler, flags, paths
+##
+export CC=${MPICC:-mpicc}
+export CXX=${MPICXX:-mpicxx}
+export F77=${MPIF77:-mpif77}
+export F90=${MPIF90:-mpif90}
+export FC=${MPIFORT:-mpifort}
+export CPP=${CPP:-"${F90} -E -x f95-cpp-input"}
+export MPICC=${MPICC:-mpicc}
+export MPIF90=${MPIF90:-mpif90}
+
+##
+## load cmake
+##
+export CMAKE_Platform=macosx.intel
diff --git a/modulefiles/ufs_macosx.intel_debug b/modulefiles/ufs_macosx.intel_debug
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#%Module######################################################################
+##
+##    UFS prerequisites: MACOSX with clang/gfortran compilers
+
+echo "Setting environment variables for NEMSfv3gfs on MACOSX with icc/ifort"
+
+##
+## load programming environment: compiler, flags, paths
+##
+export CC=${MPICC:-mpicc}
+export CXX=${MPICXX:-mpicxx}
+export F77=${MPIF77:-mpif77}
+export F90=${MPIF90:-mpif90}
+export FC=${MPIFORT:-mpifort}
+export CPP=${CPP:-"${F90} -E -x f95-cpp-input"}
+export MPICC=${MPICC:-mpicc}
+export MPIF90=${MPIF90:-mpif90}
+
+##
+## load cmake
+##
+export CMAKE_Platform=macosx.intel
+9 −0		ccpp/data/GFS_typedefs.F90
+39 −16		ccpp/data/GFS_typedefs.meta
+12 −2		ccpp/driver/GFS_restart.F90
+1 −1		ccpp/physics
+0 −85		ccpp/suites/suite_FV3_GSD_SAR.xml
+0 −96		ccpp/suites/suite_FV3_GSD_noah.xml
+0 −95		ccpp/suites/suite_FV3_GSD_v0.xml
+0 −2		ccpp/suites/suite_FV3_HRRR.xml
+3 −4		ccpp/suites/suite_FV3_RAP_RRTMGP.xml
+1 −1		ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+91 −0		ccpp/suites/suite_FV3_RAP_flake.xml
+3 −4		ccpp/suites/suite_FV3_RAP_noah.xml
+2 −2		ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+1 −1		ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+2 −2		ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+0 −84		ccpp/suites/suite_FV3_RRFS_v1alpha.xml
+7 −3		io/FV3GFS_io.F90