Merge branch 'develop' into feature/rad-fix

LarissaReames-NOAA · Feb 10, 2025 · 833d967 · 833d967
2 parents cd4f030 + d57779f
commit 833d967
Show file tree

Hide file tree

Showing 28 changed files with 2,262 additions and 2,432 deletions.
diff --git a/.cicd/scripts/disk_usage.sh b/.cicd/scripts/disk_usage.sh
@@ -25,10 +25,10 @@ echo "script_dir=${script_dir}"
 declare workspace
 if [[ -d "${WORKSPACE}/${UFS_PLATFORM}" ]]; then
     workspace="${WORKSPACE}/${UFS_PLATFORM}"
-    outfile="${4:-${workspace}-${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
+    outfile="${4:-${WORKSPACE}/${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
 else
     workspace="$(cd -- "${script_dir}/../.." && pwd)"
-    outfile="${4:-${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
+    outfile="${4:-${WORKSPACE}/${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
 fi
 echo "workspace=${workspace}"
 echo "outfile=${outfile}"

diff --git a/.cicd/scripts/wm_build.sh b/.cicd/scripts/wm_build.sh
@@ -63,7 +63,7 @@ module list
 echo "Pipeline Building WM on ${UFS_PLATFORM} ${UFS_COMPILER} with Account=${ACCNR}."
 export CMAKE_FLAGS="-DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16"
 /usr/bin/time -p \
-	-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_build.json \
+	-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_build.json \
 	-f '{\n  "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
 	./build.sh | tee ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-wm_build-log.txt
 status=${PIPESTATUS[0]}

diff --git a/.cicd/scripts/wm_init.sh b/.cicd/scripts/wm_init.sh
@@ -35,6 +35,6 @@ fi
 echo "machine_id=<${machine_id}>"
 
 /usr/bin/time -p \
-	-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_init.json \
+	-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_init.json \
 	-f '{\n  "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
 	pwd
diff --git a/.cicd/scripts/wm_test.sh b/.cicd/scripts/wm_test.sh
@@ -102,7 +102,7 @@ if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
 		ls -al .cicd/*
 		echo "Pipeline Creating Baseline Tests ${WM_OPERATIONAL_TESTS:=default} on ${UFS_PLATFORM} ${UFS_COMPILER}"
 		/usr/bin/time -p \
-			-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
+			-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
 			-f '{\n  "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
 			./.cicd/scripts/create_baseline.sh | tee -a ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-wm_test-log.txt
 		status=${PIPESTATUS[0]}
@@ -113,7 +113,7 @@ if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
 		ls -al .cicd/*
 		echo "Pipeline Running Regression Tests ${WM_OPERATIONAL_TESTS:=default} on ${UFS_PLATFORM} ${UFS_COMPILER}"
 		/usr/bin/time -p \
-			-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
+			-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
 			-f '{\n  "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
 			./.cicd/scripts/regression_test.sh | tee -a ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-wm_test-log.txt
 		status=${PIPESTATUS[0]}

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -145,7 +145,6 @@ Please delete what is not needed.
   - [ ] Hera
   - [ ] Orion
   - [ ] Hercules
-  - [ ] Jet
   - [ ] GaeaC5
   - [ ] GaeaC6
   - [ ] Derecho

diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/modulefiles/ufs_expanse.intel b/modulefiles/ufs_expanse.intel
diff --git a/modulefiles/ufs_odin b/modulefiles/ufs_odin
diff --git a/modulefiles/ufs_stampede.intel b/modulefiles/ufs_stampede.intel
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20250129
+export BL_DATE=20250205
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -363,20 +363,6 @@ elif [[ ${MACHINE_ID} = derecho ]]; then
   export WPG_cpl_atmw_gdas=24
   export WAV_tasks_atmw_gdas=248
 
-elif [[ ${MACHINE_ID} = stampede ]]; then
-
-  echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
-  exit 1
-
-  # TPN_dflt=48 ; INPES_dflt=3 ; JNPES_dflt=8
-  # TPN_thrd=24 ; INPES_thrd=3 ; JNPES_thrd=4
-  # TPN_c384=20 ; INPES_c384=8 ; JNPES_c384=6
-  # TPN_c768=20 ; INPES_c768=8 ; JNPES_c768=16
-  # TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
-
-  # TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
-  # THRD_cpl_atmw_gdas=4; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
-
 elif [[ ${MACHINE_ID} = noaacloud ]] ; then
 
     if [[ ${PW_CSP} == aws ]]; then
@@ -415,18 +401,6 @@ elif [[ ${MACHINE_ID} = noaacloud ]] ; then
     export ICE_tasks_cpl_thrd=10
     export WAV_tasks_cpl_thrd=12
 
-elif [[ ${MACHINE_ID} = expanse ]]; then
-
-  echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
-  exit 1
-
-  # TPN_dflt=64 ; INPES_dflt=3 ; JNPES_dflt=8
-  # TPN_thrd=64 ; INPES_thrd=3 ; JNPES_thrd=4
-  # TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
-
-  # TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
-  # THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
-
 else
 
   echo "Unknown MACHINE_ID ${MACHINE_ID}"

diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
@@ -48,13 +48,9 @@ case $(hostname -f) in
   derecho7.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho7
   derecho8.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho8
 
-  login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4
-
   login[1-4].frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera1-4
   c*.frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera compute 
 
-  login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2
-
   discover3[1-5].prv.cube) MACHINE_ID=discover ;; ### discover31-35
   *) MACHINE_ID=UNKNOWN ;;  # Unknown platform
 esac

diff --git a/tests/fv3_conf/fv3_slurm.IN_expanse b/tests/fv3_conf/fv3_slurm.IN_expanse
diff --git a/tests/fv3_conf/fv3_slurm.IN_stampede b/tests/fv3_conf/fv3_slurm.IN_stampede
+1 −1		cice.setup
+5 −2		cicecore/cicedyn/general/ice_flux.F90
+1 −1		cicecore/cicedyn/general/ice_init.F90
+10 −10		cicecore/cicedyn/infrastructure/ice_grid.F90
+5 −1		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+2 −2		cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
+1 −1		cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
+6 −10		configuration/scripts/machines/Macros.derecho_gnu
+10 −10		configuration/scripts/machines/env.derecho_gnu
+6 −6		configuration/scripts/machines/env.perlmutter_cray
+9 −7		configuration/scripts/machines/env.perlmutter_gnu
+7 −7		configuration/scripts/machines/env.perlmutter_intel
+1 −1		configuration/scripts/tests/cice.lcov.csh
+1 −1		icepack