Skip to content

Commit

Permalink
Combination for CCPP-physics ufs-community#213 and ufs-community#218 …
Browse files Browse the repository at this point in the history 
…(H2O scheme refactor and C3/SAS/MYNN fix) (ufs-community#2408)

* UFSWM - Refactor NRL h2o photochemical scheme; add "tendency_of_vertically_diffused_tracer_concentration" as output 
     from the MYNN PBL scheme
  * FV3 - Refactor NRL h2o photochemical scheme; add "tendency_of_vertically_diffused_tracer_concentration" as output from 
     the MYNN PBL scheme
      * ccpp-physics - Refactor NRL h2o photochemical scheme; add "tendency_of_vertically_diffused_tracer_concentration" as 
         output from the MYNN PBL scheme
  • Loading branch information
@grantfirl
grantfirl authored Aug 29, 2024
1 parent 94a3cd7 commit 1c4fcf1
Show file tree
Hide file tree
Showing 12 changed files with 2,357 additions and 2,357 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 46 files
+7 −2 ccpp/config/ccpp_prebuild_config.py
+23 −15 ccpp/data/GFS_typedefs.F90
+25 −1 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_flake.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_ras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+1 −1 ccpp/suites/suite_FV3_HRRR.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_c3.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_gf.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+1 −1 ccpp/suites/suite_FV3_RAP.xml
+1 −1 ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RAP_clm_lake.xml
+1 −1 ccpp/suites/suite_FV3_RAP_flake.xml
+1 −1 ccpp/suites/suite_FV3_RAP_noah.xml
+1 −1 ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+1 −1 ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1beta.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+1 −1 ccpp/suites/suite_FV3_WoFS_v0.xml
+1 −1 ccpp/suites/suite_FV3_global_nest_v1.xml
+1 −1 ccpp/suites/suite_RRFSens_phy1.xml
+1 −1 ccpp/suites/suite_RRFSens_phy2.xml
+1 −1 ccpp/suites/suite_RRFSens_phy3.xml
+1 −1 ccpp/suites/suite_RRFSens_phy4.xml
+1 −1 ccpp/suites/suite_RRFSens_phy5.xml
62 changes: 31 additions & 31 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 26 19:59:54 UTC 2024
Wed Aug 28 16:38:17 UTC 2024
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_255239/bit_base_bit_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 282.094574
0: The maximum resident set size (KB) = 1459728
0: The total amount of wall time = 283.800402
0: The maximum resident set size (KB) = 1450532

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_255239/dbg_base_dbg_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 985.479617
0: The maximum resident set size (KB) = 1417884
0: The total amount of wall time = 1002.626814
0: The maximum resident set size (KB) = 1429052

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_255239/dcp_dcp
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 248.873990
0: The maximum resident set size (KB) = 1437132
0: The total amount of wall time = 248.583783
0: The maximum resident set size (KB) = 1432708

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_255239/mpi_mpi
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 252.449329
0: The maximum resident set size (KB) = 1422488
0: The total amount of wall time = 249.643527
0: The maximum resident set size (KB) = 1421840

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_255239/rst_rst
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 252.763505
0: The maximum resident set size (KB) = 1423640
0: The total amount of wall time = 247.585723
0: The maximum resident set size (KB) = 1424180

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_255239/std_base_std_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 253.485325
0: The maximum resident set size (KB) = 1438440
0: The total amount of wall time = 251.398349
0: The maximum resident set size (KB) = 1433732

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_255239/thr_thr
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_900266/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 = 247.766378
0: The maximum resident set size (KB) = 1411920
0: The total amount of wall time = 253.650286
0: The maximum resident set size (KB) = 1425568

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 26 21:14:01 UTC 2024
Elapsed time: 01h:14m:07s. Have a nice day!
Wed Aug 28 18:05:07 UTC 2024
Elapsed time: 01h:26m:50s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 26 18:51:21 UTC 2024
Wed Aug 28 19:02:31 UTC 2024
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_2593550/dbg_base_dbg_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_859064/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 = 1361.846982
0: The maximum resident set size (KB) = 1537900
0: The total amount of wall time = 1352.171779
0: The maximum resident set size (KB) = 1527368

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_2593550/rst_rst
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_859064/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 = 715.515398
0: The maximum resident set size (KB) = 1525500
0: The total amount of wall time = 434.264661
0: The maximum resident set size (KB) = 1521224

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_2593550/std_base_std_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_859064/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 = 435.784809
0: The maximum resident set size (KB) = 1528568
0: The total amount of wall time = 429.232491
0: The maximum resident set size (KB) = 1518864

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 26 19:59:54 UTC 2024
Elapsed time: 01h:08m:34s. Have a nice day!
Wed Aug 28 20:12:34 UTC 2024
Elapsed time: 01h:10m:03s. Have a nice day!
38 changes: 19 additions & 19 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 26 16:17:09 UTC 2024
Wed Aug 28 14:06:09 UTC 2024
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_3681501/bit_base_bit_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3166513/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 = 1404.274425
0: The maximum resident set size (KB) = 769724
0: The total amount of wall time = 1365.461093
0: The maximum resident set size (KB) = 772116

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_3681501/dcp_dcp
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3166513/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 = 2178.286214
0: The maximum resident set size (KB) = 751032
0: The total amount of wall time = 2161.790209
0: The maximum resident set size (KB) = 740428

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_3681501/std_base_std_base
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3166513/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 = 2198.737097
0: The maximum resident set size (KB) = 734276
0: The total amount of wall time = 2253.074370
0: The maximum resident set size (KB) = 729952

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_3681501/thr_thr
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3166513/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 = 2321.006507
0: The maximum resident set size (KB) = 742260
0: The total amount of wall time = 2194.893152
0: The maximum resident set size (KB) = 718656

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 26 18:51:20 UTC 2024
Elapsed time: 02h:34m:14s. Have a nice day!
Wed Aug 28 16:37:16 UTC 2024
Elapsed time: 02h:31m:08s. Have a nice day!
Loading

0 comments on commit 1c4fcf1

Please sign in to comment.