Skip to content

Commit

Permalink
Merge branch 'ufs-community:develop' into csps-rocky8
Browse files Browse the repository at this point in the history
  • Loading branch information
@weihuang-jedi
weihuang-jedi authored Oct 8, 2024
2 parents 7e644a8 + e3750c2 commit 58eebbf
Show file tree
Hide file tree
Showing 17 changed files with 2,271 additions and 2,246 deletions.
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240909
export BL_DATE=20241001
2 changes: 1 addition & 1 deletion tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ export_cice6() {
export CICE_DUMPFREQ_N=1000
CICE_DIAGFREQ=$(( (FHMAX*3600)/DT_CICE ))
export CICE_DIAGFREQ
export CICE_HISTFREQ_N="0, 0, 6, 1, 1"
export CICE_HISTFREQ_N="0, 0, 6, 0, 0"
export CICE_HIST_AVG=.true.
export CICE_HISTORY_DIR=./history/
export CICE_INCOND_DIR=./history/
Expand Down
62 changes: 31 additions & 31 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Sep 24 13:52:59 UTC 2024
Wed Oct 2 22:41:48 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_1669225/bit_base_bit_base
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_2964678/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 = 300.133244
0: The maximum resident set size (KB) = 1442744
0: The total amount of wall time = 299.526615
0: The maximum resident set size (KB) = 1441552

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_1669225/dbg_base_dbg_base
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_2964678/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 = 1004.154973
0: The maximum resident set size (KB) = 1435480
0: The total amount of wall time = 913.091192
0: The maximum resident set size (KB) = 1434836

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_1669225/dcp_dcp
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_2964678/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 = 275.107180
0: The maximum resident set size (KB) = 1418248
0: The total amount of wall time = 271.228237
0: The maximum resident set size (KB) = 1420208

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_1669225/mpi_mpi
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_2964678/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 = 270.874828
0: The maximum resident set size (KB) = 1418740
0: The total amount of wall time = 270.711616
0: The maximum resident set size (KB) = 1432888

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_1669225/rst_rst
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_2964678/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 = 282.223804
0: The maximum resident set size (KB) = 1416640
0: The total amount of wall time = 271.801810
0: The maximum resident set size (KB) = 1408036

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_1669225/std_base_std_base
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_2964678/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 = 278.992660
0: The maximum resident set size (KB) = 1428428
0: The total amount of wall time = 278.448169
0: The maximum resident set size (KB) = 1417104

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_1669225/thr_thr
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_2964678/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 = 270.863691
0: The maximum resident set size (KB) = 1420068
0: The total amount of wall time = 274.922346
0: The maximum resident set size (KB) = 1427988

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Sep 24 15:08:30 UTC 2024
Elapsed time: 01h:15m:58s. Have a nice day!
Wed Oct 2 23:56:16 UTC 2024
Elapsed time: 01h:14m:28s. Have a nice day!
96 changes: 82 additions & 14 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,79 @@
Tue Sep 24 19:26:13 UTC 2024
Wed Oct 2 21:11:44 UTC 2024
Start Operation Requirement Test


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_2646490/rst_rst
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_1326267/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Moving sfcf021.tile2.nc .........OK
Moving sfcf021.tile3.nc .........OK
Moving sfcf021.tile4.nc .........OK
Moving sfcf021.tile5.nc .........OK
Moving sfcf021.tile6.nc .........OK
Moving atmf021.tile1.nc .........OK
Moving atmf021.tile2.nc .........OK
Moving atmf021.tile3.nc .........OK
Moving atmf021.tile4.nc .........OK
Moving atmf021.tile5.nc .........OK
Moving atmf021.tile6.nc .........OK
Moving sfcf024.tile1.nc .........OK
Moving sfcf024.tile2.nc .........OK
Moving sfcf024.tile3.nc .........OK
Moving sfcf024.tile4.nc .........OK
Moving sfcf024.tile5.nc .........OK
Moving sfcf024.tile6.nc .........OK
Moving atmf024.tile1.nc .........OK
Moving atmf024.tile2.nc .........OK
Moving atmf024.tile3.nc .........OK
Moving atmf024.tile4.nc .........OK
Moving atmf024.tile5.nc .........OK
Moving atmf024.tile6.nc .........OK
Moving RESTART/20210323.060000.coupler.res .........OK
Moving RESTART/20210323.060000.fv_core.res.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile6.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile6.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile1.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile2.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile3.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile4.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile5.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile6.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile1.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile2.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile3.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile4.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
Moving RESTART/20210323.060000.MOM.res.nc .........OK
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 = 2302.748756
0: The maximum resident set size (KB) = 1502800

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_1326267/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -65,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 = 731.776523
0: The maximum resident set size (KB) = 1505896
0: The total amount of wall time = 715.673783
0: The maximum resident set size (KB) = 1506992

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_2646490/std_base_std_base
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_1326267/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -135,13 +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 = 668.589581
0: The maximum resident set size (KB) = 1510092
0: The total amount of wall time = 750.553345
0: The maximum resident set size (KB) = 1504388

Test std_base PASS

FAILED TESTS:
Test dbg_base failed in run_test failed
OPERATION REQUIREMENT TEST FAILED
Tue Sep 24 22:20:42 UTC 2024
Elapsed time: 02h:54m:29s. Have a nice day!
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Oct 2 22:41:48 UTC 2024
Elapsed time: 01h:30m:06s. Have a nice day!
38 changes: 19 additions & 19 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Sep 24 16:39:41 UTC 2024
Wed Oct 2 18:39:04 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_3755633/bit_base_bit_base
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_4004824/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 = 1445.966550
0: The maximum resident set size (KB) = 766148
0: The total amount of wall time = 1391.385220
0: The maximum resident set size (KB) = 770368

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_3755633/dcp_dcp
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_4004824/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 = 2197.045041
0: The maximum resident set size (KB) = 741516
0: The total amount of wall time = 2197.813777
0: The maximum resident set size (KB) = 714084

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_3755633/std_base_std_base
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_4004824/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 = 2255.241997
0: The maximum resident set size (KB) = 732228
0: The total amount of wall time = 2180.905806
0: The maximum resident set size (KB) = 747696

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_3755633/thr_thr
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_4004824/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 = 2506.849856
0: The maximum resident set size (KB) = 700540
0: The total amount of wall time = 2272.924862
0: The maximum resident set size (KB) = 711932

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Sep 24 19:21:01 UTC 2024
Elapsed time: 02h:41m:20s. Have a nice day!
Wed Oct 2 21:11:42 UTC 2024
Elapsed time: 02h:32m:39s. Have a nice day!
Loading

0 comments on commit 58eebbf

Please sign in to comment.