Update tide case

NOAA-GFDL · Jan 31, 2025 · 3013b77 · 3013b77
1 parent c649ee0
commit 3013b77
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 56 deletions.
diff --git a/exps/NWA12.tidesonly/MOM_input b/exps/NWA12.tidesonly/MOM_input
@@ -112,7 +112,7 @@ BRUSHCUTTER_MODE = True         !   [Boolean] default = False
                                 ! If true, read external OBC data on the supergrid.
 OBC_TIDE_CONSTITUENTS = "M2,S2,N2,K2,K1,O1,P1,Q1,MM,MF" !
                                 ! Names of tidal constituents being added to the open boundaries.
-OBC_TIDE_REF_DATE = 1993, 1, 1  !
+TIDE_REF_DATE = 1993, 1, 1      !
                                 ! Reference date to use for tidal calculations and equilibrium phase.
 
 ! === module MOM_verticalGrid ===

diff --git a/exps/NWA12.tidesonly/MOM_parameter_doc.all b/exps/NWA12.tidesonly/MOM_parameter_doc.all
@@ -61,15 +61,26 @@ DT = 600.0                      !   [s]
                                 ! be an integer fraction of the forcing time-step (DT_FORCING in ocean-only mode
                                 ! or the coupling timestep in coupled mode.)
 DT_THERM = 3600.0               !   [s] default = 600.0
-                                ! The thermodynamic and tracer advection time step. Ideally DT_THERM should be
-                                ! an integer multiple of DT and less than the forcing or coupling time-step,
-                                ! unless THERMO_SPANS_COUPLING is true, in which case DT_THERM can be an integer
-                                ! multiple of the coupling timestep.  By default DT_THERM is set to DT.
+                                ! The thermodynamic time step. Ideally DT_THERM should be an integer multiple of
+                                ! DT and of DT_TRACER_ADVECT and less than the forcing or coupling time-step.
+                                ! However, if THERMO_SPANS_COUPLING is true, DT_THERM can be an integer multiple
+                                ! of the coupling timestep. By default DT_THERM is set to DT.
 THERMO_SPANS_COUPLING = False   !   [Boolean] default = False
