Merge branch 'ufs-community:develop' into fix/derecho

Author: natalie-perlin

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "UFSATM"]
   path = UFSATM
-  url = https://github.com/NOAA-EMC/fv3atm
+  url = https://github.com/NOAA-EMC/ufsatm
   branch = develop
 [submodule "WW3"]
   path = WW3

MOM6-interface/MOM6

@@ -0,0 +1,31 @@
+help([[
+Load environment to compile ufs-weather-model in a container using Intel
+]])
+
+prepend_path("MODULEPATH", "/opt/spack-stack/spack-stack-1.9.2/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/opt/spack-stack/spack-stack-1.9.2/envs/unified-env/install/modulefiles/intel-oneapi-mpi/2021.13-argr3sd/gcc/11.4.0")
+
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
+
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+load(pathJoin("cmake", cmake_ver))
+
+load("ufs_common")
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
+setenv("CC", "mpiicx")
+setenv("CXX", "mpiicpx")
+setenv("FC", "mpiifort")
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_CXX", "icpx")
+setenv("I_MPI_F90", "ifort")
+
+setenv("CMAKE_Platform", "container.intel")
+
+whatis("Description: UFS build environment")

UFSATM

@@ -28,7 +28,7 @@ export SMONTH=07
 export SDAY=23
 export SHOUR=00
 export RESTART_INTERVAL=0
-export CDMBWD=${CDMBWD_c48}
+export CDMBGWD=${CDMBGWD_c48}
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
 export WRITE_DOPOST=.true.

modulefiles/ufs_container.intel.lua

@@ -1 +1 @@
-export BL_DATE=20250828
+export BL_DATE=20250915

tests-dev/test_cases/tests/2020_CAPE

@@ -31,7 +31,7 @@ urls[base]='https://github.com/ufs-community/ufs-weather-model'
 branches[base]='develop'
 pathes[base]=''
 
-urls[ufsatm]='https://github.com/NOAA-EMC/fv3atm'
+urls[ufsatm]='https://github.com/NOAA-EMC/ufsatm'
 branches[ufsatm]='develop'
 pathes[ufsatm]='UFSATM'
 

tests/bl_date.conf

@@ -66,6 +66,9 @@ case ${MACHINE_ID} in
     fi
     if [[ ${MACHINE_ID} == gaeac6 ]]; then
       module reset
+    elif [[ ${MACHINE_ID} == container ]]; then
+      source /usr/lmod/lmod/init/bash
+      module purge
     elif [[ ${MACHINE_ID} == hercules ]]; then
       module purge
     fi

tests/ci/repo_check.sh

@@ -736,14 +736,14 @@ export_gfs_physics ()
     export DO_UGWP_V0_NST_ONLY=.false.
 
     # GWG resolution dependent settings
-    export CDMBWD_c48='0.071,2.1,1.0,1.0'
-    export CDMBWD_c96='0.14,1.8,1.0,1.0'
-    export CDMBWD_c192='0.23,1.5,1.0,1.0'
-    export CDMBWD_c384='1.1,0.72,1.0,1.0'
-    export CDMBWD_c768='4.0,0.15,1.0,1.0'
+    export CDMBGWD_c48='0.071,2.1,1.0,1.0'
+    export CDMBGWD_c96='0.14,1.8,1.0,1.0'
+    export CDMBGWD_c192='0.23,1.5,1.0,1.0'
+    export CDMBGWD_c384='1.1,0.72,1.0,1.0'
+    export CDMBGWD_c768='4.0,0.15,1.0,1.0'
 
     # set default
-    export CDMBWD=${CDMBWD_c96}
+    export CDMBGWD=${CDMBGWD_c96}
 
     # PBL
     export ISATMEDMF=1
@@ -1088,14 +1088,14 @@ export KNOB_UGWP_TAUAMP=3.0e-3
 export DO_UGWP_V0_NST_ONLY=.false.
 
 # resolution dependent settings
