Skip to content

Commit

Permalink
Merge branch 'develop' into dice_cplhist
Browse files Browse the repository at this point in the history
  • Loading branch information
@NickSzapiro-NOAA
NickSzapiro-NOAA authored Jun 3, 2024
2 parents 31ecd2b + 5bec704 commit 6aa26c9
Show file tree
Hide file tree
Showing 18 changed files with 2,236 additions and 2,280 deletions.
43 changes: 20 additions & 23 deletions modulefiles/ufs_wcoss2.intel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,28 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

--prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/compiler/intel/19.1.3.304")
--prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")
append_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.6.0_pnetcdf/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")

local ufs_modules = {
{["jasper"] = "2.0.25"},
{["zlib"] = "1.2.11"},
{["libpng"] = "1.6.37"},
{["hdf5-B"] = "1.14.0"},
{["netcdf-B"] = "4.9.2"},
{["pio-B"] = "2.5.10"},
{["esmf-B"] = "8.5.0"},
{["fms"] = "2023.02.01"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "3.3.3"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["gftl-shared"] = "1.6.1"},
{["mapl-B"] = "2.40.3"},
{["jasper"] = "2.0.25"},
{["zlib"] = "1.2.11"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.14.0"},
{["netcdf"] = "4.9.2"},
{["pio"] = "2.5.10"},
{["esmf"] = "8.6.0"},
{["fms"] = "2023.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "3.3.3"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["gftl-shared"] = "1.6.1"},
{["mapl"] = "2.40.3-esmf-8.6.0"},
{["pnetcdf"] = "1.12.2"},
{["scotch"] = "7.0.4"},
}

for i = 1, #ufs_modules do
Expand All @@ -48,10 +49,6 @@ for i = 1, #ufs_modules do
end
end

prepend_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.9")
scotch_ver=os.getenv("scotch_ver") or "7.0.4"
load(pathJoin("scotch",scotch_ver))

setenv("CC", "cc")
setenv("CXX", "CC")
setenv("FC", "ftn")
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=20240524
export BL_DATE=20240530
4 changes: 0 additions & 4 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,10 +921,6 @@ export_cice6() {
export CICE_RESTART_DEFLATE=0

export CICE_HISTORY_FORMAT='pnetcdf2'
if [[ ${MACHINE_ID} == wcoss2 ]]; then
export CICE_RESTART_FORMAT='hdf5'
export CICE_HISTORY_FORMAT='hdf5'
fi
export CICE_HISTORY_IOTASKS=-99
export CICE_HISTORY_REARR='box'
export CICE_HISTORY_ROOT=-99
Expand Down
62 changes: 31 additions & 31 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon May 27 22:00:37 UTC 2024
Thu May 30 23:49:24 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/bit_base_bit_base
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 205.513891
0: The maximum resident set size (KB) = 1943180
0: The total amount of wall time = 207.284592
0: The maximum resident set size (KB) = 1909148

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/dbg_base_dbg_base
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 2010.182246
0: The maximum resident set size (KB) = 1915420
0: The total amount of wall time = 2019.198702
0: The maximum resident set size (KB) = 1873432

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/dcp_dcp
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 180.505311
0: The maximum resident set size (KB) = 1880708
0: The total amount of wall time = 177.233106
0: The maximum resident set size (KB) = 1879672

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/mpi_mpi
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 179.641615
0: The maximum resident set size (KB) = 1872468
0: The total amount of wall time = 177.213010
0: The maximum resident set size (KB) = 1883996

Test mpi PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/rst_rst
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 176.094119
0: The maximum resident set size (KB) = 1904492
0: The total amount of wall time = 215.448488
0: The maximum resident set size (KB) = 1881620

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/std_base_std_base
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 175.552974
0: The maximum resident set size (KB) = 1897264
0: The total amount of wall time = 178.761689
0: The maximum resident set size (KB) = 1879288

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/thr_thr
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1853474/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 = 175.416690
0: The maximum resident set size (KB) = 1900280
0: The total amount of wall time = 176.979771
0: The maximum resident set size (KB) = 1880244

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon May 27 23:33:47 UTC 2024
Elapsed time: 01h:33m:11s. Have a nice day!
Fri May 31 01:21:09 UTC 2024
Elapsed time: 01h:31m:46s. Have a nice day!
24 changes: 9 additions & 15 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,6 @@
Tue May 28 14:50:49 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_3669994/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_326777/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 +63,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 = 1336.345357
0: The maximum resident set size (KB) = 1546880
0: The total amount of wall time = 1511.676145
0: The maximum resident set size (KB) = 1553376

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_3669994/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1319479/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 +132,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 = 400.400364
0: The maximum resident set size (KB) = 1531504
0: The total amount of wall time = 431.329311
0: The maximum resident set size (KB) = 1519904

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_3669994/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_326777/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 +202,8 @@ 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 = 403.389360
0: The maximum resident set size (KB) = 1543876
0: The total amount of wall time = 407.381438
0: The maximum resident set size (KB) = 1545864

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue May 28 15:51:14 UTC 2024
Elapsed time: 01h:00m:26s. Have a nice day!
38 changes: 19 additions & 19 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon May 27 22:04:21 UTC 2024
Fri May 31 13:00:26 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_2506150/bit_base_bit_base
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_1237170/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 = 422.480958
0: The maximum resident set size (KB) = 1253628
0: The total amount of wall time = 1296.278977
0: The maximum resident set size (KB) = 754104

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_2506150/dcp_dcp
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_1237170/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 = 309.312501
0: The maximum resident set size (KB) = 1099136
0: The total amount of wall time = 2177.504571
0: The maximum resident set size (KB) = 730460

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_2506150/std_base_std_base
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_1237170/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 = 309.504865
0: The maximum resident set size (KB) = 1091976
0: The total amount of wall time = 2282.002035
0: The maximum resident set size (KB) = 719212

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_2506150/thr_thr
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_1237170/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 = 311.713329
0: The maximum resident set size (KB) = 1100980
0: The total amount of wall time = 2158.092660
0: The maximum resident set size (KB) = 707756

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon May 27 22:58:48 UTC 2024
Elapsed time: 00h:54m:28s. Have a nice day!
Fri May 31 15:32:45 UTC 2024
Elapsed time: 02h:32m:21s. Have a nice day!
Loading

0 comments on commit 6aa26c9

Please sign in to comment.