Skip to content

In Noah-MP, set zero for canopy liquid and canopy ice over glacier #2723

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
FernandoAndrade-NOAA merged 30 commits into from
Jun 6, 2025
Merged

In Noah-MP, set zero for canopy liquid and canopy ice over glacier #2723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bf4eca7
Noah-MP, set zero for canopy liquid and canopy ice over glacier
wzzheng90 May 2, 2025
9d1388b
Noah-MP, set zero for canopy liquid and canopy ice over glacier
wzzheng90 May 2, 2025
ed116cb
Noah-MP, modifications for snow glacier
wzzheng90 May 7, 2025
a9ae2be
Noah-MP, set all the undefined over the glacier to some values
wzzheng90 May 8, 2025
3cfc53f
test_changes.list for Noah-MP, set zero for canopy liquid and canopy …
wzzheng90 May 19, 2025
f377a32
RegressionTests_hera.log for Noah-MP, set zero for canopy liquid and …
wzzheng90 May 19, 2025
cc9353c
skip these two tests for now because of two RRFS tests failed to run …
wzzheng90 May 29, 2025
acc5a11
Merge remote-tracking branch 'upstream/develop' into canopywater_glacier
wzzheng90 Jun 1, 2025
8d09242
Merge remote-tracking branch 'upstream/develop' into canopywater_glacier
wzzheng90 Jun 2, 2025
1936daf
updated FV3/upp
wzzheng90 Jun 2, 2025
eee6215
Updating container info/ removing Jet support and other misc changes
Jun 2, 2025
70f9a94
Misc changes
Jun 2, 2025
d05e0a0
Undoing jet change in docs outside of HSD
Jun 2, 2025
3cd664d
Minor changes to resolve comments
Jun 2, 2025
9fa3673
fix gitmodules and fv3 hash
jkbk2004 Jun 3, 2025
5118e96
hash update fv3 and ww3
jkbk2004 Jun 3, 2025
0089571
sync up gocart hash
jkbk2004 Jun 3, 2025
812f151
Merge remote-tracking branch 'upstream/text/emergencyHSDUpdates' into…
jkbk2004 Jun 3, 2025
d2d5156
Update bl_date.conf
jkbk2004 Jun 3, 2025
b4fb144
ORT Jobs Completed.
epic-cicd-jenkins Jun 3, 2025
8876b8e
ORT Jobs Completed.
epic-cicd-jenkins Jun 3, 2025
5abb0f8
add hera RT log passed
FernandoAndrade-NOAA Jun 4, 2025
f42a53b
add gaeac6 RT log passed
FernandoAndrade-NOAA Jun 4, 2025
4c5cd8c
Update test_changes.list
FernandoAndrade-NOAA Jun 4, 2025
2fefce6
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Jun 4, 2025
5bc3f9e
Acorn RT Log: Passed
BrianCurtis-NOAA Jun 4, 2025
a8ab7b2
add hercules RT log: passed
jkbk2004 Jun 5, 2025
318b763
add orion RT log: passed
jkbk2004 Jun 5, 2025
b82c90f
Merge branch 'develop' into canopywater_glacier
jkbk2004 Jun 5, 2025
3a858e2
update FV3 hash and revert change in gitmodules
jkbk2004 Jun 6, 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 39179d to bac693
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20250528
export BL_DATE=20250603
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 29 00:29:39 UTC 2025
Tue Jun 3 20:57:24 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_749447/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 251.259903
0: The maximum resident set size (KB) = 1570268
0: The total amount of wall time = 251.872196
0: The maximum resident set size (KB) = 1573148

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_749447/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 899.808881
0: The maximum resident set size (KB) = 1540120
0: The total amount of wall time = 865.140281
0: The maximum resident set size (KB) = 1549648

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_749447/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 223.908069
0: The maximum resident set size (KB) = 1551360
0: The total amount of wall time = 227.245244
0: The maximum resident set size (KB) = 1552564

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_749447/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 224.701546
0: The maximum resident set size (KB) = 1538644
0: The total amount of wall time = 238.672805
0: The maximum resident set size (KB) = 1543656

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_749447/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 224.001909
0: The maximum resident set size (KB) = 1551536
0: The total amount of wall time = 225.055323
0: The maximum resident set size (KB) = 1550008

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_749447/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 229.207386
0: The maximum resident set size (KB) = 1550532
0: The total amount of wall time = 234.750899
0: The maximum resident set size (KB) = 1551244

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_749447/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3354680/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 = 228.090294
0: The maximum resident set size (KB) = 1516772
0: The total amount of wall time = 226.054325
0: The maximum resident set size (KB) = 1551696

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu May 29 02:48:14 UTC 2025
Elapsed time: 02h:18m:35s. Have a nice day!
Tue Jun 3 22:06:50 UTC 2025
Elapsed time: 01h:09m:27s. 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 May 28 22:27:58 UTC 2025
Tue Jun 3 19:22:33 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_575393/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2899308/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 = 2310.534609
0: The maximum resident set size (KB) = 1648488
0: The total amount of wall time = 2305.707111
0: The maximum resident set size (KB) = 1636828

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_575393/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2899308/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 = 589.552190
0: The maximum resident set size (KB) = 1643152
0: The total amount of wall time = 586.502100
0: The maximum resident set size (KB) = 1652436

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_575393/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2899308/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 = 597.711905
0: The maximum resident set size (KB) = 1646116
0: The total amount of wall time = 592.671878
0: The maximum resident set size (KB) = 1624504

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu May 29 00:29:39 UTC 2025
Elapsed time: 02h:01m:41s. Have a nice day!
Tue Jun 3 20:57:23 UTC 2025
Elapsed time: 01h:34m:51s. 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 May 28 21:29:41 UTC 2025
Tue Jun 3 18:17:51 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_377966/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2761958/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 = 604.281320
0: The maximum resident set size (KB) = 890968
0: The total amount of wall time = 607.679094
0: The maximum resident set size (KB) = 902140

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_377966/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2761958/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 = 487.407629
0: The maximum resident set size (KB) = 860284
0: The total amount of wall time = 496.620378
0: The maximum resident set size (KB) = 866844

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_377966/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2761958/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 = 496.886826
0: The maximum resident set size (KB) = 863676
0: The total amount of wall time = 490.146312
0: The maximum resident set size (KB) = 869980

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_377966/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2761958/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 = 492.315665
0: The maximum resident set size (KB) = 863216
0: The total amount of wall time = 495.559411
0: The maximum resident set size (KB) = 855280

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed May 28 22:27:58 UTC 2025
Elapsed time: 00h:58m:17s. Have a nice day!
Tue Jun 3 19:22:32 UTC 2025
Elapsed time: 01h:04m:42s. Have a nice day!
Loading