Skip to content

Commit

Permalink
Reorganization of ccpp-physics (ufs-community#2035)
Browse files Browse the repository at this point in the history 
* Metafile cleanup

* Move rte-rrtmgp submodule

* Re-organization of physical parameterizations into process and scheme subdirectories

* Modifications to CCPP metadata files to accommodate source file location changes

* File location update referenced in CMEPS
  • Loading branch information
@dustinswales
dustinswales committed Jan 4, 2024
1 parent 173146c commit 407c6fd
Show file tree
Hide file tree
Showing 12 changed files with 6,694 additions and 6,830 deletions.
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 2 files
+8 −8 ufs/ccpp/config/ccpp_prebuild_config.py
+1 −1 ufs/ccpp/data/MED_typedefs.meta
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 43 files
+132 −136 ccpp/config/ccpp_prebuild_config.py
+2 −5 ccpp/data/CCPP_typedefs.meta
+5 −3 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+0 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_flake.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_ras.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+0 −1 ccpp/suites/suite_FV3_HRRR.xml
+0 −1 ccpp/suites/suite_FV3_HRRR_c3.xml
+0 −1 ccpp/suites/suite_FV3_HRRR_gf.xml
+0 −1 ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+0 −1 ccpp/suites/suite_FV3_RAP.xml
+0 −1 ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+0 −1 ccpp/suites/suite_FV3_RAP_clm_lake.xml
+0 −1 ccpp/suites/suite_FV3_RAP_flake.xml
+0 −1 ccpp/suites/suite_FV3_RAP_noah.xml
+0 −1 ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+0 −1 ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+0 −1 ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+0 −1 ccpp/suites/suite_FV3_RRFS_v1beta.xml
+0 −1 ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+0 −1 ccpp/suites/suite_FV3_WoFS_v0.xml
+0 −1 ccpp/suites/suite_FV3_global_nest_v1.xml
+0 −1 ccpp/suites/suite_RRFSens_phy1.xml
+0 −1 ccpp/suites/suite_RRFSens_phy2.xml
+0 −1 ccpp/suites/suite_RRFSens_phy3.xml
+0 −1 ccpp/suites/suite_RRFSens_phy4.xml
+0 −1 ccpp/suites/suite_RRFSens_phy5.xml
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Dec 22 06:16:32 UTC 2023
Wed Jan 3 04:22:53 UTC 2024
Start Operation Requirement Test


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_122459/control_p8_gnu_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_bit_base
Checking test bit_base control_p8_gnu results ....
Moving baseline bit_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base control_p8_gnu 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 = 281.443220
0: The maximum resident set size (KB) = 1300888
0: The total amount of wall time = 292.690948
0: The maximum resident set size (KB) = 1301824

Test bit_base control_p8_gnu PASS


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_122459/control_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_dbg_base
Checking test dbg_base control_p8_gnu results ....
Moving baseline dbg_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base control_p8_gnu 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 = 909.218826
0: The maximum resident set size (KB) = 1295320
0: The total amount of wall time = 921.386982
0: The maximum resident set size (KB) = 1286344

Test dbg_base control_p8_gnu PASS


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_122459/control_p8_gnu_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_dcp
Checking test dcp control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 247.931035
0: The maximum resident set size (KB) = 1278208
0: The total amount of wall time = 253.882313
0: The maximum resident set size (KB) = 1283164

Test dcp control_p8_gnu PASS


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_122459/control_p8_gnu_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_mpi
Checking test mpi control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 247.765128
0: The maximum resident set size (KB) = 1279792
0: The total amount of wall time = 256.906556
0: The maximum resident set size (KB) = 1277932

Test mpi control_p8_gnu PASS


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_122459/control_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_rst
Checking test rst control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 249.426568
0: The maximum resident set size (KB) = 1282060
0: The total amount of wall time = 267.010811
0: The maximum resident set size (KB) = 1278128

Test rst control_p8_gnu PASS


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_122459/control_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_std_base
Checking test std_base control_p8_gnu results ....
Moving baseline std_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base control_p8_gnu 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 = 249.782075
0: The maximum resident set size (KB) = 1279948
0: The total amount of wall time = 263.896579
0: The maximum resident set size (KB) = 1279440

Test std_base control_p8_gnu PASS


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_122459/control_p8_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_178415/control_p8_gnu_thr
Checking test thr control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 250.076557
0: The maximum resident set size (KB) = 1279020
0: The total amount of wall time = 260.804104
0: The maximum resident set size (KB) = 1276700

Test thr control_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Dec 22 07:58:22 UTC 2023
Elapsed time: 01h:41m:51s. Have a nice day!
Wed Jan 3 05:33:37 UTC 2024
Elapsed time: 01h:10m:44s. Have a nice day!
24 changes: 12 additions & 12 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 @@
Fri Dec 22 06:14:35 UTC 2023
Wed Jan 3 04:28:20 UTC 2024
Start Operation Requirement Test


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_191182/cpld_control_nowave_noaero_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_168908/cpld_control_nowave_noaero_p8_gnu_dbg_base
Checking test dbg_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu 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 = 1237.935269
0: The maximum resident set size (KB) = 1411868
0: The total amount of wall time = 1217.193995
0: The maximum resident set size (KB) = 1405184

Test dbg_base cpld_control_nowave_noaero_p8_gnu PASS


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_191182/cpld_control_nowave_noaero_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_168908/cpld_control_nowave_noaero_p8_gnu_rst
Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing sfcf021.tile1.nc .........OK
Comparing sfcf021.tile2.nc .........OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing RESTART/iced.2021-03-23-21600.nc .........OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 387.625397
0: The maximum resident set size (KB) = 1404316
0: The total amount of wall time = 408.570654
0: The maximum resident set size (KB) = 1400536

Test rst cpld_control_nowave_noaero_p8_gnu PASS


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_191182/cpld_control_nowave_noaero_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_168908/cpld_control_nowave_noaero_p8_gnu_std_base
Checking test std_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base cpld_control_nowave_noaero_p8_gnu 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 = 381.486931
0: The maximum resident set size (KB) = 1408412
0: The total amount of wall time = 422.299545
0: The maximum resident set size (KB) = 1398292

Test std_base cpld_control_nowave_noaero_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Dec 22 07:18:47 UTC 2023
Elapsed time: 01h:04m:12s. Have a nice day!
Wed Jan 3 05:18:48 UTC 2024
Elapsed time: 00h:50m:29s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Dec 22 06:17:57 UTC 2023
Wed Jan 3 04:24:32 UTC 2024
Start Operation Requirement Test


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_83059/regional_control_gnu_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_222297/regional_control_gnu_dcp
Checking test dcp regional_control_gnu results ....
Comparing dynf000.nc .........OK
Comparing dynf006.nc .........OK
Expand All @@ -14,14 +14,14 @@ Checking test dcp regional_control_gnu results ....
Comparing NATLEV.GrbF00 .........OK
Comparing NATLEV.GrbF06 .........OK

0: The total amount of wall time = 513.639730
0: The maximum resident set size (KB) = 587036
0: The total amount of wall time = 536.784543
0: The maximum resident set size (KB) = 584508

Test dcp regional_control_gnu PASS


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_83059/regional_control_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_222297/regional_control_gnu_std_base
Checking test std_base regional_control_gnu results ....
Moving baseline std_base regional_control_gnu files ....
Moving dynf000.nc .........OK
Expand All @@ -33,14 +33,14 @@ Moving baseline std_base regional_control_gnu files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 520.401956
0: The maximum resident set size (KB) = 584912
0: The total amount of wall time = 529.226881
0: The maximum resident set size (KB) = 590552

Test std_base regional_control_gnu PASS


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_83059/regional_control_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_222297/regional_control_gnu_thr
Checking test thr regional_control_gnu results ....
Comparing dynf000.nc .........OK
Comparing dynf006.nc .........OK
Expand All @@ -51,11 +51,11 @@ Checking test thr regional_control_gnu results ....
Comparing NATLEV.GrbF00 .........OK
Comparing NATLEV.GrbF06 .........OK

0: The total amount of wall time = 513.731210
0: The maximum resident set size (KB) = 584504
0: The total amount of wall time = 529.625327
0: The maximum resident set size (KB) = 587588

Test thr regional_control_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Dec 22 06:54:19 UTC 2023
Elapsed time: 00h:36m:24s. Have a nice day!
Wed Jan 3 05:03:00 UTC 2024
Elapsed time: 00h:38m:29s. Have a nice day!
Loading

0 comments on commit 407c6fd

Please sign in to comment.