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

Jump to bottom

Add support for optional arguments in ccpp physics and framework AND add end of run restart functionality to MOM6 (was #2286) #2205

Merged
merged 52 commits into from
May 21, 2024
Merged

Add support for optional arguments in ccpp physics and framework AND add end of run restart functionality to MOM6 (was #2286) #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
8adfe8b
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Mar 8, 2024
d8d13e2
Commiting test_changes.list from Hercules rt run
climbfuji Mar 8, 2024
49e4625
Update submodule pointer for fv3atm for changes in ccpp-physics and f…
climbfuji Mar 8, 2024
48ec296
Update submodule pointer for fv3atm
climbfuji Mar 11, 2024
f7398fb
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Mar 11, 2024
b981357
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Mar 20, 2024
67d8dfb
Update submodule pointer for fv3atm
climbfuji Mar 22, 2024
2b39b13
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Mar 22, 2024
4e9e0d9
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Apr 3, 2024
4b20c69
Update submodule pointer for fv3atm
climbfuji Apr 3, 2024
a0cbb27
Update submodule pointer for fv3atm
climbfuji Apr 4, 2024
8ccb377
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Apr 10, 2024
ca3d7c3
Update submodule pointer for fv3atm
climbfuji Apr 14, 2024
219f829
Update submodule pointer for fv3atm
climbfuji Apr 14, 2024
3969949
Update submodule pointer for fv3atm
climbfuji Apr 18, 2024
0738704
Update submodule pointer for fv3atm
climbfuji Apr 19, 2024
65731ad
Update submodule pointer for fv3atm
climbfuji Apr 19, 2024
7f39ed7
Update submodule pointer for fv3atm
climbfuji Apr 19, 2024
7f896d2
Update submodule pointer for fv3atm; update .gitmodules and submodule…
climbfuji Apr 27, 2024
4e21820
Remove '-check nopointer' from Intel compiler flags in debug mode
climbfuji Apr 27, 2024
8da9020
Update submodule pointer for fv3atm
climbfuji Apr 27, 2024
ae033be
Revert removal of '-check nopointer' in cmake/Intel.cmake
climbfuji Apr 29, 2024
860db30
Update submodule pointer for fv3atm
climbfuji Apr 30, 2024
e490863
Update submodule pointer for fv3atm
climbfuji May 1, 2024
69a818b
Update submodule pointer for fv3atm
climbfuji May 7, 2024
b695b0d
Update submodule pointer for fv3atm
climbfuji May 10, 2024
1e7d939
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji May 10, 2024
5588f99
Cannot submit test_changes.list because no differences
DomHeinzeller May 11, 2024
555c49f
Add -check nopointer to Intel debug flags
climbfuji May 11, 2024
c63a153
Merge branch 'feature/ccpp_prebuild_optarg' of https://github.com/cli…
climbfuji May 11, 2024
d8a1200
switch to MOM6 test branch
jiandewang May 16, 2024
ae051fe
replace KVML to KV_ML_INVZ2 in MOM_input
jiandewang May 16, 2024
2e1c7ba
Merge branch 'ufs-community:develop' into feature/restart-endofrun
jiandewang May 16, 2024
6994c28
upload empty test_changes.list
jiandewang May 16, 2024
9b6605d
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji May 20, 2024
d094efd
Merge branch 'feature/restart-endofrun' of https://github.com/jiandew…
climbfuji May 20, 2024
3e15eaa
Update submodule pointer for FV3
climbfuji May 20, 2024
8d1a4aa
add gaea RT log passed
FernandoAndrade-NOAA May 20, 2024
f911c00
[AutoRT] Hera Job Completed.
epic-cicd-jenkins May 21, 2024
b6b84f8
[AutoRT] Derecho Job Completed.
epic-cicd-jenkins May 21, 2024
d01c8e8
WCOSS2 RT Log: Passed
BrianCurtis-NOAA May 21, 2024
a07258a
Acorn RT Log: Passed
BrianCurtis-NOAA May 21, 2024
3288d14
add hercules RT logs: passed
zach1221 May 21, 2024
c59bb22
add jet RT log passed
FernandoAndrade-NOAA May 21, 2024
da801b0
add orion RT logs: passed
zach1221 May 21, 2024
045a1a0
add control_p8_gnu ORT logs: passed
zach1221 May 21, 2024
cd5013a
add regional_control_gnu ORT logs: passed
zach1221 May 21, 2024
178ee75
add cpld_control_gnu ORT logs: passed
zach1221 May 21, 2024
011b1fd
add regional ORT fix logs
zach1221 May 21, 2024
da11c6b
add cpld ORT fix logs
zach1221 May 21, 2024
825cbf6
Revert .gitmodules and update submodule pointers for FV3, MOM6-interf…
climbfuji May 21, 2024
9cf96ad
Merge branch 'feature/ccpp_prebuild_optarg' of https://github.com/cli…
climbfuji May 21, 2024
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 FV3
Open in desktop
Submodule FV3 updated 9 files
+1 −1 atmos_cubed_sphere
+30 −0 ccpp/data/CCPP_typedefs.F90
+68 −20 ccpp/data/CCPP_typedefs.meta
+7 −6 ccpp/data/GFS_typedefs.F90
+4 −36 ccpp/data/GFS_typedefs.meta
+7 −3 ccpp/driver/CCPP_driver.F90
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+1 −0 stochastic_physics/stochastic_physics_wrapper.F90
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 1 files
+21 −2 config_src/drivers/nuopc_cap/mom_cap.F90
2 changes: 1 addition & 1 deletion stochastic_physics
Open in desktop
Submodule stochastic_physics updated 2 files
+9 −9 lndp_apply_perts.F90
+11 −11 stochastic_physics.F90
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Thu May 16 20:24:57 UTC 2024
Mon May 20 18:51:03 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_197061/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 278.785657
0: The maximum resident set size (KB) = 1253096
0: The total amount of wall time = 276.086219
0: The maximum resident set size (KB) = 1266612

Test bit_base 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_197061/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 945.032567
0: The maximum resident set size (KB) = 1233484
0: The total amount of wall time = 967.204562
0: The maximum resident set size (KB) = 1252256

Test dbg_base 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_197061/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 244.990573
0: The maximum resident set size (KB) = 1232508
0: The total amount of wall time = 244.057605
0: The maximum resident set size (KB) = 1245204

Test dcp 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_197061/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 241.154280
0: The maximum resident set size (KB) = 1233296
0: The total amount of wall time = 242.281799
0: The maximum resident set size (KB) = 1245960

Test mpi 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_197061/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 242.646838
0: The maximum resident set size (KB) = 1233060
0: The total amount of wall time = 242.457949
0: The maximum resident set size (KB) = 1245616

Test rst 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_197061/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 263.767716
0: The maximum resident set size (KB) = 1233204
0: The total amount of wall time = 247.352735
0: The maximum resident set size (KB) = 1245076

Test std_base 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_197061/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1703729/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 = 246.202485
0: The maximum resident set size (KB) = 1231200
0: The total amount of wall time = 242.402115
0: The maximum resident set size (KB) = 1245280

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu May 16 21:50:50 UTC 2024
Elapsed time: 01h:27m:39s. Have a nice day!
Mon May 20 21:14:11 UTC 2024
Elapsed time: 02h:23m:09s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri May 17 15:45:56 UTC 2024
Tue May 21 16:24:30 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_1600376/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/cpld/FV3_OPNREQ_TEST/opnReqTest_21842/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 = 1313.057110
0: The maximum resident set size (KB) = 1342956
0: The total amount of wall time = 1578.173654
0: The maximum resident set size (KB) = 1343768

Test dbg_base 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_1600376/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/cpld/FV3_OPNREQ_TEST/opnReqTest_21842/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 = 518.573154
0: The maximum resident set size (KB) = 1341724
0: The total amount of wall time = 550.910855
0: The maximum resident set size (KB) = 1339328

Test rst 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_1600376/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/cpld/FV3_OPNREQ_TEST/opnReqTest_21842/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 = 393.159431
0: The maximum resident set size (KB) = 1342660
0: The total amount of wall time = 608.236433
0: The maximum resident set size (KB) = 1338792

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri May 17 16:50:15 UTC 2024
Elapsed time: 01h:04m:19s. Have a nice day!
Tue May 21 17:39:42 UTC 2024
Elapsed time: 01h:15m:12s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri May 17 13:09:07 UTC 2024
Tue May 21 16:03:46 UTC 2024
Start Operation Requirement Test


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_959654/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 1380.751535
0: The maximum resident set size (KB) = 575872
0: The total amount of wall time = 1256.367157
0: The maximum resident set size (KB) = 575888

Test bit_base 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_959654/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 2250.847202
0: The maximum resident set size (KB) = 545220
0: The total amount of wall time = 2182.888769
0: The maximum resident set size (KB) = 543284

Test dcp 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_959654/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 2153.300954
0: The maximum resident set size (KB) = 541236
0: The total amount of wall time = 2087.568729
0: The maximum resident set size (KB) = 540656

Test std_base 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_959654/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4148204/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 = 2143.988793
0: The maximum resident set size (KB) = 542088
0: The total amount of wall time = 2251.752676
0: The maximum resident set size (KB) = 543636

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri May 17 15:35:34 UTC 2024
Elapsed time: 02h:26m:28s. Have a nice day!
Tue May 21 18:31:11 UTC 2024
Elapsed time: 02h:27m:25s. Have a nice day!
Loading
Loading