Skip to content

Commit

Permalink
Eighth reconciliation PR from production/RRFS.v1 (ufs-community#2531)
Browse files Browse the repository at this point in the history
* UFSWM - minor bugfixes for smoke/dust for RRFS.v1
  * FV3 - minor bugfixes for smoke/dust for RRFS.v1
    * ccpp-physics - minor bugfixes for smoke/dust for RRFS.v1
grantfirl authored Jan 7, 2025
1 parent 76471dc commit 5324d64
Showing 12 changed files with 2,386 additions and 2,449 deletions.
2 changes: 1 addition & 1 deletion FV3
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Thu Jan 2 15:59:37 UTC 2025
Tue Jan 7 03:15:28 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_3410713/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_278179/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
@@ -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 = 4360.076088
0: The maximum resident set size (KB) = 1511064
0: The total amount of wall time = 4369.524954
0: The maximum resident set size (KB) = 1493280

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_3410713/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_278179/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -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 = 1183.026821
0: The maximum resident set size (KB) = 1506460
0: The total amount of wall time = 1284.724733
0: The maximum resident set size (KB) = 1482880

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_3410713/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_278179/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
@@ -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 = 1173.931430
0: The maximum resident set size (KB) = 1513996
0: The total amount of wall time = 1139.037288
0: The maximum resident set size (KB) = 1488884

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Jan 2 18:23:19 UTC 2025
Elapsed time: 02h:23m:44s. Have a nice day!
Tue Jan 7 05:37:25 UTC 2025
Elapsed time: 02h:21m:57s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Thu Jan 2 13:26:04 UTC 2025
Mon Jan 6 12:24:27 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_2096974/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 1413.721963
0: The maximum resident set size (KB) = 780968
0: The total amount of wall time = 1407.193487
0: The maximum resident set size (KB) = 780976

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_2096974/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
@@ -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 = 2244.753151
0: The maximum resident set size (KB) = 733640
0: The total amount of wall time = 2195.740053
0: The maximum resident set size (KB) = 725748

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_2096974/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 2206.629881
0: The maximum resident set size (KB) = 721784
0: The total amount of wall time = 2291.331176
0: The maximum resident set size (KB) = 734184

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_2096974/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
@@ -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 = 2205.361410
0: The maximum resident set size (KB) = 725540
0: The total amount of wall time = 2194.246673
0: The maximum resident set size (KB) = 723192

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Jan 2 15:59:35 UTC 2025
Elapsed time: 02h:33m:31s. Have a nice day!
Mon Jan 6 14:57:59 UTC 2025
Elapsed time: 02h:33m:33s. Have a nice day!
548 changes: 274 additions & 274 deletions tests/logs/RegressionTests_derecho.log

Large diffs are not rendered by default.

587 changes: 293 additions & 294 deletions tests/logs/RegressionTests_gaeac5.log

Large diffs are not rendered by default.

551 changes: 276 additions & 275 deletions tests/logs/RegressionTests_gaeac6.log

Large diffs are not rendered by default.

752 changes: 376 additions & 376 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

814 changes: 376 additions & 438 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

492 changes: 246 additions & 246 deletions tests/logs/RegressionTests_jet.log

Large diffs are not rendered by default.

574 changes: 287 additions & 287 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

458 changes: 229 additions & 229 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests/parm/rrfs_conus13km_hrrr.nml.IN
Original file line number Diff line number Diff line change
@@ -115,7 +115,6 @@
regional = .true.
regional_bcs_from_gsi = .false.
res_latlon_dynamics = @[RES_LATLON_DYNAMICS]
increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID]
reset_eta = .false.
rf_cutoff = 20000.0
sg_cutoff = 10000.0
@@ -150,7 +149,7 @@
dust_opt = 5
drydep_opt = 1
coarsepm_settling = 1
smoke_forecast = @[SMOKE_FORECAST]
hwp_method = @[SMOKE_FORECAST]
aero_ind_fdb = .false.
aero_dir_fdb = .false.
addsmoke_flag = 1

0 comments on commit 5324d64

Please sign in to comment.