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

Code update for HR4_roughness #2022

Merged
merged 23 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Merge branch 'develop' into HR4_roughness
  • Loading branch information
grantfirl committed Jan 19, 2024
commit eb3ca66ca92cbac950abbff0e0957a04288a052f
2 changes: 1 addition & 1 deletion FV3
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=20240108
export BL_DATE=20240111
2 changes: 0 additions & 2 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ export HYBEDMF=.true.
export SHINHONG=.false.
export DO_YSU=.false.
export DO_MYNNEDMF=.false.
export DO_MYJPBL=.false.
export HURR_PBL=.false.
export MONINQ_FAC=1.0
export SFCLAY_COMPUTE_FLUX=.false.
Expand Down Expand Up @@ -1392,7 +1391,6 @@ export LSM=3
export LSOIL_LSM=9
export DO_MYNNSFCLAY=.true.
export DO_MYNNEDMF=.true.
export DO_MYJPBL=.true
export HYBEDMF=.false.
export SHAL_CNV=.false.
export DO_SAT_ADJ=.false.
Expand Down
191 changes: 176 additions & 15 deletions tests/logs/OpnReqTests_control_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Thu Jan 11 18:26:27 UTC 2024
Wed Jan 17 04:12:52 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_136224/control_p8_gnu_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_bit_base
Checking test bit_base control_p8_gnu results ....
Moving baseline bit_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base control_p8_gnu 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 = 287.829705
0: The maximum resident set size (KB) = 1307184
0: The total amount of wall time = 287.973242
0: The maximum resident set size (KB) = 1291024

Test bit_base control_p8_gnu 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_136224/control_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_dbg_base
Checking test dbg_base control_p8_gnu results ....
Moving baseline dbg_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,15 +106,176 @@ Moving baseline dbg_base control_p8_gnu 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.665475
0: The maximum resident set size (KB) = 1294204
0: The total amount of wall time = 919.574496
0: The maximum resident set size (KB) = 1265904

Test dbg_base control_p8_gnu 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_160883/control_p8_gnu_dcp
Checking test dcp control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Comparing sfcf024.nc .........OK
Comparing atmf000.nc .........OK
Comparing atmf021.nc .........OK
Comparing atmf024.nc .........OK
Comparing GFSFLX.GrbF00 .........OK
Comparing GFSFLX.GrbF21 .........OK
Comparing GFSFLX.GrbF24 .........OK
Comparing GFSPRS.GrbF00 .........OK
Comparing GFSPRS.GrbF21 .........OK
Comparing GFSPRS.GrbF24 .........OK
Comparing RESTART/20210323.060000.coupler.res .........OK
Comparing RESTART/20210323.060000.fv_core.res.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile1.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile2.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile3.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile4.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile6.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile1.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile2.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile3.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile4.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

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

Test dcp control_p8_gnu 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_160883/control_p8_gnu_mpi
Checking test mpi control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Comparing sfcf024.nc .........OK
Comparing atmf000.nc .........OK
Comparing atmf021.nc .........OK
Comparing atmf024.nc .........OK
Comparing GFSFLX.GrbF00 .........OK
Comparing GFSFLX.GrbF21 .........OK
Comparing GFSFLX.GrbF24 .........OK
Comparing GFSPRS.GrbF00 .........OK
Comparing GFSPRS.GrbF21 .........OK
Comparing GFSPRS.GrbF24 .........OK
Comparing RESTART/20210323.060000.coupler.res .........OK
Comparing RESTART/20210323.060000.fv_core.res.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile1.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile2.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile3.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile4.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile6.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile1.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile2.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile3.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile4.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

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

Test mpi control_p8_gnu 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_160883/control_p8_gnu_rst
Checking test rst control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Comparing sfcf024.nc .........OK
Comparing atmf000.nc .........OK
Comparing atmf021.nc .........OK
Comparing atmf024.nc .........OK
Comparing GFSFLX.GrbF00 .........OK
Comparing GFSFLX.GrbF21 .........OK
Comparing GFSFLX.GrbF24 .........OK
Comparing GFSPRS.GrbF00 .........OK
Comparing GFSPRS.GrbF21 .........OK
Comparing GFSPRS.GrbF24 .........OK
Comparing RESTART/20210323.060000.coupler.res .........OK
Comparing RESTART/20210323.060000.fv_core.res.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_core.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile1.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile2.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile3.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile4.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile5.nc .........OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile6.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile1.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile2.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile3.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile4.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.phy_data.tile6.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile1.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile2.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile3.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile4.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

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

Test rst control_p8_gnu 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_136224/control_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_std_base
Checking test std_base control_p8_gnu results ....
Moving baseline std_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -162,14 +323,14 @@ Moving baseline std_base control_p8_gnu 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.581603
0: The maximum resident set size (KB) = 1286000
0: The total amount of wall time = 264.494539
0: The maximum resident set size (KB) = 1266788

Test std_base control_p8_gnu 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_136224/control_p8_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160883/control_p8_gnu_thr
Checking test thr control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -216,11 +377,11 @@ Checking test thr control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 251.781173
0: The maximum resident set size (KB) = 1285220
0: The total amount of wall time = 256.591074
0: The maximum resident set size (KB) = 1265908

Test thr control_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Jan 11 19:42:32 UTC 2024
Elapsed time: 01h:16m:07s. Have a nice day!
Wed Jan 17 05:41:37 UTC 2024
Elapsed time: 01h:28m:46s. 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 @@
Thu Jan 11 14:59:21 UTC 2024
Tue Jan 16 21:19:42 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_290039/cpld_control_nowave_noaero_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4449/cpld_control_nowave_noaero_p8_gnu_dbg_base
Checking test dbg_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu 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 = 1249.449154
0: The maximum resident set size (KB) = 1405444
0: The total amount of wall time = 1243.825496
0: The maximum resident set size (KB) = 1385800

Test dbg_base cpld_control_nowave_noaero_p8_gnu 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_290039/cpld_control_nowave_noaero_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4449/cpld_control_nowave_noaero_p8_gnu_rst
Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing sfcf021.tile1.nc .........OK
Comparing sfcf021.tile2.nc .........OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing RESTART/iced.2021-03-23-21600.nc .........OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 374.714136
0: The maximum resident set size (KB) = 1400652
0: The total amount of wall time = 393.342243
0: The maximum resident set size (KB) = 1382812

Test rst cpld_control_nowave_noaero_p8_gnu 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_290039/cpld_control_nowave_noaero_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_4449/cpld_control_nowave_noaero_p8_gnu_std_base
Checking test std_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base cpld_control_nowave_noaero_p8_gnu 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.940945
0: The maximum resident set size (KB) = 1399656
0: The total amount of wall time = 390.186220
0: The maximum resident set size (KB) = 1387468

Test std_base cpld_control_nowave_noaero_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Jan 11 15:58:56 UTC 2024
Elapsed time: 00h:59m:36s. Have a nice day!
Tue Jan 16 22:28:16 UTC 2024
Elapsed time: 01h:08m:35s. Have a nice day!
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.