Skip to content

Loosen restriction on optional arguments in CCPP Framework #2573

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

Merged
jkbk2004 merged 42 commits into from
Apr 25, 2025
Merged

Loosen restriction on optional arguments in CCPP Framework #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1abffd2
Redo primary scheme optional arguments.
dustinswales Dec 19, 2024
33c2b6b
Update FV3
dustinswales Jan 3, 2025
eaf2556
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Jan 3, 2025
51ecdbe
Update FV3
dustinswales Jan 14, 2025
11f7725
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Jan 14, 2025
9fcf0fb
Updated FV3
dustinswales Jan 27, 2025
9cdd732
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Jan 27, 2025
1f3c4a1
Updated ccpp framework branch
dustinswales Jan 27, 2025
cb1f11f
Update FV3
dustinswales Jan 27, 2025
533bbed
Synced FV3. Updates to physics
dustinswales Feb 12, 2025
a96f7bd
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Feb 12, 2025
ff9eb34
Update to FV3
dustinswales Feb 19, 2025
74881a9
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Feb 19, 2025
5c5d6b9
Revert merge conflict
dustinswales Feb 19, 2025
ac41a74
Sync physics
dustinswales Feb 19, 2025
efec17f
Ugh
dustinswales Feb 19, 2025
9e8970b
Fix submodule hash
dustinswales Feb 19, 2025
811b715
sync physics
dustinswales Feb 27, 2025
70a9fa5
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Feb 27, 2025
9f4d60c
Merge branch 'develop' into feature/optional_args_again
grantfirl Mar 21, 2025
6323bb0
Merge branch 'develop' into feature/optional_args_again
grantfirl Mar 28, 2025
973a776
update FV3 submodule
grantfirl Mar 31, 2025
b53188f
Update Atmosphere
dustinswales Apr 8, 2025
6bd6509
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Apr 8, 2025
235051f
Merge branch 'feature/optional_args_again' of https://github.com/dust…
dustinswales Apr 8, 2025
2fa2c7b
Update FV3
dustinswales Apr 16, 2025
9a509de
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Apr 16, 2025
bb9a1ff
Merge branch 'develop' into feature/optional_args_again
grantfirl Apr 21, 2025
635423e
Updated FV3
dustinswales Apr 23, 2025
40dfe56
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Apr 23, 2025
3aa7668
Merge branch 'feature/optional_args_again' of https://github.com/dust…
dustinswales Apr 23, 2025
0c6a682
add hera pre-test RT log
jkbk2004 Apr 24, 2025
5c49efa
Acorn RT Log: Passed
BrianCurtis-NOAA Apr 24, 2025
4455ca3
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Apr 24, 2025
cf7f331
add gaeaC5 RT log passed
FernandoAndrade-NOAA Apr 24, 2025
f6b69d7
add gaeaC6 RT log passed
FernandoAndrade-NOAA Apr 24, 2025
1a36fef
add orion/hercules RT logs: passed
jkbk2004 Apr 24, 2025
7e022bf
add derecho RT log: passed
jkbk2004 Apr 24, 2025
215bb07
ORT Jobs Completed.
epic-cicd-jenkins Apr 25, 2025
02d20f0
ORT Jobs Completed.
epic-cicd-jenkins Apr 25, 2025
6d8f714
Revert .gitmodules
dustinswales Apr 25, 2025
5d4c532
Merge branch 'feature/optional_args_again' of https://github.com/dust…
dustinswales Apr 25, 2025
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 from 2f5482 to de5d1c
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 @@
Wed Apr 23 13:39:45 UTC 2025
Fri Apr 25 10:18:00 UTC 2025
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_1952387/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 266.900210
0: The maximum resident set size (KB) = 1454928
0: The total amount of wall time = 268.093860
0: The maximum resident set size (KB) = 1463752

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_1952387/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 905.680453
0: The maximum resident set size (KB) = 1433612
0: The total amount of wall time = 905.702207
0: The maximum resident set size (KB) = 1436688

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_1952387/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 238.502576
0: The maximum resident set size (KB) = 1438040
0: The total amount of wall time = 241.863806
0: The maximum resident set size (KB) = 1426936

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_1952387/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 237.522526
0: The maximum resident set size (KB) = 1433808
0: The total amount of wall time = 263.751734
0: The maximum resident set size (KB) = 1414324

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_1952387/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 239.670413
0: The maximum resident set size (KB) = 1421944
0: The total amount of wall time = 236.777336
0: The maximum resident set size (KB) = 1425560

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_1952387/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 246.274383
0: The maximum resident set size (KB) = 1425120
0: The total amount of wall time = 248.698381
0: The maximum resident set size (KB) = 1439180

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_1952387/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_285605/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 = 236.134539
0: The maximum resident set size (KB) = 1435616
0: The total amount of wall time = 240.376059
0: The maximum resident set size (KB) = 1424620

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Apr 23 14:59:42 UTC 2025
Elapsed time: 01h:19m:58s. Have a nice day!
Fri Apr 25 11:30:50 UTC 2025
Elapsed time: 01h:12m:50s. 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 @@
Wed Apr 23 12:08:58 UTC 2025
Fri Apr 25 08:45:57 UTC 2025
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_1317767/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3765011/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 = 2390.779709
0: The maximum resident set size (KB) = 1505020
0: The total amount of wall time = 2405.641201
0: The maximum resident set size (KB) = 1511640

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_1317767/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3765011/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 = 672.118658
0: The maximum resident set size (KB) = 1504832
0: The total amount of wall time = 689.209954
0: The maximum resident set size (KB) = 1509384

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_1317767/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3765011/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 = 752.335653
0: The maximum resident set size (KB) = 1507316
0: The total amount of wall time = 667.314673
0: The maximum resident set size (KB) = 1509932

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Apr 23 13:39:44 UTC 2025
Elapsed time: 01h:30m:47s. Have a nice day!
Fri Apr 25 10:18:00 UTC 2025
Elapsed time: 01h:32m:03s. 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 @@
Wed Apr 23 09:35:38 UTC 2025
Fri Apr 25 06:01:56 UTC 2025
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_355745/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2150585/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 = 1436.819320
0: The maximum resident set size (KB) = 778728
0: The total amount of wall time = 1405.700782
0: The maximum resident set size (KB) = 767124

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_355745/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2150585/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 = 2242.190082
0: The maximum resident set size (KB) = 741656
0: The total amount of wall time = 2289.052532
0: The maximum resident set size (KB) = 743544

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_355745/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2150585/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 = 2205.744848
0: The maximum resident set size (KB) = 740460
0: The total amount of wall time = 2280.621981
0: The maximum resident set size (KB) = 752992

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_355745/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2150585/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 = 2210.625528
0: The maximum resident set size (KB) = 746768
0: The total amount of wall time = 2217.978250
0: The maximum resident set size (KB) = 724100

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Apr 23 12:08:57 UTC 2025
Elapsed time: 02h:33m:19s. Have a nice day!
Fri Apr 25 08:45:57 UTC 2025
Elapsed time: 02h:44m:02s. Have a nice day!
Loading