Skip to content

Commit 32ecfcb

Browse files
grantfirlgrantfirl
committed
Merge branch 'feature/phys2dyn_gjf' into feature/phys2dyn_gjf2
2 parents f745404 + 71fbc5b commit 32ecfcb

23 files changed

Lines changed: 2409 additions & 2364 deletions

‎.cicd/scripts/regression_test.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ function regression_test() {
5252
cd tests
5353
pwd
5454

55-
[[ ${UFS_PLATFORM} =~ clusternoaa ]]
56-
mkdir -p logs/
57-
BL_DATE=$(cut -d '=' -f2 bl_date.conf)
58-
export BL_DATE
59-
6055
if [[ ${machine} =~ "Hercules" ]]
6156
then
6257
echo "Running regression tests on ${machine}"

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "UFSATM"]
22
path = UFSATM
3-
url = https://github.com/NOAA-EMC/ufsatm
4-
branch = develop
3+
url = https://github.com/grantfirl/fv3atm
4+
branch = feature/phys2dyn_gjf
55
[submodule "WW3"]
66
path = WW3
77
url = https://github.com/NOAA-EMC/WW3

‎UFSATM‎

‎cmake/configure_aws-ec2.intel.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)

‎tests/bl_date.conf‎

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

‎tests/fv3_conf/gfs_mpas_run.IN‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ if [ $IMP_PHYSICS = 8 ]; then
5151
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
5252
fi
5353

54+
#TEMPO
55+
if [ $IMP_PHYSICS = 88 ]; then
56+
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
57+
rm qr_acr_qsV2.dat
58+
rm qr_acr_qgV2.dat
59+
rm freezeH2O.dat
60+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_freezeH2O.dat .
61+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQG.dat .
62+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_HAILAWARE_QRacrQG.dat .
63+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQS.dat .
64+
fi
65+
5466
#prognostic aerosols
5567
if [ $CPLCHM = .true. ]; then
5668
cp ${PATHRT}/parm/gocart/*.rc .

‎tests/fv3_conf/rrfs_mpas_run.IN‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ if [ $IMP_PHYSICS = 8 ]; then
5151
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
5252
fi
5353

54+
#TEMPO
55+
if [ $IMP_PHYSICS = 88 ]; then
56+
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
57+
rm qr_acr_qsV2.dat
58+
rm qr_acr_qgV2.dat
59+
rm freezeH2O.dat
60+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_freezeH2O.dat .
61+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQG.dat .
62+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_HAILAWARE_QRacrQG.dat .
63+
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQS.dat .
64+
fi
5465
#prognostic aerosols
5566
if [ $CPLCHM = .true. ]; then
5667
cp ${PATHRT}/parm/gocart/*.rc .

‎tests/logs/OpnReqTests_control_p8_ursa.log‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Mon May 18 04:07:30 UTC 2026
1+
Tue Jun 9 00:33:30 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 154.561041
55-
0: The maximum resident set size (KB) = 2595308
54+
0: The total amount of wall time = 147.274487
55+
0: The maximum resident set size (KB) = 2610812
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/dbg_base_dbg_base
61+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 2816.840595
110-
0: The maximum resident set size (KB) = 2558072
109+
0: The total amount of wall time = 1228.138754
110+
0: The maximum resident set size (KB) = 2537264
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/dcp_dcp
116+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 120.997630
164-
0: The maximum resident set size (KB) = 2501268
163+
0: The total amount of wall time = 658.199595
164+
0: The maximum resident set size (KB) = 2513908
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/mpi_mpi
170+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 118.532067
218-
0: The maximum resident set size (KB) = 2519620
217+
0: The total amount of wall time = 658.988212
218+
0: The maximum resident set size (KB) = 2520156
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/rst_rst
224+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 121.208605
272-
0: The maximum resident set size (KB) = 2508936
271+
0: The total amount of wall time = 118.796896
272+
0: The maximum resident set size (KB) = 2510020
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/std_base_std_base
278+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 634.867273
327-
0: The maximum resident set size (KB) = 2526272
326+
0: The total amount of wall time = 614.876531
327+
0: The maximum resident set size (KB) = 2525108
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_918154/thr_thr
333+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3540971/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 = 123.068752
381-
0: The maximum resident set size (KB) = 2493484
380+
0: The total amount of wall time = 126.129799
381+
0: The maximum resident set size (KB) = 2504268
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Mon May 18 05:48:48 UTC 2026
387-
Elapsed time: 01h:41m:19s. Have a nice day!
386+
Tue Jun 9 02:03:54 UTC 2026
387+
Elapsed time: 01h:30m:25s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_ursa.log‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Mon May 18 04:08:32 UTC 2026
1+
Tue Jun 9 00:34:30 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_927072/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3550860/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 = 296.168178
19-
0: The maximum resident set size (KB) = 2062368
18+
0: The total amount of wall time = 296.361070
19+
0: The maximum resident set size (KB) = 2080588
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
25-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_927072/dcp_dcp
25+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3550860/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 = 203.464696
37-
0: The maximum resident set size (KB) = 1722872
36+
0: The total amount of wall time = 216.738998
37+
0: The maximum resident set size (KB) = 1715128
3838

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
43-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_927072/std_base_std_base
43+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3550860/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 = 209.555907
56-
0: The maximum resident set size (KB) = 1721488
55+
0: The total amount of wall time = 205.426821
56+
0: The maximum resident set size (KB) = 1719512
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
62-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_927072/thr_thr
62+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_3550860/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 = 206.622781
74-
0: The maximum resident set size (KB) = 1720148
73+
0: The total amount of wall time = 208.749714
74+
0: The maximum resident set size (KB) = 1717140
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Mon May 18 04:45:00 UTC 2026
80-
Elapsed time: 00h:36m:28s. Have a nice day!
79+
Tue Jun 9 01:28:11 UTC 2026
80+
Elapsed time: 00h:53m:41s. Have a nice day!

0 commit comments

Comments
 (0)