Skip to content

remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction calculations in RRTMG and RRTMGP schemes #3042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gspetro-NOAA merged 15 commits into from
Mar 9, 2026
Merged

remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction calculations in RRTMG and RRTMGP schemes #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cc7d9ec
remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction ca…
Qingfu-Liu Jan 8, 2026
070cdf5
remove Zhao-Carr cloud schemes and merge Xu-Randall cloud fraction ca…
Qingfu-Liu Jan 8, 2026
fa1c7b5
update UFSATM hash
gspetro-NOAA Feb 25, 2026
210dfdb
sync w/develop
gspetro-NOAA Feb 25, 2026
d3631b1
ursa rt log
gspetro-NOAA Feb 25, 2026
05cf0cc
Merge branch 'develop' into Zhao_Carr_cloud
grantfirl Mar 4, 2026
56f644c
ORT Jobs Completed.
epic-cicd-jenkins Mar 5, 2026
959f5bb
add Derecho RT log: passed
jkbk2004 Mar 5, 2026
ba03221
orion rt log - passed
gspetro-NOAA Mar 5, 2026
708858f
hercules rt log - passed
gspetro-NOAA Mar 5, 2026
2f66beb
add ursa RT log passed
FernandoAndrade-NOAA Mar 5, 2026
600eae9
add gaeaC6 RT log passed
FernandoAndrade-NOAA Mar 5, 2026
5cf930f
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Mar 6, 2026
a70b561
Acorn RT Log: Passed
BrianCurtis-NOAA Mar 6, 2026
c8889b0
update UFSATM and .gitmodules
grantfirl Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UFSATM
Open in desktop
Submodule UFSATM updated 10 files
+0 −2 ccpp/config/ccpp_prebuild_config_fv3.py
+1 −5 ccpp/data/CCPP_typedefs.F90
+2 −35 ccpp/data/GFS_typedefs.F90
+0 −12 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+0 −89 ccpp/suites_not_used/suite_FV3_GFS_2017.xml
+0 −90 ccpp/suites_not_used/suite_FV3_GFS_2017_h2ophys.xml
+0 −89 ccpp/suites_not_used/suite_FV3_GFS_2017_ozphys_2015.xml
+0 −89 ccpp/suites_not_used/suite_FV3_GFS_2017_satmedmf.xml
+0 −89 ccpp/suites_not_used/suite_FV3_GFS_2017_satmedmfq.xml
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Mar 3 00:19:31 UTC 2026
Wed Mar 4 23:01:31 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -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 = 141.270395
0: The maximum resident set size (KB) = 2595324
0: The total amount of wall time = 137.791725
0: The maximum resident set size (KB) = 2588120

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -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 = 1221.569603
0: The maximum resident set size (KB) = 2531736
0: The total amount of wall time = 1232.071527
0: The maximum resident set size (KB) = 2550812

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -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 = 115.553824
0: The maximum resident set size (KB) = 2518688
0: The total amount of wall time = 523.259799
0: The maximum resident set size (KB) = 2515228

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -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 = 121.869815
0: The maximum resident set size (KB) = 2517108
0: The total amount of wall time = 112.970449
0: The maximum resident set size (KB) = 2503888

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -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 = 116.390029
0: The maximum resident set size (KB) = 2504944
0: The total amount of wall time = 119.124706
0: The maximum resident set size (KB) = 2503936

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -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 = 121.912859
0: The maximum resident set size (KB) = 2504512
0: The total amount of wall time = 122.939120
0: The maximum resident set size (KB) = 2508276

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684284/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -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 = 115.824736
0: The maximum resident set size (KB) = 2512884
0: The total amount of wall time = 336.428836
0: The maximum resident set size (KB) = 2514812

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Mar 3 01:22:29 UTC 2026
Elapsed time: 01h:02m:58s. Have a nice day!
Thu Mar 5 00:21:31 UTC 2026
Elapsed time: 01h:20m:00s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Mar 3 00:19:31 UTC 2026
Wed Mar 4 23:01:31 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684615/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170954/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -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 = 2990.097210
0: The maximum resident set size (KB) = 3023260
0: The total amount of wall time = 3026.477143
0: The maximum resident set size (KB) = 3024252

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684615/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170954/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -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 = 281.192451
0: The maximum resident set size (KB) = 2993944
0: The total amount of wall time = 284.475682
0: The maximum resident set size (KB) = 3002600

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684615/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170954/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -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 = 321.798130
0: The maximum resident set size (KB) = 2997112
0: The total amount of wall time = 283.763951
0: The maximum resident set size (KB) = 2998376

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Mar 3 01:43:24 UTC 2026
Elapsed time: 01h:23m:53s. Have a nice day!
Thu Mar 5 00:27:27 UTC 2026
Elapsed time: 01h:25m:56s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Mar 3 00:19:31 UTC 2026
Wed Mar 4 23:01:31 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684273/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving dynf000.nc .........OK
Expand All @@ -15,14 +15,14 @@ Moving baseline bit_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 289.791384
0: The maximum resident set size (KB) = 2065660
0: The total amount of wall time = 298.295321
0: The maximum resident set size (KB) = 2081192

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684273/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -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 = 197.767653
0: The maximum resident set size (KB) = 1716428
0: The total amount of wall time = 196.588471
0: The maximum resident set size (KB) = 1718536

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684273/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -52,14 +52,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 198.861193
0: The maximum resident set size (KB) = 1705368
0: The total amount of wall time = 197.293571
0: The maximum resident set size (KB) = 1706876

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1684273/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -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 = 203.178800
0: The maximum resident set size (KB) = 1710012
0: The total amount of wall time = 197.396008
0: The maximum resident set size (KB) = 1723320

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Mar 3 00:56:56 UTC 2026
Elapsed time: 00h:37m:25s. Have a nice day!
Wed Mar 4 23:43:03 UTC 2026
Elapsed time: 00h:41m:32s. Have a nice day!
Loading
Loading