Skip to content
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

fv3atm: Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types; contains bug fix for WW3 debug #1130

Merged
merged 28 commits into from
Apr 12, 2022
Merged

fv3atm: Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types; contains bug fix for WW3 debug #1130

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
db94af9
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Mar 20, 2022
3243d00
update WW3
JessicaMeixner-NOAA Mar 25, 2022
b711969
ort hera log file for:
JessicaMeixner-NOAA Mar 25, 2022
35b2577
hera intel log
JessicaMeixner-NOAA Mar 25, 2022
0d05797
wcoss cray log
JessicaMeixner-NOAA Mar 25, 2022
fb0245e
gaea logs
JessicaMeixner-NOAA Mar 25, 2022
48fce0a
orion logs
JessicaMeixner-NOAA Mar 25, 2022
225f4b5
wcoss dell log
JessicaMeixner-NOAA Mar 26, 2022
c36b524
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Mar 27, 2022
c5ea2ee
Merge remote-tracking branch 'UFS/develop' into bug/debugww3fix
JessicaMeixner-NOAA Mar 28, 2022
727bb2d
Merge branch 'ufs-community:develop' into bug/debugww3fix
JessicaMeixner-NOAA Mar 29, 2022
2753cfe
Merge branch 'ufs-community:develop' into bug/debugww3fix
JessicaMeixner-NOAA Mar 30, 2022
ec56151
Merge branch 'ufs-community:develop' into bug/debugww3fix
JessicaMeixner-NOAA Apr 1, 2022
05c34f7
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Apr 4, 2022
c524fb0
Merge branch 'bug/debugww3fix' of https://github.com/JessicaMeixner-N…
climbfuji Apr 4, 2022
fe03d2c
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Apr 11, 2022
29f7d46
Update CI tests
climbfuji Apr 11, 2022
dc814db
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Apr 11, 2022
968d668
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Apr 12, 2022
4056a01
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Apr 12, 2022
38c3671
[AutoRT] cheyenne.gnu Job Completed.
BrianCurtis-NOAA Apr 12, 2022
b39a505
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Apr 12, 2022
9b130b7
[AutoRT] cheyenne.intel Job Completed.
BrianCurtis-NOAA Apr 12, 2022
d95ca96
Regression test log for wcoss_cray
climbfuji Apr 12, 2022
925f811
Regression test log for wcoss_dell_p3
climbfuji Apr 12, 2022
ce7756e
Regression test log for orion.intel
climbfuji Apr 12, 2022
6ff29d9
Regression test log for gaea.intel and update of default_vars.sh for …
BrianCurtis-NOAA Apr 12, 2022
d177779
Revert .gitmodules and update submodule pointer for WW3 and FV3
climbfuji Apr 12, 2022
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
12 changes: 8 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/climbfuji/fv3atm
branch = feature/split_gfs_typedefs_rename_ccpp_interstitial
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
branch = dev/ufs-weather-model
#url = https://github.com/NOAA-EMC/WW3
#branch = dev/ufs-weather-model
url = https://github.com/JessicaMeixner-NOAA/WW3
branch = merge-dev-to-ufs-20220324
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-psd/stochastic_physics
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 13 files
+12 −6 .gitmodules
+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
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 10 files
+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
122 changes: 28 additions & 94 deletions tests/OpnReqTests_cpld_control_c96_p8_hera.intel.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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!
Loading