Skip to content
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.

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

Fix for land component model #2191

Merged
merged 48 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
f284251
switch to v2 surface files
uturuncoglu Mar 13, 2024
1fe2e85
add debug test for atm-lnd coupled configuration
uturuncoglu Mar 13, 2024
06a06fc
point noahmp branch
uturuncoglu Mar 14, 2024
1aea151
sync components
Apr 16, 2024
116ea87
Merge remote-tracking branch 'origin/develop' into hotfix/land_debug
uturuncoglu Apr 16, 2024
64a256e
update debug test
uturuncoglu Apr 16, 2024
5111df6
minor fix
uturuncoglu Apr 17, 2024
a4d1d3d
sync components
uturuncoglu Apr 18, 2024
c24ac6b
Merge remote-tracking branch 'origin/develop' into hotfix/land_debug
uturuncoglu Apr 18, 2024
be30504
add failed tests
uturuncoglu Apr 18, 2024
b59bc44
Add number of compiler warnings and/or remarks to the log file
DusanJovic-NOAA Apr 24, 2024
fb66413
Use 'grep -c' as suggested by shellcheck
DusanJovic-NOAA Apr 24, 2024
c4bc489
Explicitly diasable remark 8291
DusanJovic-NOAA Apr 25, 2024
62a027a
Update rt.sh
DusanJovic-NOAA Apr 25, 2024
1dcd81f
sync components
uturuncoglu Apr 25, 2024
2095788
sync model
uturuncoglu Apr 25, 2024
ab03568
Merge branch 'ufs-community:develop' into rt_log_compiler_warnings
DusanJovic-NOAA Apr 25, 2024
f0f5379
Delete tests/logs/RT-run-Derecho.log
zach1221 Apr 26, 2024
66029a3
Delete tests/logs/RT-run-Hercules.log
zach1221 Apr 26, 2024
b9b49d9
add test changes
uturuncoglu Apr 26, 2024
b0fd5ff
Merge branch 'hotfix/land_debug' of https://github.com/uturuncoglu/uf…
uturuncoglu Apr 26, 2024
fc1d99c
Merge remote-tracking branch 'upstream/rt_log_compiler_warnings' into…
jkbk2004 Apr 26, 2024
dcf45a9
Update bl_date.conf
zach1221 Apr 28, 2024
aef829f
Update control_p8_atmlnd_debug extend wallclock
zach1221 Apr 29, 2024
6abfdd4
[AutoRT] Hercules Job Completed.
epic-cicd-jenkins Apr 29, 2024
f4b9146
[AutoRT] Derecho Job Completed.
epic-cicd-jenkins Apr 29, 2024
5175ca7
add gaea RT logs: passed
zach1221 Apr 29, 2024
9ae48b7
add orion RT logs: passed
zach1221 Apr 29, 2024
42f5bf6
update land debug test
uturuncoglu Apr 29, 2024
dc282a7
fix minor typo
uturuncoglu Apr 29, 2024
d35f6da
remove wallclock bumps in atmlnd debug case
BrianCurtis-NOAA Apr 29, 2024
7441d3b
add control_p8_atmlnd_debug re-test orion logs
zach1221 Apr 29, 2024
d089930
add control_p8_atmlnd_debug re-test hercules logs
zach1221 Apr 29, 2024
e33b64c
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Apr 29, 2024
c84253f
add derecho RT logs: all passed
zach1221 Apr 29, 2024
901d17f
append Gaea control_p8_atmlnd_debug
FernandoAndrade-NOAA Apr 29, 2024
6299dfe
Acorn RT Log: Passed
BrianCurtis-NOAA Apr 29, 2024
5b0b6b0
add hera RT log passed
FernandoAndrade-NOAA Apr 30, 2024
12c0972
add jet RT log passed
FernandoAndrade-NOAA Apr 30, 2024
9652d62
add cpld_control_gnu ORT logs: passed
zach1221 Apr 30, 2024
fd0f8ef
add control_p8_gnu ORT logs: passed
zach1221 Apr 30, 2024
53fc1b0
add regional_control_gnu ORT logs: passed
zach1221 Apr 30, 2024
1fb1024
add control_p8_gnu ORT logs: passed
zach1221 Apr 30, 2024
8a476f5
add regional_control_gnu ORT logs: passed
zach1221 Apr 30, 2024
d96877e
add cpld_control_gnu ORT logs: passed
zach1221 Apr 30, 2024
90db0a9
hash update noah-mp
jkbk2004 Apr 30, 2024
7e60d00
add bit_base append to regional ORT logs
zach1221 Apr 30, 2024
c6c7c9b
Update rt.sh
jkbk2004 Apr 30, 2024
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
3 changes: 3 additions & 0 deletions cmake/Intel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5462")
# remark #7712: This variable has not been used.
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 7712")

