Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
Browse files Browse the repository at this point in the history 
…r-model into tempo
  • Loading branch information
@dustinswales
dustinswales committed Jun 27, 2024
2 parents 7eff210 + e784814 commit 8a4d825
Show file tree
Hide file tree
Showing 36 changed files with 2,397 additions and 2,578 deletions.
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Submodule CICE updated 2 files
+1 −1 cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
+21 −2 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
4 changes: 1 addition & 3 deletions doc/UsersGuide/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ certifi==2024.2.2
# via requests
charset-normalizer==3.3.2
# via requests
colorama==0.4.6
# via sphinx
docutils==0.20.1
# via
# pybtex-docutils
Expand Down Expand Up @@ -74,5 +72,5 @@ sphinxcontrib-qthelp==1.0.7
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
urllib3==2.2.1
urllib3==2.2.2
# via requests
6 changes: 3 additions & 3 deletions modulefiles/ufs_orion.intel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ help([[
loads UFS Model prerequisites for Orion/Intel
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
Expand Down
5 changes: 3 additions & 2 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,7 @@ export_cmeps() {
export RESTART_N=${FHMAX}
export CMEPS_RESTART_DIR=./RESTART/
export cap_dbug_flag=0
export WRITE_ENDOFRUN_RESTART=.false.
# MOM6 attributes
export use_coldstart=false
export use_mommesh=true
Expand Down Expand Up @@ -1119,7 +1120,7 @@ export_mom6
# Set WW3 component defaults
export_ww3

# Set CMEPS component defauls
# Set CMEPS component defaults
export_cmeps

# FV3 defaults
Expand Down Expand Up @@ -1300,7 +1301,7 @@ export_datm_cdeps ()
export MOM6_USE_WAVES=False
export WW3_DOMAIN=''

# Set CMEPS component defauls
# Set CMEPS component defaults
export_cmeps
# default configure
export UFS_CONFIGURE=ufs.configure.datm_cdeps.IN
Expand Down
3 changes: 2 additions & 1 deletion tests/detect_machine.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ elif [[ -d /scratch1 ]]; then
MACHINE_ID=hera
elif [[ -d /work ]]; then
# We are on MSU Orion or Hercules
if [[ -d /apps/other ]]; then
mount=$(findmnt -n -o SOURCE /home)
if [[ ${mount} =~ "hercules" ]]; then
# We are on Hercules
MACHINE_ID=hercules
else
Expand Down
61 changes: 31 additions & 30 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jun 14 13:38:21 UTC 2024
Sun Jun 23 20:52:48 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_2452253/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -44,21 +44,21 @@ Moving baseline bit_base files ....
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.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

0: The total amount of wall time = 279.753384
0: The maximum resident set size (KB) = 1457740
0: The total amount of wall time = 283.919660
0: The maximum resident set size (KB) = 1457776

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_2452253/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/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 = 990.855056
0: The maximum resident set size (KB) = 1433088
0: The total amount of wall time = 985.020250
0: The maximum resident set size (KB) = 1430608

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_2452253/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand All @@ -135,7 +135,7 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.fv_core.res.tile4.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_core.res.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_core.res.tile6.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .....USING NCCMP......OK
Expand All @@ -160,14 +160,14 @@ Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .....USING NCCMP......
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 = 252.537582
0: The maximum resident set size (KB) = 1437288
0: The total amount of wall time = 250.531642
0: The maximum resident set size (KB) = 1436920

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_2452253/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand All @@ -181,7 +181,7 @@ Checking test mpi results ....
Comparing GFSPRS.GrbF00 .....USING CMP......OK
Comparing GFSPRS.GrbF21 .....USING CMP......OK
Comparing GFSPRS.GrbF24 .....USING CMP......OK
Comparing RESTART/20210323.060000.coupler.res .....USING CMP......OK
Comparing RESTART/20210323.060000.coupler.res .....USING CMP......OK
Comparing RESTART/20210323.060000.fv_core.res.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_core.res.tile1.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_core.res.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,20 +214,20 @@ Comparing RESTART/20210323.060000.coupler.res .....USING CMP......OK
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 = 247.420758
0: The maximum resident set size (KB) = 1441056
0: The total amount of wall time = 252.707984
0: The maximum resident set size (KB) = 1432848

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_2452253/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Comparing sfcf024.nc .....USING NCCMP......OK
Comparing atmf000.nc .....USING NCCMP......OK
Comparing atmf021.nc .....USING NCCMP......OK
Comparing atmf021.nc .....USING NCCMP......OK
Comparing atmf024.nc .....USING NCCMP......OK
Comparing GFSFLX.GrbF00 .....USING CMP......OK
Comparing GFSFLX.GrbF21 .....USING CMP......OK
Expand Down Expand Up @@ -268,13 +268,14 @@ Comparing atmf021.nc .....USING NCCMP......OK
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 = 250.200015
0: The maximum resident set size (KB) = 1436400
0: The total amount of wall time = 248.087269
0: The maximum resident set size (KB) = 1448732

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_2452253/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -317,19 +318,19 @@ Moving baseline std_base files ....
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.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

0: The total amount of wall time = 254.595064
0: The maximum resident set size (KB) = 1435424
0: The total amount of wall time = 252.342367
0: The maximum resident set size (KB) = 1436924

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_2452253/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_250829/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -363,7 +364,7 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.fv_tracer.res.tile4.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.fv_tracer.res.tile6.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.phy_data.tile1.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.phy_data.tile1.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.phy_data.tile2.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.phy_data.tile3.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.phy_data.tile4.nc .....USING NCCMP......OK
Expand All @@ -376,11 +377,11 @@ Comparing RESTART/20210323.060000.phy_data.tile1.nc .....USING NCCMP......OK
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 = 248.069137
0: The maximum resident set size (KB) = 1411584
0: The total amount of wall time = 252.893297
0: The maximum resident set size (KB) = 1440100

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jun 14 14:45:43 UTC 2024
Elapsed time: 01h:07m:23s. Have a nice day!
Sun Jun 23 21:58:39 UTC 2024
Elapsed time: 01h:05m:51s. Have a nice day!
30 changes: 15 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,9 @@
Fri Jun 14 20:35:52 UTC 2024
Tue Jun 25 13:58:12 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_2311238/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1960064/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -44,7 +44,7 @@ Moving baseline dbg_base files ....
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.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
Expand All @@ -66,14 +66,14 @@ Moving RESTART/20210323.060000.fv_tracer.res.tile1.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 = 1405.180294
0: The maximum resident set size (KB) = 1542308
0: The total amount of wall time = 1377.718835
0: The maximum resident set size (KB) = 1521812

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_2311238/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1960064/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand All @@ -90,7 +90,7 @@ Checking test rst results ....
Comparing sfcf024.tile1.nc .....USING NCCMP......OK
Comparing sfcf024.tile2.nc .....USING NCCMP......OK
Comparing sfcf024.tile3.nc .....USING NCCMP......OK
Comparing sfcf024.tile4.nc .....USING NCCMP......OK
Comparing sfcf024.tile4.nc .....USING NCCMP......OK
Comparing sfcf024.tile5.nc .....USING NCCMP......OK
Comparing sfcf024.tile6.nc .....USING NCCMP......OK
Comparing atmf024.tile1.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Comparing sfcf024.tile4.nc .....USING NCCMP......OK
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 = 436.275245
0: The maximum resident set size (KB) = 1538012
0: The total amount of wall time = 679.251652
0: The maximum resident set size (KB) = 1474520

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_2311238/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1960064/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -182,7 +182,7 @@ Moving baseline std_base files ....
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_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
Expand All @@ -205,11 +205,11 @@ Moving RESTART/20210323.060000.fv_srf_wnd.res.tile6.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 = 438.277374
0: The maximum resident set size (KB) = 1537680
0: The total amount of wall time = 526.655552
0: The maximum resident set size (KB) = 1520272

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jun 14 21:48:17 UTC 2024
Elapsed time: 01h:12m:25s. Have a nice day!
Tue Jun 25 15:05:15 UTC 2024
Elapsed time: 01h:07m:05s. Have a nice day!
Loading

0 comments on commit 8a4d825

Please sign in to comment.