fv3atm: Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp…

…_t from ccpp_types; contains bug fix for WW3 debug (#1130) Co-authored-by: Jessica Meixner <Jessica.Meixner@noaa.gov>
ufs-community · Apr 12, 2022 · cb84926 · cb84926
1 parent c2e6b22
commit cb84926
Show file tree

Hide file tree

Showing 15 changed files with 2,637 additions and 5,824 deletions.
diff --git a/FV3 b/FV3
diff --git a/WW3 b/WW3
diff --git a/tests/OpnReqTests_cpld_control_c96_p8_hera.intel.log b/tests/OpnReqTests_cpld_control_c96_p8_hera.intel.log
@@ -1,11 +1,9 @@
-Fri Jan 21 20:09:38 UTC 2022
+Fri Mar 25 15:41:51 UTC 2022
 Start Operation Requirement Test
 
-Compile dbg elapsed time 207 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile std elapsed time 422 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_dbg_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_dbg_base
+baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_267597/cpld_control_c96_p8_dbg_base
 Checking test dbg_base cpld_control_c96_p8 results ....
 Moving baseline dbg_base cpld_control_c96_p8 files ....
  Moving sfcf006.tile1.nc .........OK
@@ -20,6 +18,7 @@ Moving baseline dbg_base cpld_control_c96_p8 files ....
  Moving atmf006.tile4.nc .........OK
  Moving atmf006.tile5.nc .........OK
  Moving atmf006.tile6.nc .........OK
+ Moving gocart.inst_aod.20210322_1200z.nc4 .........OK
  Moving RESTART/coupler.res .........OK
  Moving RESTART/fv_core.res.nc .........OK
  Moving RESTART/fv_core.res.tile1.nc .........OK
@@ -56,83 +55,14 @@ Moving baseline dbg_base cpld_control_c96_p8 files ....
  Moving RESTART/iced.2021-03-22-43200.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
 
-  0: The total amount of wall time                        = 604.646137
-  0: The maximum resident set size (KB)                   = 678920
+  0: The total amount of wall time                        = 1036.583318
+  0: The maximum resident set size (KB)                   = 1188280
 
 Test dbg_base cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_dcp
-Checking test dcp cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
- Comparing RESTART/coupler.res .........OK
- Comparing RESTART/fv_core.res.nc .........OK
- Comparing RESTART/fv_core.res.tile1.nc .........OK
- Comparing RESTART/fv_core.res.tile2.nc .........OK
- Comparing RESTART/fv_core.res.tile3.nc .........OK
- Comparing RESTART/fv_core.res.tile4.nc .........OK
- Comparing RESTART/fv_core.res.tile5.nc .........OK
- Comparing RESTART/fv_core.res.tile6.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
- Comparing RESTART/fv_tracer.res.tile1.nc .........OK
- Comparing RESTART/fv_tracer.res.tile2.nc .........OK
- Comparing RESTART/fv_tracer.res.tile3.nc .........OK
- Comparing RESTART/fv_tracer.res.tile4.nc .........OK
- Comparing RESTART/fv_tracer.res.tile5.nc .........OK
- Comparing RESTART/fv_tracer.res.tile6.nc .........OK
- Comparing RESTART/phy_data.tile1.nc .........OK
- Comparing RESTART/phy_data.tile2.nc .........OK
- Comparing RESTART/phy_data.tile3.nc .........OK
- Comparing RESTART/phy_data.tile4.nc .........OK
- Comparing RESTART/phy_data.tile5.nc .........OK
- Comparing RESTART/phy_data.tile6.nc .........OK
- Comparing RESTART/sfc_data.tile1.nc .........OK
- Comparing RESTART/sfc_data.tile2.nc .........OK
- Comparing RESTART/sfc_data.tile3.nc .........OK
- Comparing RESTART/sfc_data.tile4.nc .........OK
- Comparing RESTART/sfc_data.tile5.nc .........OK
- Comparing RESTART/sfc_data.tile6.nc .........OK
- Comparing RESTART/MOM.res.nc .........OK
- 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                        = 213.370759
-  0: The maximum resident set size (KB)                   = 610616
-
-Test dcp cpld_control_c96_p8 PASS
-
-
-baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_fhz
+baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_267597/cpld_control_c96_p8_fhz
 Checking test fhz cpld_control_c96_p8 results ....
  Comparing sfcf021.tile1.nc ............ALT CHECK......OK
  Comparing sfcf021.tile2.nc ............ALT CHECK......OK
@@ -146,6 +76,7 @@ Checking test fhz cpld_control_c96_p8 results ....
  Comparing atmf021.tile4.nc .........OK
  Comparing atmf021.tile5.nc .........OK
  Comparing atmf021.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -182,21 +113,22 @@ Checking test fhz cpld_control_c96_p8 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                        = 199.007794
-  0: The maximum resident set size (KB)                   = 616200
+  0: The total amount of wall time                        = 322.567196
+  0: The maximum resident set size (KB)                   = 1121180
 
 Test fhz cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_rst
+baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_267597/cpld_control_c96_p8_rst
 Checking test rst cpld_control_c96_p8 results ....
  Comparing atmf024.tile1.nc .........OK
  Comparing atmf024.tile2.nc .........OK
  Comparing atmf024.tile3.nc .........OK
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -239,14 +171,14 @@ Checking test rst cpld_control_c96_p8 results ....
  Comparing sfcf024.tile5.nc .........OK
  Comparing sfcf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 106.597575
-  0: The maximum resident set size (KB)                   = 376192
+  0: The total amount of wall time                        = 183.790868
+  0: The maximum resident set size (KB)                   = 1087144
 
 Test rst cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_std_base
+baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_267597/cpld_control_c96_p8_std_base
 Checking test std_base cpld_control_c96_p8 results ....
 Moving baseline std_base cpld_control_c96_p8 files ....
  Moving sfcf021.tile1.nc .........OK
@@ -273,6 +205,7 @@ Moving baseline std_base cpld_control_c96_p8 files ....
  Moving atmf024.tile4.nc .........OK
  Moving atmf024.tile5.nc .........OK
  Moving atmf024.tile6.nc .........OK
+ Moving gocart.inst_aod.20210323_0600z.nc4 .........OK
  Moving RESTART/coupler.res .........OK
  Moving RESTART/fv_core.res.nc .........OK
  Moving RESTART/fv_core.res.tile1.nc .........OK
@@ -309,14 +242,14 @@ Moving baseline std_base cpld_control_c96_p8 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                        = 199.095277
-  0: The maximum resident set size (KB)                   = 619248
+  0: The total amount of wall time                        = 331.473929
+  0: The maximum resident set size (KB)                   = 1121956
 
 Test std_base cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_thr
+baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_267597/cpld_control_c96_p8_thr
 Checking test thr cpld_control_c96_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -342,6 +275,7 @@ Checking test thr cpld_control_c96_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -378,11 +312,11 @@ Checking test thr cpld_control_c96_p8 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                        = 232.469343
-  0: The maximum resident set size (KB)                   = 683036
+  0: The total amount of wall time                        = 421.311949
+  0: The maximum resident set size (KB)                   = 1680756
 
 Test thr cpld_control_c96_p8 PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan 21 20:43:28 UTC 2022
-Elapsed time: 00h:33m:51s. Have a nice day!
+Fri Mar 25 16:45:38 UTC 2022
+Elapsed time: 01h:03m:48s. Have a nice day!
+1 −1		atmos_cubed_sphere
+2 −2		ccpp/config/ccpp_prebuild_config.py
+5 −5		ccpp/data/CCPP_data.F90
+4 −4		ccpp/data/CCPP_data.meta
+1,565 −32		ccpp/data/CCPP_typedefs.F90
+2,981 −7		ccpp/data/CCPP_typedefs.meta
+60 −1,593		ccpp/data/GFS_typedefs.F90
+5 −2,992		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/driver/CCPP_driver.F90
+2 −2		ccpp/driver/GFS_init.F90
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+3 −2		CMakeLists.txt
+4 −1		manual/eqs/output.tex
+1 −0		model/inp/ww3_shel.inp
+1 −1		model/nml/ww3_multi.nml
+1 −0		model/nml/ww3_shel.nml
+1 −1		model/tools/bash/ww3_multi_inp2nml.sh
+1 −1		model/tools/bash/ww3_ounf_inp2nml.sh
+3 −1		model/tools/bash/ww3_shel_inp2nml.sh
+3 −2		regtests/bin/matrix_cmake_ncep
+10 −8		regtests/bin/run_cmake_test