From ac7723133fe093eef39d70dabb27653ea35af853 Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Thu, 8 Aug 2024 18:45:59 -0400 Subject: [PATCH 01/11] add changes to test uwm w/ coastal changes --- .gitmodules | 6 ++- CMakeLists.txt | 7 +++- WW3 | 2 +- tests/default_vars.sh | 3 ++ tests/parm/fd_ufs.yaml | 84 +++++++++++++++++++++++++++++--------- tests/parm/ww3_shel.nml.IN | 1 + 6 files changed, 79 insertions(+), 24 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3775fc12d..55909a388a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = develop [submodule "WW3"] path = WW3 - url = https://github.com/NOAA-EMC/WW3 - branch = dev/ufs-weather-model + #url = https://github.com/NOAA-EMC/WW3 + #branch = dev/ufs-weather-model + url = https://github.com/DeniseWorthen/WW3 + branch = feature/addflds4schism [submodule "stochastic_physics"] path = stochastic_physics url = https://github.com/NOAA-PSL/stochastic_physics diff --git a/CMakeLists.txt b/CMakeLists.txt index e5fdd1e83a..dc67a69789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,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") @@ -213,8 +214,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() diff --git a/WW3 b/WW3 index 7f548c795a..19f7a276cb 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 7f548c795a348bbb0fe4967dd25692c79036dc73 +Subproject commit 19f7a276cb8935ec26a01a737b03d874cc05be81 diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 78a89ec8e6..e767c131f0 100644 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -843,6 +843,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' @@ -1018,6 +1019,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' @@ -1431,6 +1433,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" diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml index c0189f0bdf..494ac31a6a 100644 --- a/tests/parm/fd_ufs.yaml +++ b/tests/parm/fd_ufs.yaml @@ -917,6 +917,50 @@ - standard_name: Sw_z0 alias: z0rlen # + - standard_name: Sw_hs + canonical_units: m + description: ww3 export - significant wave height + # + - standard_name: Sw_bhd + canonical_units: m2 s-2 + description: ww3 export - Bernoulli head (J term) + # + - standard_name: Sw_tauox + canonical_units: m2 s-2 + description: ww3 export - wave to ocean momentum flux x + # + - standard_name: Sw_tauoy + canonical_units: m2 s-2 + description: ww3 export - wave to ocean momentum flux y + # + - standard_name: Sw_taubblx + canonical_units: m2 s-2 + description: ww3 export - momentum flux due to bottom friction x + # + - standard_name: Sw_taubbly + canonical_units: m2 s-2 + description: ww3 export - momentum flux due to bottom friction y + # + - standard_name: Sw_ubrx + canonical_units: m s-1 + description: ww3 export - near bottom rms wave velocities x + # + - standard_name: Sw_ubry + canonical_units: m s-1 + description: ww3 export - near bottom rms wave velocities y + # + - standard_name: Sw_thm + canonical_units: deg + description: ww3 export - mean wave direction + # + - standard_name: Sw_t0m1 + canonical_units: s + description: ww3 export - mean wave period + # + - standard_name: Sw_wnmean + canonical_units: m-1 + description: ww3 export - mean wave number + # - standard_name: Sw_pstokes_x alias: eastward_partitioned_stokes_drift_current canonical_units: m s-1 @@ -965,26 +1009,26 @@ - standard_name: Sw_vstokes alias: ussy # - - standard_name: Sw_wbcuru - alias: eastward_wave_bottom_current - canonical_units: m s-1 - description: ww3 export - - standard_name: Sw_wbcuru - alias: wbcuru - # - - standard_name: Sw_wbcurv - alias: northward_wave_bottom_current - canonical_units: m s-1 - description: ww3 export - - standard_name: Sw_wbcurv - alias: wbcurv - # - - standard_name: Sw_wbcurp - alias: wave_bottom_current_period - canonical_units: s - description: ww3 export - - standard_name: Sw_wbcurp - alias: wbcurp + # - standard_name: Sw_wbcuru + # alias: eastward_wave_bottom_current + # canonical_units: m s-1 + # description: ww3 export + # - standard_name: Sw_wbcuru + # alias: wbcuru + # # + # - standard_name: Sw_wbcurv + # alias: northward_wave_bottom_current + # canonical_units: m s-1 + # description: ww3 export + # - standard_name: Sw_wbcurv + # alias: wbcurv + # # + # - standard_name: Sw_wbcurp + # alias: wave_bottom_current_period + # canonical_units: s + # description: ww3 export + # - standard_name: Sw_wbcurp + # alias: wbcurp # - standard_name: Sw_wavsuu alias: eastward_wave_radiation_stress diff --git a/tests/parm/ww3_shel.nml.IN b/tests/parm/ww3_shel.nml.IN index 4921a6d9ad..69d83ce0c4 100644 --- a/tests/parm/ww3_shel.nml.IN +++ b/tests/parm/ww3_shel.nml.IN @@ -1,4 +1,5 @@ &input_nml + input%forcing%water_levels = '@[WW3_WLEV]' input%forcing%winds = 'C' input%forcing%currents = '@[WW3_CUR]' input%forcing%ice_conc = '@[WW3_ICE]' From e0e91eab37b718f9d42d2a2333b5b8c3ac4229a3 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 9 Aug 2024 07:16:48 -0500 Subject: [PATCH 02/11] baseline test for ww3 19f7a276 * the wave restarts are not b4b against the develop baseline but are b4b when compared against a baseline generated with the trho fix rt_atmwav_control_noaero_p8_intel.log: Comparing ufs.atmw.ww3.r.2021-03-22-64800 .....USING CMP......NOT IDENTICAL rt_hafs_regional_atm_wav_intel.log: Comparing ufs.hafs.ww3.r.2019-08-29-21600 .....USING CMP......NOT IDENTICAL From dca62c53fff76d4098702026f416ae0cd677d635 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Mon, 12 Aug 2024 20:36:07 +0000 Subject: [PATCH 03/11] update WW3, remove unused aliases from fd --- WW3 | 2 +- tests/parm/fd_ufs.yaml | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/WW3 b/WW3 index 19f7a276cb..cb2e58b934 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 19f7a276cb8935ec26a01a737b03d874cc05be81 +Subproject commit cb2e58b93456aa6131a37c829a1a781e62dbd966 diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml index 494ac31a6a..66034234fd 100644 --- a/tests/parm/fd_ufs.yaml +++ b/tests/parm/fd_ufs.yaml @@ -1009,27 +1009,6 @@ - standard_name: Sw_vstokes alias: ussy # - # - standard_name: Sw_wbcuru - # alias: eastward_wave_bottom_current - # canonical_units: m s-1 - # description: ww3 export - # - standard_name: Sw_wbcuru - # alias: wbcuru - # # - # - standard_name: Sw_wbcurv - # alias: northward_wave_bottom_current - # canonical_units: m s-1 - # description: ww3 export - # - standard_name: Sw_wbcurv - # alias: wbcurv - # # - # - standard_name: Sw_wbcurp - # alias: wave_bottom_current_period - # canonical_units: s - # description: ww3 export - # - standard_name: Sw_wbcurp - # alias: wbcurp - # - standard_name: Sw_wavsuu alias: eastward_wave_radiation_stress canonical_units: N m-1 From 0cdb63fb2892af49a88ec8239a33068174dae5ae Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Mon, 12 Aug 2024 23:05:03 +0000 Subject: [PATCH 04/11] add test changes --- tests/test_changes.list | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_changes.list b/tests/test_changes.list index e498af5875..0de2a347f0 100644 --- a/tests/test_changes.list +++ b/tests/test_changes.list @@ -1 +1,2 @@ -cpld_debug_pdlib_p8 gnu +hafs_regional_atm_wav intel +atmwav_control_noaero_p8 intel From 574d39610c449c1db80281e1aa2dbb363322279b Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Tue, 13 Aug 2024 11:08:51 -0400 Subject: [PATCH 05/11] fix indenting for linter --- tests/parm/fd_ufs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml index 4b4cdba691..1051173df5 100644 --- a/tests/parm/fd_ufs.yaml +++ b/tests/parm/fd_ufs.yaml @@ -918,8 +918,8 @@ field_dictionary: alias: z0rlen # - standard_name: Sw_hs - canonical_units: m - description: ww3 export - significant wave height + canonical_units: m + description: ww3 export - significant wave height # - standard_name: Sw_bhd canonical_units: m2 s-2 From de45d0e30a24dce9f9f6440b6d014098238b542f Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Wed, 21 Aug 2024 18:44:28 -0400 Subject: [PATCH 06/11] update field dictionary aliases for SCHISM --- tests/parm/fd_ufs.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml index 1051173df5..0afddf78e9 100644 --- a/tests/parm/fd_ufs.yaml +++ b/tests/parm/fd_ufs.yaml @@ -918,46 +918,57 @@ field_dictionary: alias: z0rlen # - standard_name: Sw_hs + alias: sea_surface_wave_significant_height canonical_units: m description: ww3 export - significant wave height # - standard_name: Sw_bhd + alias: sea_water_waves_effect_on_currents_bernoulli_head_adjustment canonical_units: m2 s-2 description: ww3 export - Bernoulli head (J term) # - standard_name: Sw_tauox + alias: sea_surface_x_stress_due_to_waves canonical_units: m2 s-2 description: ww3 export - wave to ocean momentum flux x # - standard_name: Sw_tauoy + alias: sea_surface_y_stress_due_to_waves canonical_units: m2 s-2 description: ww3 export - wave to ocean momentum flux y # - standard_name: Sw_taubblx + alias: sea_bottom_upward_x_stress_due_to_waves canonical_units: m2 s-2 description: ww3 export - momentum flux due to bottom friction x # - standard_name: Sw_taubbly + alias: sea_bottom_upward_y_stress_due_to_waves canonical_units: m2 s-2 description: ww3 export - momentum flux due to bottom friction y # - standard_name: Sw_ubrx + alias: sea_bed_orbital_x_velocity_due_to_waves canonical_units: m s-1 description: ww3 export - near bottom rms wave velocities x # - standard_name: Sw_ubry + alias: sea_bed_orbital_y_velocity_due_to_waves canonical_units: m s-1 description: ww3 export - near bottom rms wave velocities y # - standard_name: Sw_thm + alias: sea_surface_wave_mean_direction canonical_units: deg description: ww3 export - mean wave direction # - standard_name: Sw_t0m1 + alias: sea_surface_wave_mean_period canonical_units: s description: ww3 export - mean wave period # - standard_name: Sw_wnmean + alias: sea_surface_wave_mean_number canonical_units: m-1 description: ww3 export - mean wave number # From 8e3253c635c3991f25b64507121087df18ba0ad7 Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Tue, 24 Sep 2024 11:47:27 -0400 Subject: [PATCH 07/11] point to new CICE branch in my fork --- CICE-interface/CICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CICE-interface/CICE b/CICE-interface/CICE index 635d9a100a..d9d0176ad7 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit 635d9a100a736bd8d14ad091e879d5da6e4eb2bd +Subproject commit d9d0176ad7f4464116c3f17aa71e33da9e5fd921 From cc3bbe9376942ed3d42c260e48c9bc41bd98c163 Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Tue, 24 Sep 2024 13:12:52 -0400 Subject: [PATCH 08/11] Revert "point to new CICE branch in my fork" This reverts commit 8e3253c635c3991f25b64507121087df18ba0ad7. --- CICE-interface/CICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CICE-interface/CICE b/CICE-interface/CICE index d9d0176ad7..635d9a100a 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit d9d0176ad7f4464116c3f17aa71e33da9e5fd921 +Subproject commit 635d9a100a736bd8d14ad091e879d5da6e4eb2bd From d4911ec1d1c6ee1f5b66c02f684dc1688e83ae77 Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Thu, 14 Nov 2024 16:57:41 -0500 Subject: [PATCH 09/11] update WW3 --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index cb2e58b934..1b78c31499 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit cb2e58b93456aa6131a37c829a1a781e62dbd966 +Subproject commit 1b78c31499dd28d4013e3c0530301d85c27112bc From c31603fd362d373ccae6704cc6c3b7c409b883cb Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Thu, 12 Dec 2024 08:47:44 -0500 Subject: [PATCH 10/11] update WW3 --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index 1b78c31499..3b9034b432 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 1b78c31499dd28d4013e3c0530301d85c27112bc +Subproject commit 3b9034b43293a61c6315f323f1a9f0717816c114 From 33e1b861fca0c692dcb37cd406bd214b238b714d Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 10 Jan 2025 20:05:00 -0600 Subject: [PATCH 11/11] add empty test change list * run on hercules due to disk quota issues on hera --- tests/test_changes.list | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_changes.list b/tests/test_changes.list index 7cf23b290b..e69de29bb2 100644 --- a/tests/test_changes.list +++ b/tests/test_changes.list @@ -1,2 +0,0 @@ -hafs_regional_atm_wav intel -atmwav_control_noaero_p8 intel \ No newline at end of file