Skip to content

Update tests such that LSM and LANDICE are set appropriately #2772

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 33 commits into from
Sep 16, 2025
Merged

Update tests such that LSM and LANDICE are set appropriately #2772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
aa176c2
Verify in tests that LSM and LANDICE were set appropriately
BrianCurtis-NOAA Jun 11, 2025
3710508
Test keeping LSM=2 in gnv1 test and bringing in LANDICE as false
BrianCurtis-NOAA Jun 11, 2025
4487339
Remove commented out lines in tests. RT suite passed, compared agains…
BrianCurtis-NOAA Jun 11, 2025
6b8a04d
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA Aug 14, 2025
0d4f8ef
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA Aug 19, 2025
c753f6f
update test_changes.list
BrianCurtis-NOAA Aug 19, 2025
7f8753f
add test and parm changes and ursa log, to be updated
BrianCurtis-NOAA Aug 19, 2025
110f2e3
reversing changes to lowres lsm and adding landice, fix typo for cont…
BrianCurtis-NOAA Aug 20, 2025
48ab279
Address merge conflicts
BrianCurtis-NOAA Sep 2, 2025
79abecb
updated test_changes.list
BrianCurtis-NOAA Sep 2, 2025
0527d7a
Merge branch 'ufs-community:develop' into landice
BrianCurtis-NOAA Sep 2, 2025
9bade95
Update some LSM values, and fix testing issues
BrianCurtis-NOAA Sep 4, 2025
1b19950
Address merge conflicts
BrianCurtis-NOAA Sep 4, 2025
2254d54
update .gitmodules to latest ufsatm from fv3atm
BrianCurtis-NOAA Sep 4, 2025
8338a33
Merge branch 'landice' of github.com:BrianCurtis-NOAA/ufs-weather-mod…
BrianCurtis-NOAA Sep 4, 2025
19f6eff
More cleanup of code, lsm changes
BrianCurtis-NOAA Sep 4, 2025
2197da3
Updated test_changes.list based on latest changes
BrianCurtis-NOAA Sep 4, 2025
0daaef4
HAFS test should be using NoahMP not NoahLSM
BrianCurtis-NOAA Sep 5, 2025
e5edc3e
remove hafs test from test_changes.list
BrianCurtis-NOAA Sep 8, 2025
b25866d
address merge conflicts
BrianCurtis-NOAA Sep 15, 2025
166c3ad
update merge conflicts
BrianCurtis-NOAA Sep 15, 2025
34f1987
Update BL Date to 20250915
BrianCurtis-NOAA Sep 15, 2025
0070454
ORT Jobs Completed.
epic-cicd-jenkins Sep 15, 2025
ccb8057
Acorn RT Log: Passed
BrianCurtis-NOAA Sep 16, 2025
5d6f90a
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Sep 16, 2025
0cdc42a
hercules rt log - passed
gspetro-NOAA Sep 16, 2025
2db7711
Merge branch 'landice' of https://github.com/BrianCurtis-NOAA/ufs-wea…
gspetro-NOAA Sep 16, 2025
e39db67
add hera RT log passed
FernandoAndrade-NOAA Sep 16, 2025
3fddea6
add ursa RT log passed
FernandoAndrade-NOAA Sep 16, 2025
47f07ca
add gaeaC6 RT log passed
FernandoAndrade-NOAA Sep 16, 2025
a53cd22
orion rt log - passed
gspetro-NOAA Sep 16, 2025
71ce8ae
Merge branch 'landice' of https://github.com/BrianCurtis-NOAA/ufs-wea…
gspetro-NOAA Sep 16, 2025
ed79589
Remove commented out lines in tests files
BrianCurtis-NOAA Sep 16, 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 tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20250911
export BL_DATE=20250915
4 changes: 4 additions & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,7 @@ export_tiled() {
export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
export LSM=2
export LANDICE=".false."
}

