Skip to content

Commit

Permalink
Merge branch 'ufs-community:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeniseWorthen
DeniseWorthen authored Jan 21, 2025
2 parents a87fd23 + 33cde4b commit 7157552
Show file tree
Hide file tree
Showing 19 changed files with 2,810 additions and 2,698 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 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 WW3
Submodule WW3 updated 3 files
+1 −0 model/bin/switch_meshcap_pdlib_bt4
+1 −0 model/src/w3iorsmd.F90
+598 −198 model/src/wav_import_export.F90
3 changes: 3 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
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 @@ -1321,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 @@ -1760,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
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 @@
Thu Jan 16 02:20:50 UTC 2025
Tue Jan 21 05:49:59 UTC 2025
Start Operation Requirement Test


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_1016055/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 261.027190
0: The maximum resident set size (KB) = 1441528
0: The total amount of wall time = 287.320072
0: The maximum resident set size (KB) = 1448288

Test bit_base PASS


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_1016055/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 861.499721
0: The maximum resident set size (KB) = 1437744
0: The total amount of wall time = 876.657665
0: The maximum resident set size (KB) = 1437152

Test dbg_base PASS


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_1016055/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 234.417104
0: The maximum resident set size (KB) = 1432200
0: The total amount of wall time = 252.676844
0: The maximum resident set size (KB) = 1421128

Test dcp PASS


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_1016055/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 232.294417
0: The maximum resident set size (KB) = 1411528
0: The total amount of wall time = 236.323493
0: The maximum resident set size (KB) = 1429624

Test mpi PASS


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_1016055/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 237.487397
0: The maximum resident set size (KB) = 1430640
0: The total amount of wall time = 235.014572
0: The maximum resident set size (KB) = 1420424

Test rst PASS


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_1016055/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 234.983976
0: The maximum resident set size (KB) = 1431388
0: The total amount of wall time = 236.140386
0: The maximum resident set size (KB) = 1433648

Test std_base PASS


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_1016055/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_477183/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 = 234.798466
0: The maximum resident set size (KB) = 1420696
0: The total amount of wall time = 234.759589
0: The maximum resident set size (KB) = 1433016

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Jan 16 03:29:59 UTC 2025
Elapsed time: 01h:09m:10s. Have a nice day!
Tue Jan 21 06:58:31 UTC 2025
Elapsed time: 01h:08m:33s. Have a nice day!
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 @@
Thu Jan 16 00:45:58 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_558058/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 = 2356.533795
0: The maximum resident set size (KB) = 1502332
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_558058/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 = 723.863649
0: The maximum resident set size (KB) = 1515736
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_558058/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 = 651.528034
0: The maximum resident set size (KB) = 1498716
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
Thu Jan 16 02:20:48 UTC 2025
Elapsed time: 01h:34m:50s. 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 @@
Wed Jan 15 22:10:56 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_137260/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 = 1456.664645
0: The maximum resident set size (KB) = 738576
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_137260/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 = 2198.663168
0: The maximum resident set size (KB) = 722576
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_137260/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 = 2203.598340
0: The maximum resident set size (KB) = 724300
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_137260/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 = 2200.940827
0: The maximum resident set size (KB) = 714264
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
Thu Jan 16 00:45:58 UTC 2025
Elapsed time: 02h:35m:04s. 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 7157552

Please sign in to comment.