# remark #8291: Recommended relationship between field width 'W' and the number of fractional digits 'D' in this edit descriptor is 'W>=D+7'.
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 8291")

if(CMAKE_Platform STREQUAL "derecho.intel")
set(CMAKE_Fortran_LINK_FLAGS "-Wl,--copy-dt-needed-entries")
endif()
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240419
export BL_DATE=20240426
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Apr 24 12:38:17 UTC 2024
Mon Apr 29 18:57:13 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_1818248/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 276.967845
0: The maximum resident set size (KB) = 1253216
0: The total amount of wall time = 269.680202
0: The maximum resident set size (KB) = 1266668

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_1818248/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 960.176678
0: The maximum resident set size (KB) = 1233464
0: The total amount of wall time = 949.326805
0: The maximum resident set size (KB) = 1255152

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_1818248/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 238.109868
0: The maximum resident set size (KB) = 1235600
0: The total amount of wall time = 240.344326
0: The maximum resident set size (KB) = 1245676

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_1818248/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 239.999110
0: The maximum resident set size (KB) = 1231020
0: The total amount of wall time = 237.351607
0: The maximum resident set size (KB) = 1245716

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_1818248/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 241.494846
0: The maximum resident set size (KB) = 1230996
0: The total amount of wall time = 242.201971
0: The maximum resident set size (KB) = 1246024

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_1818248/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 240.187367
0: The maximum resident set size (KB) = 1237016
0: The total amount of wall time = 238.461943
0: The maximum resident set size (KB) = 1245616

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_1818248/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2538358/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 = 239.880609
0: The maximum resident set size (KB) = 1228084
0: The total amount of wall time = 249.430767
0: The maximum resident set size (KB) = 1247248

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Apr 24 13:54:57 UTC 2024
Elapsed time: 01h:16m:40s. Have a nice day!
Mon Apr 29 20:17:04 UTC 2024
Elapsed time: 01h:19m:51s. Have a nice day!
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 @@
Wed Apr 24 14:04:01 UTC 2024
Mon Apr 29 23:05:39 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2151810/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3667018/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 = 1311.811572
0: The maximum resident set size (KB) = 1340536
0: The total amount of wall time = 1323.060262
0: The maximum resident set size (KB) = 1364380

Test dbg_base 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_2151810/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3667018/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 = 389.794167
0: The maximum resident set size (KB) = 1341484
0: The total amount of wall time = 393.654864
0: The maximum resident set size (KB) = 1360348

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_2151810/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3667018/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 = 394.333320
0: The maximum resident set size (KB) = 1339512
0: The total amount of wall time = 398.993468
0: The maximum resident set size (KB) = 1358812

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Apr 24 15:05:09 UTC 2024
Elapsed time: 01h:01m:09s. Have a nice day!
Tue Apr 30 00:03:24 UTC 2024
Elapsed time: 00h:57m:46s. Have a nice day!
61 changes: 12 additions & 49 deletions tests/logs/OpnReqTests_regional_control_hera.log
BrianCurtis-NOAA marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
Wed Apr 24 19:38:47 UTC 2024
Tue Apr 30 00:26:07 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_777322/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving dynf000.nc .........OK
Moving dynf006.nc .........OK
Moving phyf000.nc .........OK
Moving phyf006.nc .........OK
Moving PRSLEV.GrbF00 .........OK
Moving PRSLEV.GrbF06 .........OK
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 1236.978294
0: The maximum resident set size (KB) = 577672

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_777322/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4130396/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -33,14 +14,14 @@ Checking test dcp results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2229.582684
0: The maximum resident set size (KB) = 541864
0: The total amount of wall time = 2131.450659
0: The maximum resident set size (KB) = 555224

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_777322/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4130396/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -52,32 +33,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 2186.237690
0: The maximum resident set size (KB) = 539180
0: The total amount of wall time = 2150.481127
0: The maximum resident set size (KB) = 553380

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_777322/std_std
Checking test std results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Comparing phyf000.nc .....USING NCCMP......OK
Comparing phyf006.nc .....USING NCCMP......OK
Comparing PRSLEV.GrbF00 .....USING CMP......OK
Comparing PRSLEV.GrbF06 .....USING CMP......OK
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2172.179940
0: The maximum resident set size (KB) = 541092

Test std 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_777322/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4130396/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -88,11 +51,11 @@ Checking test thr results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2094.600637
0: The maximum resident set size (KB) = 541332
0: The total amount of wall time = 2147.836334
0: The maximum resident set size (KB) = 554792

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Apr 24 23:19:25 UTC 2024
Elapsed time: 03h:40m:38s. Have a nice day!
Tue Apr 30 02:20:21 UTC 2024
Elapsed time: 01h:54m:14s. Have a nice day!
Loading
Loading