Skip to content

Commit a498735

Browse files
rhaesungrhaesung
authored
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
1 parent 0682f90 commit a498735

20 files changed

+2856
-2356
lines changed

‎.cicd/Jenkinsfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,17 @@ def generateStage(nodeLabel) {
123123
catch(err) {
124124
echo "Error: Post Results from ${nodeLabel}"
125125
}
126+
sh '''
127+
export machine=${NODE_NAME}
128+
export CHANGE_ID=${CHANGE_ID}
129+
GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
130+
GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
131+
set +x
132+
133+
echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
134+
echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /${machine}-${label}"
135+
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}
136+
'''
126137
}
127138
}
128139
}

‎.cicd/scripts/post_test_results.sh‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,6 @@ function post_test() {
4141
GIT_URL=${GIT_URL:-"ufs-weather-model"}
4242
CHANGE_ID=${CHANGE_ID:-"develop"}
4343

44-
GIT_OWNER=$(echo ${GIT_URL} | cut -d '/' -f4)
45-
GIT_REPO_NAME=$(echo ${GIT_URL} | cut -d '/' -f5 | cut -d '.' -f1)
46-
47-
set +x
48-
echo "GIT_URL=${GIT_URL}"
49-
echo "CHANGE_ID=${CHANGE_ID}"
50-
echo "GIT_OWNER=${GIT_OWNER} GIT_REPO_NAME=${GIT_REPO_NAME}"
51-
52-
echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
53-
echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /${machine}-${label}"
54-
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}
55-
set -x
56-
5744
git config user.email "ecc.platform@noaa.gov"
5845
git config user.name "epic-cicd-jenkins"
5946

‎FV3‎

Submodule FV3 updated from c2eb454 to 2c902a6

‎tests/bl_date.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20250122
1+
export BL_DATE=20250129

‎tests/default_vars.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ export OUTPUT_HISTORY=.true.
566566
export HISTORY_FILE_ON_NATIVE_GRID=.false.
567567
export WRITE_DOPOST=.false.
568568
export NUM_FILES=2
569+
export FV3ATM_OUTPUT_DIR="./"
569570
export FILENAME_BASE="'atm' 'sfc'"
570571
export OUTPUT_GRID="'cubed_sphere_grid'"
571572
export OUTPUT_FILE="'netcdf'"

‎tests/fv3_conf/fv3_slurm.IN_hercules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ elif [[ @[RT_COMPILER] == gnu ]]; then
4444
export MV2_HOMOGENEOUS_CLUSTER=1
4545
export MV2_USE_ALIGNED_ALLOC=1
4646
fi
47+
export FI_MLX_INJECT_LIMIT=0
4748

4849
# Avoid job errors because of filesystem synchronization delays
4950
sync && sleep 1

‎tests/fv3_conf/fv3_slurm.IN_orion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export OMP_NUM_THREADS=@[THRD]
3535
#export PSM_SHAREDCONTEXTS=1
3636
export ESMF_RUNTIME_PROFILE=ON
3737
export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
38+
export FI_MLX_INJECT_LIMIT=0
3839

3940
# Avoid job errors because of filesystem synchronization delays
4041
sync && sleep 1

‎tests/logs/OpnReqTests_control_p8_hera.log‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Fri Jan 24 02:31:13 UTC 2025
1+
Sat Feb 1 18:53:28 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
5151
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
5252
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
5353

54-
0: The total amount of wall time = 261.209374
55-
0: The maximum resident set size (KB) = 1444280
54+
0: The total amount of wall time = 270.057953
55+
0: The maximum resident set size (KB) = 1439264
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/dbg_base_dbg_base
6262
Checking test dbg_base results ....
6363
Moving baseline dbg_base files ....
6464
Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
106106
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
107107
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
108108

109-
0: The total amount of wall time = 898.596863
110-
0: The maximum resident set size (KB) = 1423760
109+
0: The total amount of wall time = 884.936167
110+
0: The maximum resident set size (KB) = 1415620
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/dcp_dcp
117117
Checking test dcp results ....
118118
Comparing sfcf000.nc .....USING NCCMP......OK
119119
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
160160
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
161161
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
162162

163-
0: The total amount of wall time = 230.932286
164-
0: The maximum resident set size (KB) = 1426492
163+
0: The total amount of wall time = 239.687656
164+
0: The maximum resident set size (KB) = 1408888
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/mpi_mpi
171171
Checking test mpi results ....
172172
Comparing sfcf000.nc .....USING NCCMP......OK
173173
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
214214
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
215215
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
216216

217-
0: The total amount of wall time = 237.659021
218-
0: The maximum resident set size (KB) = 1420064
217+
0: The total amount of wall time = 237.302738
218+
0: The maximum resident set size (KB) = 1408804
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/rst_rst
225225
Checking test rst results ....
226226
Comparing sfcf000.nc .....USING NCCMP......OK
227227
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
268268
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
269269
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
270270

271-
0: The total amount of wall time = 234.966055
272-
0: The maximum resident set size (KB) = 1422512
271+
0: The total amount of wall time = 238.639967
272+
0: The maximum resident set size (KB) = 1419344
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/std_base_std_base
279279
Checking test std_base results ....
280280
Moving baseline std_base files ....
281281
Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
323323
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
324324
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
325325