-export CDMBWD_c48='0.071,2.1,1.0,1.0'
-export CDMBWD_c96='0.14,1.8,1.0,1.0'
-export CDMBWD_c192='0.23,1.5,1.0,1.0'
-export CDMBWD_c384='1.1,0.72,1.0,1.0'
-export CDMBWD_c768='4.0,0.15,1.0,1.0'
+export CDMBGWD_c48='0.071,2.1,1.0,1.0'
+export CDMBGWD_c96='0.14,1.8,1.0,1.0'
+export CDMBGWD_c192='0.23,1.5,1.0,1.0'
+export CDMBGWD_c384='1.1,0.72,1.0,1.0'
+export CDMBGWD_c768='4.0,0.15,1.0,1.0'
 
 # set default
-export CDMBWD=${CDMBWD_c96}
+export CDMBGWD=${CDMBGWD_c96}
 
 if [[ ${default_dt_atmos} = 1 ]]; then
   export DT_INNER=${DT_INNER_c96}
@@ -1429,6 +1429,7 @@ export_tiled() {
   export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
   export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
   export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
+  export LSM=2
   export LANDICE=".false."
 }
 
@@ -1845,6 +1846,7 @@ export FHZERO=6
 export IALB=2
 export IEMS=2
 export LSM=2
+export LANDICE=.false.
 export IOPT_DVEG=4
 export IOPT_CRS=2
 export IOPT_RAD=3
@@ -2172,15 +2174,16 @@ export IOPT_RAD=1
 export IOPT_ALB=2
 export IOPT_STC=1
 export LSM=1
+export LANDICE=.true.
 export DO_GSL_DRAG_LS_BL=.true.
 export DO_GSL_DRAG_SS=.true.
 export DO_GSL_DRAG_TOFD=.true.
 export IMP_PHYSICS=11
 export IAER=111
 export CNVGWD=.false.
 export LTAEROSOL=.false.
+export CDMBGWD=1.0,1.0,1.0,1.0
 export MRAEROSOL=.false.
-export CDMBWD=1.0,1.0,1.0,1.0
 export LHEATSTRG=.false.
 export LRADAR=.true.
 export ICPLOCN2ATM=0
@@ -2437,7 +2440,7 @@ export RANDOM_CLDS=.false.
 export CNVCLD=.false.
 export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
-export CDMBWD='3.5,1.0'
+export CDMBGWD='3.5,1.0'
 export DO_SPPT=.false.
 export DO_SHUM=.false.
 export DO_SKEB=.false.
@@ -2536,4 +2539,5 @@ export_rrfs_v1()
   export LHEATSTRG=.false.
   export LSM=2
   export LSOIL_LSM=4
+  export LANDICE=.false.
 }

tests/compile.sh

@@ -8,6 +8,12 @@
 #
 # Thank you for your contribution
 
+# Overwrite auto-detect if in container
+if [[ -d /opt/spack-stack && -v SINGULARITY_CONTAINER ]]; then
+  # We are in a container
+  MACHINE_ID=container
+fi
+
 # If the MACHINE_ID variable is set, skip this script.
 [[ -n ${MACHINE_ID:-} ]] && return
 
@@ -70,6 +76,12 @@ fi
 # Overwrite auto-detect with MACHINE if set
 MACHINE_ID=${MACHINE:-${MACHINE_ID}}
 
+# Overwrite auto-detect if in container
+if [[ -d /opt/spack-stack && -v SINGULARITY_CONTAINER ]]; then
+  # We are in a container
+  MACHINE_ID=container
+fi
+
 # If MACHINE_ID is no longer UNKNNOWN, return it
 if [[ "${MACHINE_ID}" != "UNKNOWN" ]]; then
   return
@@ -112,6 +124,9 @@ elif [[ -d /gpfs/f6 && -d /ncrc ]]; then
 elif [[ -d /data/prod ]]; then
   # We are on SSEC's S4
   MACHINE_ID=s4
+elif [[ -d /opt/spack-stack && -v SINGULARITY_CONTAINER ]]; then
+  # We are in a container
+  MACHINE_ID=container
 else
   echo WARNING: UNKNOWN PLATFORM 1>&2
 fi