Updates to radiation, cloud, and land processes for improved surface …

…temperature and radiative flux biases + Allow model_configure to provide a path for FV3ATM output ufs-community#2581 + Update CICD to move label deletion to Jenkinsfile ufs-community#2568 (ufs-community#2548) * UFSWM - Updates to radiation, cloud, and land processes for improved surface temperature and radiative flux biases + Allow users to provide custom paths for fv3atm output. Default `./` is retained for the regression testing of the ufs-weather-model + Move CI label deletion to Jenkinsfile * FV3 - Updates to radiation, cloud, and land processes for improved surface temperature and radiative flux biases * ccpp-physics - Updates to radiation, cloud, and land processes for improved surface temperature and radiative flux biases
NickSzapiro-NOAA · Feb 3, 2025 · a498735 · a498735
1 parent 0682f90
commit a498735
Show file tree

Hide file tree

Showing 20 changed files with 2,856 additions and 2,356 deletions.
diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile
@@ -123,6 +123,17 @@ def generateStage(nodeLabel) {
                     catch(err) {
                         echo "Error: Post Results from ${nodeLabel}"
                     }
+			sh '''
+			    export machine=${NODE_NAME}
+			    export CHANGE_ID=${CHANGE_ID}
+			    GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
+			    GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
+			    set +x
+
+			    echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
+			    echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /${machine}-${label}"
+			    curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
+			'''
                 }
               }
             }

