Skip to content

Commit

Permalink
Fix ugwpv1 timing / remove some extended WLCLK cases & PR#2491 Update…
Browse files Browse the repository at this point in the history 
…s from the jedi model convention (ufs-community#2543)

* UFSWM - Fix sedi_semi logic issue in export_ugwpv1() and change affected RTs for more stable and quicker runtimes.
* UFSWM - Alias update JEDI-related variables inside the fd_ufs.yaml file.
  • Loading branch information
@dpsarmie
dpsarmie authored Jan 13, 2025
1 parent 5324d64 commit c7412fa
Show file tree
Hide file tree
Showing 40 changed files with 3,335 additions and 2,777 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=20241230
export BL_DATE=20250107
9 changes: 6 additions & 3 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,6 @@ export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
export RF_CUTOFF=30.0
export FAST_TAU_W_SEC=0.0

export ATMRES=C96
export TILEDFIX=.false.
export DO_CA=.false.
export CA_SGS=.false.
Expand Down Expand Up @@ -795,6 +794,7 @@ export HWRF_SAMFDEEP=.false.
export RAS=.false.
export RANDOM_CLDS=.false.
export CNVCLD=.true.
export XR_CNVCLD=.false.
export PROGSIGMA=.false.
export BETASCU=8.0
export BETAMCU=1.0
Expand Down Expand Up @@ -1190,8 +1190,11 @@ export_ugwpv1() {
esac

if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
export DT_INNER=${DT_ATMOS}
if [[ ${SEDI_SEMI} = .false. ]]; then
export DT_INNER=$((DT_ATMOS/2))
else
export DT_INNER=${DT_ATMOS}
fi
export default_dt_atmos=0
}

Expand Down
386 changes: 385 additions & 1 deletion tests/logs/OpnReqTests_control_p8_hera.log
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 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,9 @@
Tue Jan 7 03:15:28 UTC 2025
Thu Jan 9 02:59:38 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_278179/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1874715/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 = 4369.524954
0: The maximum resident set size (KB) = 1493280
0: The total amount of wall time = 2326.114069
0: The maximum resident set size (KB) = 1489800

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_278179/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1874715/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 = 1284.724733
0: The maximum resident set size (KB) = 1482880
0: The total amount of wall time = 790.318058
0: The maximum resident set size (KB) = 1482288

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_278179/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1874715/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 = 1139.037288
0: The maximum resident set size (KB) = 1488884
0: The total amount of wall time = 705.815910
0: The maximum resident set size (KB) = 1483264

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Jan 7 05:37:25 UTC 2025
Elapsed time: 02h:21m:57s. Have a nice day!
Thu Jan 9 04:34:00 UTC 2025
Elapsed time: 01h:34m:22s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Jan 6 12:24:27 UTC 2025
Thu Jan 9 00:22:22 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_3494311/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 1407.193487
0: The maximum resident set size (KB) = 780976
0: The total amount of wall time = 1395.474569
0: The maximum resident set size (KB) = 748696

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_3494311/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 2195.740053
0: The maximum resident set size (KB) = 725748
0: The total amount of wall time = 2283.182601
0: The maximum resident set size (KB) = 711084

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_3494311/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 2291.331176
0: The maximum resident set size (KB) = 734184
0: The total amount of wall time = 2207.702175
0: The maximum resident set size (KB) = 692680

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_3494311/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1259269/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 = 2194.246673
0: The maximum resident set size (KB) = 723192
0: The total amount of wall time = 2278.935561
0: The maximum resident set size (KB) = 711160

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Jan 6 14:57:59 UTC 2025
Elapsed time: 02h:33m:33s. Have a nice day!
Thu Jan 9 02:59:38 UTC 2025
Elapsed time: 02h:37m:17s. Have a nice day!
Loading

0 comments on commit c7412fa

Please sign in to comment.