Expand Down Expand Up @@ -1845,6 +1846,7 @@ export FHZERO=6
export IALB=2
export IEMS=2
export LSM=2
export LANDICE=.false.
export IOPT_DVEG=4
export IOPT_CRS=2
export IOPT_RAD=3
Expand Down Expand Up @@ -2172,6 +2174,7 @@ export IOPT_RAD=1
export IOPT_ALB=2
export IOPT_STC=1
export LSM=1
export LANDICE=.true.
export DO_GSL_DRAG_LS_BL=.true.
export DO_GSL_DRAG_SS=.true.
export DO_GSL_DRAG_TOFD=.true.
Expand Down Expand Up @@ -2536,4 +2539,5 @@ export_rrfs_v1()
export LHEATSTRG=.false.
export LSM=2
export LSOIL_LSM=4
export LANDICE=.false.
}
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 Sep 11 20:57:56 UTC 2025
Mon Sep 15 22:40:15 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 248.435842
0: The maximum resident set size (KB) = 1557648
0: The total amount of wall time = 250.799002
0: The maximum resident set size (KB) = 1566252

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 896.908058
0: The maximum resident set size (KB) = 1542396
0: The total amount of wall time = 874.359080
0: The maximum resident set size (KB) = 1543452

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 225.554497
0: The maximum resident set size (KB) = 1547840
0: The total amount of wall time = 227.106996
0: The maximum resident set size (KB) = 1534408

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 228.682329
0: The maximum resident set size (KB) = 1544624
0: The total amount of wall time = 232.819402
0: The maximum resident set size (KB) = 1545340

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 227.451526
0: The maximum resident set size (KB) = 1549020
0: The total amount of wall time = 226.874875
0: The maximum resident set size (KB) = 1537112

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 231.718687
0: The maximum resident set size (KB) = 1536928
0: The total amount of wall time = 228.995076
0: The maximum resident set size (KB) = 1533160

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_702291/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 = 226.918196
0: The maximum resident set size (KB) = 1535024
0: The total amount of wall time = 227.240667
0: The maximum resident set size (KB) = 1536048

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Sep 11 22:21:43 UTC 2025
Elapsed time: 01h:23m:48s. Have a nice day!
Mon Sep 15 23:51:07 UTC 2025
Elapsed time: 01h:10m:54s. 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 @@
Thu Sep 11 19:31:01 UTC 2025
Mon Sep 15 21:16:09 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3856063/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_25301/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 = 2305.709842
0: The maximum resident set size (KB) = 1659580
0: The total amount of wall time = 2314.722123
0: The maximum resident set size (KB) = 1649004

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3856063/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_25301/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.246601
0: The maximum resident set size (KB) = 1638076
0: The total amount of wall time = 581.104517
0: The maximum resident set size (KB) = 1632388

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3856063/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_25301/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 = 585.000271
0: The maximum resident set size (KB) = 1632412
0: The total amount of wall time = 588.674921
0: The maximum resident set size (KB) = 1640712

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Sep 11 20:57:55 UTC 2025
Elapsed time: 01h:26m:55s. Have a nice day!
Mon Sep 15 22:40:13 UTC 2025
Elapsed time: 01h:24m:04s. 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 @@
Thu Sep 11 18:36:17 UTC 2025
Mon Sep 15 20:19:01 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 618.615416
0: The maximum resident set size (KB) = 887876
0: The total amount of wall time = 614.840560
0: The maximum resident set size (KB) = 900992

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 493.356681
0: The maximum resident set size (KB) = 864740
0: The total amount of wall time = 494.864097
0: The maximum resident set size (KB) = 855764

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 493.811962
0: The maximum resident set size (KB) = 867032
0: The total amount of wall time = 494.656386
0: The maximum resident set size (KB) = 865020

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3676816/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 = 490.811133
0: The maximum resident set size (KB) = 866448
0: The total amount of wall time = 491.840313
0: The maximum resident set size (KB) = 856708

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Sep 11 19:31:22 UTC 2025
Elapsed time: 00h:55m:05s. Have a nice day!
Mon Sep 15 21:16:09 UTC 2025
Elapsed time: 00h:57m:08s. Have a nice day!
Loading