diff --git a/.cicd/scripts/post_test_results.sh b/.cicd/scripts/post_test_results.sh
@@ -41,19 +41,6 @@ function post_test() {
 	GIT_URL=${GIT_URL:-"ufs-weather-model"}
 	CHANGE_ID=${CHANGE_ID:-"develop"}
 
-	GIT_OWNER=$(echo ${GIT_URL} | cut -d '/' -f4)
-	GIT_REPO_NAME=$(echo ${GIT_URL} | cut -d '/' -f5 | cut -d '.' -f1)
-
-set +x
-	echo "GIT_URL=${GIT_URL}"
-	echo "CHANGE_ID=${CHANGE_ID}"
-	echo "GIT_OWNER=${GIT_OWNER} GIT_REPO_NAME=${GIT_REPO_NAME}"
-
-	echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
-	echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /${machine}-${label}"
-	curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/${machine}-${label}
-set -x
-
 	git config user.email "[email protected]"
 	git config user.name "epic-cicd-jenkins"
 

diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20250122
+export BL_DATE=20250129
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -566,6 +566,7 @@ export OUTPUT_HISTORY=.true.
 export HISTORY_FILE_ON_NATIVE_GRID=.false.
 export WRITE_DOPOST=.false.
 export NUM_FILES=2
+export FV3ATM_OUTPUT_DIR="./"
 export FILENAME_BASE="'atm' 'sfc'"
 export OUTPUT_GRID="'cubed_sphere_grid'"
 export OUTPUT_FILE="'netcdf'"

diff --git a/tests/fv3_conf/fv3_slurm.IN_hercules b/tests/fv3_conf/fv3_slurm.IN_hercules
@@ -44,6 +44,7 @@ elif [[ @[RT_COMPILER] == gnu ]]; then
   export MV2_HOMOGENEOUS_CLUSTER=1
   export MV2_USE_ALIGNED_ALLOC=1
 fi
+export FI_MLX_INJECT_LIMIT=0
 
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1

diff --git a/tests/fv3_conf/fv3_slurm.IN_orion b/tests/fv3_conf/fv3_slurm.IN_orion
@@ -35,6 +35,7 @@ export OMP_NUM_THREADS=@[THRD]
 #export PSM_SHAREDCONTEXTS=1
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
+export FI_MLX_INJECT_LIMIT=0
 
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1

diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Fri Jan 24 02:31:13 UTC 2025
+Sat Feb  1 18:53:28 UTC 2025
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 261.209374
-  0: The maximum resident set size (KB)                   = 1444280
+  0: The total amount of wall time                        = 270.057953
+  0: The maximum resident set size (KB)                   = 1439264
 
 Test bit_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 898.596863
-  0: The maximum resident set size (KB)                   = 1423760
+  0: The total amount of wall time                        = 884.936167
+  0: The maximum resident set size (KB)                   = 1415620
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 230.932286
-  0: The maximum resident set size (KB)                   = 1426492
+  0: The total amount of wall time                        = 239.687656
+  0: The maximum resident set size (KB)                   = 1408888
 
 Test dcp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 237.659021
-  0: The maximum resident set size (KB)                   = 1420064
+  0: The total amount of wall time                        = 237.302738
+  0: The maximum resident set size (KB)                   = 1408804
 
 Test mpi PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 234.966055
-  0: The maximum resident set size (KB)                   = 1422512
+  0: The total amount of wall time                        = 238.639967
+  0: The maximum resident set size (KB)                   = 1419344
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 233.819689
-  0: The maximum resident set size (KB)                   = 1414824
+  0: The total amount of wall time                        = 305.316349
+  0: The maximum resident set size (KB)                   = 1404484
 
 Test std_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 231.400420
-  0: The maximum resident set size (KB)                   = 1424780
+  0: The total amount of wall time                        = 236.184426
+  0: The maximum resident set size (KB)                   = 1418260
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan 24 03:42:57 UTC 2025
-Elapsed time: 01h:11m:45s. Have a nice day!
+Sat Feb  1 20:08:14 UTC 2025
+Elapsed time: 01h:14m:46s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log b/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
@@ -1,9 +1,9 @@
-Fri Jan 24 00:53:56 UTC 2025
+Sat Feb  1 17:16:08 UTC 2025
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1633720/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2893054/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 2476.263104
-  0: The maximum resident set size (KB)                   = 1491168
+  0: The total amount of wall time                        = 2469.378750
+  0: The maximum resident set size (KB)                   = 1490884
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1633720/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2893054/rst_rst
 Checking test rst results ....
  Comparing sfcf021.tile1.nc .....USING NCCMP......OK
  Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 662.263266
-  0: The maximum resident set size (KB)                   = 1495952
+  0: The total amount of wall time                        = 826.839054
+  0: The maximum resident set size (KB)                   = 1478812
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1633720/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2893054/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 666.677233
-  0: The maximum resident set size (KB)                   = 1493700
+  0: The total amount of wall time                        = 693.772947
+  0: The maximum resident set size (KB)                   = 1477892
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan 24 02:31:12 UTC 2025
-Elapsed time: 01h:37m:16s. Have a nice day!
+Sat Feb  1 18:53:27 UTC 2025
+Elapsed time: 01h:37m:20s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_regional_control_hera.log b/tests/logs/OpnReqTests_regional_control_hera.log
@@ -1,9 +1,9 @@
-Thu Jan 23 22:11:22 UTC 2025
+Sat Feb  1 14:39:08 UTC 2025
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 1400.218854
-  0: The maximum resident set size (KB)                   = 768752
+  0: The total amount of wall time                        = 1396.470249
+  0: The maximum resident set size (KB)                   = 758488
 
 Test bit_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/dcp_dcp
 Checking test dcp results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -33,14 +33,14 @@ Checking test dcp results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 2207.914111
-  0: The maximum resident set size (KB)                   = 724580
+  0: The total amount of wall time                        = 2218.897881
+  0: The maximum resident set size (KB)                   = 688420
 
 Test dcp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 2203.715305
-  0: The maximum resident set size (KB)                   = 714620
+  0: The total amount of wall time                        = 2232.343734
+  0: The maximum resident set size (KB)                   = 709996
 
 Test std_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/thr_thr
 Checking test thr results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -70,11 +70,11 @@ Checking test thr results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 2202.404532
-  0: The maximum resident set size (KB)                   = 724172
+  0: The total amount of wall time                        = 2244.704154
+  0: The maximum resident set size (KB)                   = 687828
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan 24 00:56:07 UTC 2025
-Elapsed time: 02h:44m:46s. Have a nice day!
+Sat Feb  1 17:16:07 UTC 2025
+Elapsed time: 02h:36m:59s. Have a nice day!