Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into fv3atm_output_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA committed May 7, 2024
2 parents 1593457 + 223b9ae commit 97908d1
Show file tree
Hide file tree
Showing 25 changed files with 2,803 additions and 3,225 deletions.
2 changes: 1 addition & 1 deletion NOAHMP-interface/noahmp
Submodule noahmp updated 4 files
+25 −10 drivers/nuopc/lnd_comp_domain.F90
+1 −1 drivers/nuopc/lnd_comp_driver.F90
+109 −40 drivers/nuopc/lnd_comp_io.F90
+119 −116 drivers/nuopc/lnd_comp_types.F90
3 changes: 3 additions & 0 deletions cmake/Intel.cmake
View file
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
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240419
export BL_DATE=20240503
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Apr 24 12:38:17 UTC 2024
Mon May 6 03:31:26 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_2102271/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 = 272.641469
0: The maximum resident set size (KB) = 1268416

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_2102271/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 = 939.651847
0: The maximum resident set size (KB) = 1254768

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_2102271/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 = 241.788160
0: The maximum resident set size (KB) = 1249176

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_2102271/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 = 244.812605
0: The maximum resident set size (KB) = 1246164

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_2102271/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.401979
0: The maximum resident set size (KB) = 1247912

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_2102271/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 = 245.916587
0: The maximum resident set size (KB) = 1245720

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_2102271/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 = 244.965128
0: The maximum resident set size (KB) = 1242856

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 May 6 04:33:54 UTC 2024
Elapsed time: 01h:02m:28s. Have a nice day!
169 changes: 157 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Apr 24 14:04:01 UTC 2024
Mon May 6 21:46:21 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_2042345/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,159 @@ 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 = 1337.937513
0: The maximum resident set size (KB) = 1366960

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_2042345/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc ............MISSING file
Comparing sfcf021.tile2.nc ............MISSING file
Comparing sfcf021.tile3.nc ............MISSING file
Comparing sfcf021.tile4.nc ............MISSING file
Comparing sfcf021.tile5.nc ............MISSING file
Comparing sfcf021.tile6.nc ............MISSING file
Comparing atmf021.tile1.nc ............MISSING file
Comparing atmf021.tile2.nc ............MISSING file
Comparing atmf021.tile3.nc ............MISSING file
Comparing atmf021.tile4.nc ............MISSING file
Comparing atmf021.tile5.nc ............MISSING file
Comparing atmf021.tile6.nc ............MISSING file
Comparing sfcf024.tile1.nc ............MISSING file
Comparing sfcf024.tile2.nc ............MISSING file
Comparing sfcf024.tile3.nc ............MISSING file
Comparing sfcf024.tile4.nc ............MISSING file
Comparing sfcf024.tile5.nc ............MISSING file
Comparing sfcf024.tile6.nc ............MISSING file
Comparing atmf024.tile1.nc ............MISSING file
Comparing atmf024.tile2.nc ............MISSING file
Comparing atmf024.tile3.nc ............MISSING file
Comparing atmf024.tile4.nc ............MISSING file
Comparing atmf024.tile5.nc ............MISSING file
Comparing atmf024.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.coupler.res ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.MOM.res.nc ............MISSING file
Comparing RESTART/iced.2021-03-23-21600.nc ............MISSING file
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc ............MISSING file


Test rst FAIL


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_2042345/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Moving sfcf021.tile2.nc .........OK
Moving sfcf021.tile3.nc .........OK
Moving sfcf021.tile4.nc .........OK
Moving sfcf021.tile5.nc .........OK
Moving sfcf021.tile6.nc .........OK
Moving atmf021.tile1.nc .........OK
Moving atmf021.tile2.nc .........OK
Moving atmf021.tile3.nc .........OK
Moving atmf021.tile4.nc .........OK
Moving atmf021.tile5.nc .........OK
Moving atmf021.tile6.nc .........OK
Moving sfcf024.tile1.nc .........OK
Moving sfcf024.tile2.nc .........OK
Moving sfcf024.tile3.nc .........OK
Moving sfcf024.tile4.nc .........OK
Moving sfcf024.tile5.nc .........OK
Moving sfcf024.tile6.nc .........OK
Moving atmf024.tile1.nc .........OK
Moving atmf024.tile2.nc .........OK
Moving atmf024.tile3.nc .........OK
Moving atmf024.tile4.nc .........OK
Moving atmf024.tile5.nc .........OK
Moving atmf024.tile6.nc .........OK
Moving RESTART/20210323.060000.coupler.res .........OK
Moving RESTART/20210323.060000.fv_core.res.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile6.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile6.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile1.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile2.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile3.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile4.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile5.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile6.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile1.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile2.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile3.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile4.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
Moving RESTART/20210323.060000.MOM.res.nc .........OK
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.324973
0: The maximum resident set size (KB) = 1344212

Test std_base PASS

FAILED TESTS:
Test rst failed in check_result failed
OPERATION REQUIREMENT TEST FAILED
Tue May 7 00:38:15 UTC 2024
Elapsed time: 02h:51m:56s. Have a nice day!
Tue May 7 01:53:20 UTC 2024
Start Operation Requirement Test


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_3322035/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 +280,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 = 405.576010
0: The maximum resident set size (KB) = 1340024

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_3322035/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 +350,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 = 395.446701
0: The maximum resident set size (KB) = 1344300

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 May 7 02:25:02 UTC 2024
Elapsed time: 00h:31m:43s. Have a nice day!
Loading

0 comments on commit 97908d1

Please sign in to comment.