-                                ! If true, the MOM will take thermodynamic and tracer timesteps that can be
-                                ! longer than the coupling timestep. The actual thermodynamic timestep that is
-                                ! used in this case is the largest integer multiple of the coupling timestep
-                                ! that is less than or equal to DT_THERM.
+                                ! If true, the MOM will take thermodynamic timesteps that can be longer than the
+                                ! coupling timestep. The actual thermodynamic timestep that is used in this case
+                                ! is the largest integer multiple of the coupling timestep that is less than or
+                                ! equal to DT_THERM.
+DT_TRACER_ADVECT = 3600.0       !   [s] default = 3600.0
+                                ! The tracer advection time step. Ideally DT_TRACER_ADVECT should be an integer
+                                ! multiple of DT, less than DT_THERM, and less than the forcing or coupling
+                                ! time-step. However, if TRADV_SPANS_COUPLING is true, DT_TRACER_ADVECT can be
+                                ! longer than the coupling timestep. By default DT_TRACER_ADVECT is set to
+                                ! DT_THERM.
+TRADV_SPANS_COUPLING = False    !   [Boolean] default = False
+                                ! If true, the MOM will take tracer advection timesteps that can be longer than
+                                ! the coupling timestep. The actual tracer advection timestep that is used in
+                                ! this case is the largest integer multiple of the coupling timestep that is
+                                ! less than or equal to DT_TRACER_ADVECT.
 HMIX_SFC_PROP = 1.0             !   [m] default = 1.0
                                 ! If BULKMIXEDLAYER is false, HMIX_SFC_PROP is the depth over which to average
                                 ! to find surface properties like SST and SSS or density (but not surface
@@ -337,14 +348,6 @@ OBC_REMAPPING_USE_OM4_SUBCELLS = True !   [Boolean] default = True
                                 ! option to false.
 OBC_TIDE_CONSTITUENTS = "M2,S2,N2,K2,K1,O1,P1,Q1,MM,MF" !
                                 ! Names of tidal constituents being added to the open boundaries.
-OBC_TIDE_ADD_EQ_PHASE = False   !   [Boolean] default = False
-                                ! If true, add the equilibrium phase argument to the specified tidal phases.
-OBC_TIDE_ADD_NODAL = False      !   [Boolean] default = False
-                                ! If true, include 18.6 year nodal modulation in the boundary tidal forcing.
-OBC_TIDE_REF_DATE = 1993, 1, 1  !
-                                ! Reference date to use for tidal calculations and equilibrium phase.
-OBC_TIDE_NODAL_REF_DATE = 0, 0, 0 ! default = 0, 0, 0
-                                ! Fixed reference date to use for nodal modulation of boundary tides.
 TIDE_M2_FREQ = 1.405189E-04     !   [rad s-1] default = 1.405189E-04
                                 ! Frequency of the M2 tidal constituent. This is only used if TIDES and TIDE_M2
                                 ! are true, or if OBC_TIDE_N_CONSTITUENTS > 0 and M2 is in
@@ -456,12 +459,9 @@ RESTART_CHECKSUMS_REQUIRED = True !   [Boolean] default = True
                                 ! may want to avoid this comparison if for example the restarts are made from a
                                 ! run with a different mask_table than the current run, in which case the
                                 ! checksums will not match and cause crash.
-STREAMING_FILTER_M2 = False     !   [Boolean] default = False
-                                ! If true, turn on streaming band-pass filter for detecting instantaneous tidal
-                                ! signals.
-STREAMING_FILTER_K1 = False     !   [Boolean] default = False
-                                ! If true, turn on streaming band-pass filter for detecting instantaneous tidal
-                                ! signals.
+USE_FILTER = False              !   [Boolean] default = False
+                                ! If true, use streaming band-pass filters to detect the instantaneous tidal
+                                ! signals in the simulation.
 
 ! === module MOM_tracer_flow_control ===
 USE_USER_TRACER_EXAMPLE = False !   [Boolean] default = False
@@ -1003,6 +1003,10 @@ PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
                                 !    PV_ADV_UPWIND1  - upwind, first order
 
 ! === module MOM_self_attr_load ===
+SAL_USE_BPA = False             !   [Boolean] default = False
+                                ! If true, use bottom pressure anomaly to calculate self-attraction and loading
+                                ! (SAL). Otherwise sea surface height anomaly is used, which is only correct for
+                                ! homogenous flow.
 SAL_SCALAR_APPROX = True        !   [Boolean] default = True
                                 ! If true, use the scalar approximation to calculate self-attraction and
                                 ! loading.
@@ -1051,7 +1055,7 @@ TIDAL_SAL_FROM_FILE = False     !   [Boolean] default = False
 USE_PREVIOUS_TIDES = False      !   [Boolean] default = False
                                 ! If true, use the SAL from the previous iteration of the tides to facilitate
                                 ! convergent iteration. This is only used if TIDES is true.
-TIDE_REF_DATE = 0, 0, 0         ! default = 0, 0, 0
+TIDE_REF_DATE = 1993, 1, 1      ! default = 0, 0, 0
                                 ! Year,month,day to use as reference date for tidal forcing. If not specified,
                                 ! defaults to 0.
 TIDE_USE_EQ_PHASE = False       !   [Boolean] default = False
@@ -1116,6 +1120,11 @@ TIDE_MM_AMP = 0.022191          !   [m] default = 0.022191
 TIDE_MM_PHASE_T0 = 0.0          !   [radians] default = 0.0
                                 ! Phase of the MM tidal constituent at time 0. This is only used if TIDES and
                                 ! TIDE_MM are true.
+TIDE_ADD_NODAL = False          !   [Boolean] default = False
+                                ! If true, include 18.6 year nodal modulation in the astronomical tidal forcing.
+TIDE_NODAL_REF_DATE = 0, 0, 0   ! default = 0, 0, 0
+                                ! Fixed reference date to use for nodal modulation of astronomical tidal
+                                ! forcing.
 HA_START_TIME = 0.0             !   [days] default = 0.0
                                 ! Start time of harmonic analysis, in units of days after the start of the
                                 ! current run segment. Must be smaller than HA_END_TIME, otherwise harmonic
@@ -1148,9 +1157,11 @@ RHO_PGF_REF = 1035.0            !   [kg m-3] default = 1035.0
                                 ! non-Boussinesq mode.  The default is RHO_0.
 TIDES_ANSWER_DATE = 20230630    ! default = 20230630
                                 ! The vintage of self-attraction and loading (SAL) and tidal forcing
-                                ! calculations in Boussinesq mode. Values below 20230701 recover the old answers
-                                ! in which the SAL is part of the tidal forcing calculation.  The change is due
-                                ! to a reordered summation and the difference is only at bit level.
+                                ! calculations.  Setting dates before 20230701 recovers old answers (Boussinesq
+                                ! and non-Boussinesq modes) when SAL is part of the tidal forcing calculation.
+                                ! The answer difference is only at bit level and due to a reordered summation.
+                                ! Setting dates before 20250201 recovers answers (Boussinesq mode) that
+                                ! interface heights are modified before pressure force integrals are calculated.
 MASS_WEIGHT_IN_PRESSURE_GRADIENT = False !   [Boolean] default = False
                                 ! If true, use mass weighting when interpolating T/S for integrals near the
                                 ! bathymetry in FV pressure gradient calculations.

diff --git a/exps/NWA12.tidesonly/MOM_parameter_doc.layout b/exps/NWA12.tidesonly/MOM_parameter_doc.layout
@@ -38,13 +38,13 @@ MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 !  4,6
                                 !  1,2
                                 !  3,6
-NIPROC = 2                      !
+NIPROC = 12                     !
                                 ! The number of processors in the x-direction. With STATIC_MEMORY_ this is set
                                 ! in MOM_memory.h at compile time.
-NJPROC = 2                      !
+NJPROC = 16                     !
                                 ! The number of processors in the y-direction. With STATIC_MEMORY_ this is set
                                 ! in MOM_memory.h at compile time.
-LAYOUT = 2, 2                   !
+LAYOUT = 12, 16                 !
                                 ! The processor layout that was actually used.
 IO_LAYOUT = 1, 1                ! default = 1, 1
                                 ! The processor layout to be used, or 0,0 to automatically set the io_layout to

diff --git a/exps/NWA12.tidesonly/MOM_parameter_doc.short b/exps/NWA12.tidesonly/MOM_parameter_doc.short
@@ -12,10 +12,10 @@ DT = 600.0                      !   [s]
                                 ! be an integer fraction of the forcing time-step (DT_FORCING in ocean-only mode
                                 ! or the coupling timestep in coupled mode.)
 DT_THERM = 3600.0               !   [s] default = 600.0
-                                ! The thermodynamic and tracer advection time step. Ideally DT_THERM should be
-                                ! an integer multiple of DT and less than the forcing or coupling time-step,
-                                ! unless THERMO_SPANS_COUPLING is true, in which case DT_THERM can be an integer
-                                ! multiple of the coupling timestep.  By default DT_THERM is set to DT.
+                                ! The thermodynamic time step. Ideally DT_THERM should be an integer multiple of
+                                ! DT and of DT_TRACER_ADVECT and less than the forcing or coupling time-step.
+                                ! However, if THERMO_SPANS_COUPLING is true, DT_THERM can be an integer multiple
+                                ! of the coupling timestep. By default DT_THERM is set to DT.
 DTBT_RESET_PERIOD = -1.0        !   [s] default = 3600.0
                                 ! The period between recalculations of DTBT (if DTBT <= 0). If DTBT_RESET_PERIOD
                                 ! is negative, DTBT is set based only on information available at
@@ -112,8 +112,6 @@ BRUSHCUTTER_MODE = True         !   [Boolean] default = False
                                 ! If true, read external OBC data on the supergrid.
 OBC_TIDE_CONSTITUENTS = "M2,S2,N2,K2,K1,O1,P1,Q1,MM,MF" !
                                 ! Names of tidal constituents being added to the open boundaries.
-OBC_TIDE_REF_DATE = 1993, 1, 1  !
-                                ! Reference date to use for tidal calculations and equilibrium phase.
 
 ! === module MOM_verticalGrid ===
 ! Parameters providing information about the vertical grid.
@@ -238,6 +236,9 @@ TIDE_MF = True                  !   [Boolean] default = False
 TIDE_MM = True                  !   [Boolean] default = False
                                 ! If true, apply tidal momentum forcing at the MM frequency. This is only used
                                 ! if TIDES is true.
+TIDE_REF_DATE = 1993, 1, 1      ! default = 0, 0, 0
+                                ! Year,month,day to use as reference date for tidal forcing. If not specified,
+                                ! defaults to 0.
 
 ! === module MOM_PressureForce ===
 

diff --git a/exps/NWA12.tidesonly/ref/docker-linux-intel-repro/ocean.stats b/exps/NWA12.tidesonly/ref/docker-linux-intel-repro/ocean.stats
@@ -1,23 +1,23 @@
   Step,       Day,  Truncs,      Energy/Mass,      Maximum CFL,  Mean sea level,   Total Mass,    Frac Mass Err
             [days]                 [m2 s-2]           [Nondim]        [m]             [kg]           [Nondim]
      0,       0.000,     0, En 1.5092494254117544E-22, CFL  0.00000, SL -3.3409E-10, Mass 8.11438E+19, Me  0.00E+00
-    12,       0.083,     0, En 1.4999019557174591E-04, CFL  0.07148, SL  1.1575E-01, Mass 8.11464E+19, Me  3.19E-05
-    30,       0.208,     0, En 2.0454138384993581E-04, CFL  0.05428, SL  1.3799E-01, Mass 8.11469E+19, Me  6.14E-06
-    42,       0.292,     0, En 2.7942363841550693E-04, CFL  0.11554, SL  3.6843E-02, Mass 8.11446E+19, Me -2.79E-05
-    60,       0.417,     0, En 3.8103106444967318E-04, CFL  0.10538, SL -7.9581E-02, Mass 8.11420E+19, Me -3.21E-05
-    72,       0.500,     0, En 3.4696604413099160E-04, CFL  0.11679, SL -2.8743E-02, Mass 8.11432E+19, Me  1.40E-05
-    84,       0.583,     0, En 4.6160271944294118E-04, CFL  0.13349, SL  6.4210E-02, Mass 8.11452E+19, Me  2.57E-05
-   102,       0.708,     0, En 4.0909830360842480E-04, CFL  0.08875, SL  1.0621E-01, Mass 8.11462E+19, Me  1.16E-05
-   114,       0.792,     0, En 4.3210471651192813E-04, CFL  0.16203, SL  3.9691E-02, Mass 8.11447E+19, Me -1.84E-05
-   132,       0.917,     0, En 5.3720131556803075E-04, CFL  0.12831, SL -3.9899E-02, Mass 8.11429E+19, Me -2.20E-05
-   144,       1.000,     0, En 5.1250180500421135E-04, CFL  0.11065, SL -1.5048E-02, Mass 8.11435E+19, Me  6.86E-06
-   156,       1.083,     0, En 5.9314299210131490E-04, CFL  0.13379, SL  4.3197E-02, Mass 8.11448E+19, Me  1.61E-05
-   174,       1.208,     0, En 5.8565023905179957E-04, CFL  0.16473, SL  7.1361E-02, Mass 8.11454E+19, Me  7.77E-06
-   186,       1.292,     0, En 6.1472516673260092E-04, CFL  0.13515, SL  1.6822E-02, Mass 8.11442E+19, Me -1.51E-05
-   204,       1.417,     0, En 6.3100935774340898E-04, CFL  0.18191, SL -6.7162E-02, Mass 8.11423E+19, Me -2.32E-05
-   216,       1.500,     0, En 5.4438532394097613E-04, CFL  0.13877, SL -6.2370E-02, Mass 8.11424E+19, Me  1.32E-06
-   228,       1.583,     0, En 6.0548625027999109E-04, CFL  0.24583, SL -1.2420E-02, Mass 8.11435E+19, Me  1.38E-05
-   246,       1.708,     0, En 5.8285552735854568E-04, CFL  0.19926, SL  6.5042E-02, Mass 8.11453E+19, Me  2.14E-05
-   258,       1.792,     0, En 5.3398299716110619E-04, CFL  0.14777, SL  6.6318E-02, Mass 8.11453E+19, Me  3.52E-07
-   276,       1.917,     0, En 6.0388595791072727E-04, CFL  0.24701, SL  2.2959E-03, Mass 8.11438E+19, Me -1.77E-05
-   288,       2.000,     0, En 5.9222817304614771E-04, CFL  0.16609, SL -2.5902E-02, Mass 8.11432E+19, Me -7.78E-06
+    12,       0.083,     0, En 1.4064603249952431E-04, CFL  0.07039, SL  1.2228E-01, Mass 8.11465E+19, Me  3.37E-05
+    30,       0.208,     0, En 2.1074440062917064E-04, CFL  0.05460, SL  1.7971E-01, Mass 8.11478E+19, Me  1.58E-05
+    42,       0.292,     0, En 2.2870458432501452E-04, CFL  0.11157, SL  9.0051E-02, Mass 8.11458E+19, Me -2.47E-05
+    60,       0.417,     0, En 4.2397924051754935E-04, CFL  0.09462, SL -8.1320E-02, Mass 8.11420E+19, Me -4.73E-05
+    72,       0.500,     0, En 4.2475960530033571E-04, CFL  0.11075, SL -8.1583E-02, Mass 8.11420E+19, Me -7.26E-08
+    84,       0.583,     0, En 4.4909274680552384E-04, CFL  0.13702, SL -1.2708E-03, Mass 8.11438E+19, Me  2.22E-05
+   102,       0.708,     0, En 5.6329649266262014E-04, CFL  0.09447, SL  1.0578E-01, Mass 8.11462E+19, Me  2.95E-05
+   114,       0.792,     0, En 5.5195944403448093E-04, CFL  0.17740, SL  8.1551E-02, Mass 8.11456E+19, Me -6.69E-06
+   132,       0.917,     0, En 6.1497123018241411E-04, CFL  0.12276, SL -2.0422E-02, Mass 8.11433E+19, Me -2.81E-05
+   144,       1.000,     0, En 6.0779978881113513E-04, CFL  0.12721, SL -4.0782E-02, Mass 8.11429E+19, Me -5.62E-06
+   156,       1.083,     0, En 5.5869321052304482E-04, CFL  0.16974, SL -2.4960E-03, Mass 8.11437E+19, Me  1.06E-05
+   174,       1.208,     0, En 5.7641914974756016E-04, CFL  0.15722, SL  7.0120E-02, Mass 8.11454E+19, Me  2.00E-05
+   186,       1.292,     0, En 5.1592907524682216E-04, CFL  0.20833, SL  4.6962E-02, Mass 8.11448E+19, Me -6.39E-06
+   204,       1.417,     0, En 5.8948327861037459E-04, CFL  0.18444, SL -7.2832E-02, Mass 8.11422E+19, Me -3.31E-05
+   216,       1.500,     0, En 6.2026604959846061E-04, CFL  0.14153, SL -1.1955E-01, Mass 8.11411E+19, Me -1.29E-05
+   228,       1.583,     0, En 5.8204367797759233E-04, CFL  0.24568, SL -8.4037E-02, Mass 8.11419E+19, Me  9.80E-06
+   246,       1.708,     0, En 7.5145909301191415E-04, CFL  0.18042, SL  7.6203E-02, Mass 8.11455E+19, Me  4.42E-05
+   258,       1.792,     0, En 7.2041971765832537E-04, CFL  0.23450, SL  1.4508E-01, Mass 8.11470E+19, Me  1.90E-05
+   276,       1.917,     0, En 6.7306854091584713E-04, CFL  0.22474, SL  8.2748E-02, Mass 8.11457E+19, Me -1.72E-05
+   288,       2.000,     0, En 7.3100243272944409E-04, CFL  0.16845, SL -1.8710E-03, Mass 8.11438E+19, Me -2.34E-05