326-
0: The total amount of wall time = 233.819689
327-
0: The maximum resident set size (KB) = 1414824
326+
0: The total amount of wall time = 305.316349
327+
0: The maximum resident set size (KB) = 1404484
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1945597/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3518014/thr_thr
334334
Checking test thr results ....
335335
Comparing sfcf000.nc .....USING NCCMP......OK
336336
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
377377
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
378378
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
379379

380-
0: The total amount of wall time = 231.400420
381-
0: The maximum resident set size (KB) = 1424780
380+
0: The total amount of wall time = 236.184426
381+
0: The maximum resident set size (KB) = 1418260
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Fri Jan 24 03:42:57 UTC 2025
387-
Elapsed time: 01h:11m:45s. Have a nice day!
386+
Sat Feb 1 20:08:14 UTC 2025
387+
Elapsed time: 01h:14m:46s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Fri Jan 24 00:53:56 UTC 2025
1+
Sat Feb 1 17:16:08 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1633720/dbg_base_dbg_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2893054/dbg_base_dbg_base
77
Checking test dbg_base results ....
88
Moving baseline dbg_base files ....
99
Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
6666
Moving RESTART/iced.2021-03-23-21600.nc .........OK
6767
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
6868

69-
0: The total amount of wall time = 2476.263104
70-
0: The maximum resident set size (KB) = 1491168
69+
0: The total amount of wall time = 2469.378750
70+
0: The maximum resident set size (KB) = 1490884
7171

7272
Test dbg_base PASS
7373

7474

7575
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
76-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1633720/rst_rst
76+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2893054/rst_rst
7777
Checking test rst results ....
7878
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
7979
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
135135
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
136136
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
137137

138-
0: The total amount of wall time = 662.263266
139-
0: The maximum resident set size (KB) = 1495952
138+
0: The total amount of wall time = 826.839054
139+
0: The maximum resident set size (KB) = 1478812
140140

141141
Test rst PASS
142142

143143

144144
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
145-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1633720/std_base_std_base
145+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2893054/std_base_std_base
146146
Checking test std_base results ....
147147
Moving baseline std_base files ....
148148
Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base files ....
205205
Moving RESTART/iced.2021-03-23-21600.nc .........OK
206206
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
207207

208-
0: The total amount of wall time = 666.677233
209-
0: The maximum resident set size (KB) = 1493700
208+
0: The total amount of wall time = 693.772947
209+
0: The maximum resident set size (KB) = 1477892
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Fri Jan 24 02:31:12 UTC 2025
215-
Elapsed time: 01h:37m:16s. Have a nice day!
214+
Sat Feb 1 18:53:27 UTC 2025
215+
Elapsed time: 01h:37m:20s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_hera.log‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Thu Jan 23 22:11:22 UTC 2025
1+
Sat Feb 1 14:39:08 UTC 2025
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
1515
Moving NATLEV.GrbF00 .........OK
1616
Moving NATLEV.GrbF06 .........OK
1717

18-
0: The total amount of wall time = 1400.218854
19-
0: The maximum resident set size (KB) = 768752
18+
0: The total amount of wall time = 1396.470249
19+
0: The maximum resident set size (KB) = 758488
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
25-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/dcp_dcp
2626
Checking test dcp results ....
2727
Comparing dynf000.nc .....USING NCCMP......OK
2828
Comparing dynf006.nc .....USING NCCMP......OK
@@ -33,14 +33,14 @@ Checking test dcp results ....
3333
Comparing NATLEV.GrbF00 .....USING CMP......OK
3434
Comparing NATLEV.GrbF06 .....USING CMP......OK
3535

36-
0: The total amount of wall time = 2207.914111
37-
0: The maximum resident set size (KB) = 724580
36+
0: The total amount of wall time = 2218.897881
37+
0: The maximum resident set size (KB) = 688420
3838

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
43-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/std_base_std_base
4444
Checking test std_base results ....
4545
Moving baseline std_base files ....
4646
Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
5252
Moving NATLEV.GrbF00 .........OK
5353
Moving NATLEV.GrbF06 .........OK
5454

55-
0: The total amount of wall time = 2203.715305
56-
0: The maximum resident set size (KB) = 714620
55+
0: The total amount of wall time = 2232.343734
56+
0: The maximum resident set size (KB) = 709996
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
62-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_905248/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1765652/thr_thr
6363
Checking test thr results ....
6464
Comparing dynf000.nc .....USING NCCMP......OK
6565
Comparing dynf006.nc .....USING NCCMP......OK
@@ -70,11 +70,11 @@ Checking test thr results ....
7070
Comparing NATLEV.GrbF00 .....USING CMP......OK
7171
Comparing NATLEV.GrbF06 .....USING CMP......OK
7272

73-
0: The total amount of wall time = 2202.404532
74-
0: The maximum resident set size (KB) = 724172
73+
0: The total amount of wall time = 2244.704154
74+
0: The maximum resident set size (KB) = 687828
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Fri Jan 24 00:56:07 UTC 2025
80-
Elapsed time: 02h:44m:46s. Have a nice day!
79+
Sat Feb 1 17:16:07 UTC 2025
80+
Elapsed time: 02h:36m:59s. Have a nice day!

0 commit comments

Comments
 (0)