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.

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

fixed excessive evaporation when both innerloop and mraerosol=T #2221

Merged
merged 31 commits into from
May 2, 2024
Merged

fixed excessive evaporation when both innerloop and mraerosol=T #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
77a9252
point to Anning-FV3 branch
AnningCheng-NOAA Mar 29, 2024
7117677
merge to the develop branch in ufs-weather-model
AnningCheng-NOAA Apr 19, 2024
9d4608c
update FV3 submodule pointer
grantfirl Apr 19, 2024
935a765
update FV3 submodule pointer
grantfirl Apr 25, 2024
a886634
fix typo in .gitmodules and update FV3 submodule pointer
grantfirl Apr 25, 2024
fdc2074
add test_changes.list and RT log
grantfirl Apr 26, 2024
c091da8
Merge branch 'develop' into mr2_innl
grantfirl Apr 26, 2024
d7fcb15
Cleanup unused code and variables, fix wcoss2 issue starting ecflow
BrianCurtis-NOAA Apr 30, 2024
557a41c
Bring in @DusanJovic-NOAA trap changes
BrianCurtis-NOAA Apr 30, 2024
8973ac7
Merge branch 'develop' into mr2_innl
grantfirl Apr 30, 2024
521f934
Update bl_date.conf
zach1221 Apr 30, 2024
deb3406
[AutoRT] Hercules Job Completed.
epic-cicd-jenkins May 1, 2024
66d94f9
Merge branch 'mr2_innl' of github.com:AnningCheng-NOAA/ufs-weather-mo…
epic-cicd-jenkins May 1, 2024
8c928a6
[AutoRT] Derecho Job Completed.
epic-cicd-jenkins May 1, 2024
5bdfe06
add hera RT log passed
FernandoAndrade-NOAA May 1, 2024
806df0a
Merge some machine ecflow starts together and move to case statements
BrianCurtis-NOAA May 1, 2024
64a3f95
add gaea RT logs: passed
zach1221 May 1, 2024
b2d7f81
add derecho RT logs:all passed
zach1221 May 1, 2024
46b2a05
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA May 1, 2024
185711d
Merge branch 'ecflow_fixes' of github.com:BrianCurtis-NOAA/ufs-weathe…
BrianCurtis-NOAA May 1, 2024
a987c60
Merge branch 'ecflow_fixes' of github.com:BrianCurtis-NOAA/ufs-weathe…
BrianCurtis-NOAA May 1, 2024
d38b3dd
Merge branch 'mr2_innl' of github.com:AnningCheng-NOAA/ufs-weather-mo…
BrianCurtis-NOAA May 1, 2024
5ae1d5f
WCOSS2 RT Log
BrianCurtis-NOAA May 1, 2024
f9fb2d7
Merge branch 'mr2_innl' of github.com:AnningCheng-NOAA/ufs-weather-mo…
BrianCurtis-NOAA May 1, 2024
ee1e3c5
Acorn RT Log: Passed
BrianCurtis-NOAA May 1, 2024
1ba2fed
add control_p8_gnu ORT logs: passed
zach1221 May 1, 2024
e216e23
add regional_control_gnu ORT logs: passed
zach1221 May 1, 2024
c9be7eb
add cpld_control_gnu ORT logs: passed
zach1221 May 1, 2024
05987ff
add jet RT log passed
FernandoAndrade-NOAA May 1, 2024
f024f16
add orion RT logs: passed
zach1221 May 1, 2024
f232db6
update FV3 hash and revert .gitmodules
grantfirl May 1, 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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+1 −1 ccpp/framework
+1 −1 ccpp/physics
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=20240426
export BL_DATE=20240430
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 @@
Mon Apr 29 18:57:13 UTC 2024
Wed May 1 16:47:10 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_2538358/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1433614/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 = 269.680202
0: The maximum resident set size (KB) = 1266668
0: The total amount of wall time = 273.804433
0: The maximum resident set size (KB) = 1253420

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

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

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

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

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

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

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 29 20:17:04 UTC 2024
Elapsed time: 01h:19m:51s. Have a nice day!
Wed May 1 17:54:31 UTC 2024
Elapsed time: 01h:07m:25s. 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 @@
Mon Apr 29 23:05:39 UTC 2024
Wed May 1 15:19:59 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_3667018/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2945403/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 = 1323.060262
0: The maximum resident set size (KB) = 1364380
0: The total amount of wall time = 1448.267808
0: The maximum resident set size (KB) = 1364020

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_3667018/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2945403/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 = 393.654864
0: The maximum resident set size (KB) = 1360348
0: The total amount of wall time = 444.246604
0: The maximum resident set size (KB) = 1359328

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

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Apr 30 00:03:24 UTC 2024
Elapsed time: 00h:57m:46s. Have a nice day!
Wed May 1 16:30:01 UTC 2024
Elapsed time: 01h:10m:03s. Have a nice day!
68 changes: 31 additions & 37 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,28 @@
Tue Apr 30 00:26:07 UTC 2024
Wed May 1 12:44:33 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_3929078/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 = 1265.539423
0: The maximum resident set size (KB) = 593464

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_4130396/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3929078/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -14,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 = 2131.450659
0: The maximum resident set size (KB) = 555224
0: The total amount of wall time = 2156.871537
0: The maximum resident set size (KB) = 548144

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

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

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_4130396/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3929078/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -51,36 +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 = 2147.836334
0: The maximum resident set size (KB) = 554792
0: The total amount of wall time = 2148.252094
0: The maximum resident set size (KB) = 561788

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Apr 30 02:20:21 UTC 2024
Elapsed time: 01h:54m:14s. Have a nice day!
Tue Apr 30 16:20:31 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_1270533/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 = 1420.618445
0: The maximum resident set size (KB) = 583292

Test bit_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Apr 30 16:49:13 UTC 2024
Elapsed time: 00h:28m:43s. Have a nice day!
Wed May 1 15:05:29 UTC 2024
Elapsed time: 02h:20m:57s. Have a nice day!
Loading
Loading