Skip to content

Commit

Permalink
Merge branch 'develop' into feature/reduceWW3memory
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Jan 22, 2025
2 parents d047147 + 7157552 commit 89653b2
Show file tree
Hide file tree
Showing 46 changed files with 3,260 additions and 2,811 deletions.
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ set(OPENMP ON CACHE BOOL "Enable OpenMP threading")
set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
set(JEDI_DRIVER OFF CACHE BOOL "Enable JEDI as top level driver")
set(CMEPS_AOFLUX OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
set(PDLIB OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
set(PDLIB OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB with BT1")
set(PDLIB_BT4 OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB with BT4")
set(CDEPS_INLINE OFF CACHE BOOL "Enable CDEPS inline capability")
set(HYDRO OFF CACHE BOOL "Enable hydrostatic set")

Expand Down Expand Up @@ -217,8 +218,12 @@ if(WW3)
set(UFS_CAP "MULTI_ESMF" CACHE STRING "Build with MULTI_ESMF cap")
list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
else()
if(PDLIB OR PDLIB_BT4)
if(PDLIB)
set(SWITCH "meshcap_pdlib" CACHE STRING "NUOPC mesh cap")
else()
set(SWITCH "meshcap_pdlib_bt4" CACHE STRING "NUOPC mesh cap")
endif()
else()
set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
endif()
Expand Down
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 5 files
+8 −3 ccpp/data/GFS_typedefs.F90
+13 −1 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+84 −0 ccpp/suites/suite_RRFS_sas.xml
+81 −0 ccpp/suites/suite_RRFS_sas_nogwd.xml
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Submodule MOM6 updated 154 files
5 changes: 5 additions & 0 deletions MOM6-interface/mom6_files.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ list(APPEND mom6_src_files
MOM6/src/diagnostics/MOM_PointAccel.F90
MOM6/src/diagnostics/MOM_debugging.F90
MOM6/src/diagnostics/MOM_spatial_means.F90
MOM6/src/diagnostics/MOM_diagnose_MLD.F90
MOM6/src/diagnostics/MOM_diagnostics.F90
MOM6/src/diagnostics/MOM_harmonic_analysis.F90
MOM6/src/diagnostics/MOM_obsolete_diagnostics.F90
MOM6/src/diagnostics/MOM_obsolete_params.F90
MOM6/src/diagnostics/MOM_sum_output.F90
Expand Down Expand Up @@ -168,6 +170,7 @@ list(APPEND mom6_src_files
MOM6/src/parameterizations/lateral/MOM_tidal_forcing.F90
MOM6/src/parameterizations/lateral/MOM_Zanna_Bolton.F90
MOM6/src/parameterizations/lateral/MOM_self_attr_load.F90
MOM6/src/parameterizations/lateral/MOM_streaming_filter.F90

MOM6/src/parameterizations/vertical/MOM_ALE_sponge.F90
MOM6/src/parameterizations/vertical/MOM_CVMix_KPP.F90
Expand Down Expand Up @@ -312,7 +315,9 @@ list(APPEND mom6_nuopc_src_files
MOM6/config_src/drivers/unit_tests/test_MOM_mixedlayer_restrat.F90
MOM6/config_src/drivers/unit_tests/test_MOM_string_functions.F90
MOM6/config_src/drivers/unit_tests/test_MOM_EOS.F90
MOM6/config_src/drivers/unit_tests/test_MOM_remapping.F90
MOM6/config_src/drivers/timing_tests/time_MOM_EOS.F90
MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90
)

list(APPEND mom6_nuopc_src_files
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=20241230
export BL_DATE=20250107
12 changes: 9 additions & 3 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,6 @@ export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
export RF_CUTOFF=30.0
export FAST_TAU_W_SEC=0.0

export ATMRES=C96
export TILEDFIX=.false.
export DO_CA=.false.
export CA_SGS=.false.
Expand Down Expand Up @@ -795,6 +794,7 @@ export HWRF_SAMFDEEP=.false.
export RAS=.false.
export RANDOM_CLDS=.false.
export CNVCLD=.true.
export XR_CNVCLD=.false.
export PROGSIGMA=.false.
export BETASCU=8.0
export BETAMCU=1.0
Expand Down Expand Up @@ -1020,6 +1020,7 @@ export RST_BEG=${RUN_BEG}
export RST_2_BEG=${RUN_BEG}
export RST_END=${RUN_END}
export RST_2_END=${RUN_END}
export WW3_WLEV='F'
export WW3_CUR='F'
export WW3_ICE='F'
export WW3_IC1='F'
Expand Down Expand Up @@ -1190,8 +1191,11 @@ export_ugwpv1() {
esac

if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
export DT_INNER=${DT_ATMOS}
if [[ ${SEDI_SEMI} = .false. ]]; then
export DT_INNER=$((DT_ATMOS/2))
else
export DT_INNER=${DT_ATMOS}
fi
export default_dt_atmos=0
}

Expand Down Expand Up @@ -1318,6 +1322,7 @@ export_ww3() {
WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )) )"
export WW3_DTFLD
export WW3_DTPNT
export WW3_WLEV='F'
export WW3_CUR='C'
export WW3_ICE='C'
export WW3_IC1='F'
Expand Down Expand Up @@ -1757,6 +1762,7 @@ export_hafs_regional ()
# default hafs with no ice
export WW3_DOMAIN=natl_6m
export WW3_MODDEF=mod_def.${WW3_DOMAIN}
export WW3_WLEV='F'
export WW3_ICE='F'
export WW3_OUTPARS="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
export WW3_RSTFLDS=" "
Expand Down
386 changes: 385 additions & 1 deletion tests/logs/OpnReqTests_control_p8_hera.log
View file

Large diffs are not rendered by default.

24 changes: 12 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 @@
Tue Jan 7 03:15:28 UTC 2025
Tue Jan 21 04:11:58 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_278179/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_120730/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 = 4369.524954
0: The maximum resident set size (KB) = 1493280
0: The total amount of wall time = 2676.469340
0: The maximum resident set size (KB) = 1518024

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_278179/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_120730/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 = 1284.724733
0: The maximum resident set size (KB) = 1482880
0: The total amount of wall time = 813.896517
0: The maximum resident set size (KB) = 1508392

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_278179/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_120730/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 = 1139.037288
0: The maximum resident set size (KB) = 1488884
0: The total amount of wall time = 678.460183
0: The maximum resident set size (KB) = 1505616

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Jan 7 05:37:25 UTC 2025
Elapsed time: 02h:21m:57s. Have a nice day!
Tue Jan 21 05:49:58 UTC 2025
Elapsed time: 01h:38m:00s. Have a nice day!
30 changes: 15 additions & 15 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 Jan 6 12:24:27 UTC 2025
Tue Jan 21 01:39:24 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3701143/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 = 1407.193487
0: The maximum resident set size (KB) = 780976
0: The total amount of wall time = 1419.663361
0: The maximum resident set size (KB) = 767536

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3701143/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 = 2195.740053
0: The maximum resident set size (KB) = 725748
0: The total amount of wall time = 2222.506149
0: The maximum resident set size (KB) = 737008

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3701143/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 = 2291.331176
0: The maximum resident set size (KB) = 734184
0: The total amount of wall time = 2194.200962
0: The maximum resident set size (KB) = 712244

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3494311/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3701143/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 = 2194.246673
0: The maximum resident set size (KB) = 723192
0: The total amount of wall time = 2208.564561
0: The maximum resident set size (KB) = 723148

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Jan 6 14:57:59 UTC 2025
Elapsed time: 02h:33m:33s. Have a nice day!
Tue Jan 21 04:11:58 UTC 2025
Elapsed time: 02h:32m:34s. Have a nice day!
Loading

0 comments on commit 89653b2

Please sign in to comment.