Skip to content

Commit

Permalink
Swap DEFAULT_ANSWER_DATE for DEFAULT_2018_ANSWERS
Browse files Browse the repository at this point in the history
  Replace lines setting DEFAULT_2018_ANSWERS in the MOM_input files for 12
experiments with equivalent values of DEFAULT_ANSWER_DATE.  This is a necessary
prelimiary to obsoleting all the _2018_ANSWERS runtime parameters.  Because of
the atypical way that the default for PORBAR_ANSWER_DATE is set, this also has
to be set explicitly to keep the previous settings.  All answers are bitwise
identical, but there are differences in the contents of the MOM_parameter_doc
files for these cases.
  • Loading branch information
Hallberg-NOAA authored and marshallward committed Jul 27, 2023
1 parent 5d33fc1 commit 0349f3e
Show file tree
Hide file tree
Showing 19 changed files with 130 additions and 38 deletions.
10 changes: 8 additions & 2 deletions coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ C_P = 3925.0 ! [J kg-1 K-1] default = 3991.86795711963
! The heat capacity of sea water, approximated as a constant. This is only used
! if ENABLE_THERMODYNAMICS is true. The default value is from the TEOS-10
! definition of conservative temperature.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
SAVE_INITIAL_CONDS = True ! [Boolean] default = False
! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.

Expand Down Expand Up @@ -282,6 +282,12 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
10 changes: 8 additions & 2 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ C_P = 3925.0 ! [J kg-1 K-1] default = 3991.86795711963
! The heat capacity of sea water, approximated as a constant. This is only used
! if ENABLE_THERMODYNAMICS is true. The default value is from the TEOS-10
! definition of conservative temperature.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
SAVE_INITIAL_CONDS = True ! [Boolean] default = False
! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.

Expand Down Expand Up @@ -282,6 +282,12 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
10 changes: 8 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ NKML = 2 ! [nondim] default = 2
NKBL = 2 ! [nondim] default = 2
! The number of layers that are used as variable density buffer layers if
! BULKMIXEDLAYER is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
SAVE_INITIAL_CONDS = True ! [Boolean] default = False
! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.
IC_OUTPUT_FILE = "GOLD_IC" ! default = "MOM_IC"
Expand Down Expand Up @@ -299,6 +299,12 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
10 changes: 8 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ NKML = 2 ! [nondim] default = 2
NKBL = 2 ! [nondim] default = 2
! The number of layers that are used as variable density buffer layers if
! BULKMIXEDLAYER is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
SAVE_INITIAL_CONDS = True ! [Boolean] default = False
! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.
IC_OUTPUT_FILE = "GOLD_IC" ! default = "MOM_IC"
Expand Down Expand Up @@ -306,6 +306,12 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ C_P = 3925.0 ! [J kg-1 K-1] default = 3991.86795711963
USE_PSURF_IN_EOS = False ! [Boolean] default = True
! If true, always include the surface pressure contributions in equation of
! state calculations.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = False
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
SAVE_INITIAL_CONDS = True ! [Boolean] default = False
! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.
IC_OUTPUT_FILE = "GOLD_IC" ! default = "MOM_IC"
Expand Down Expand Up @@ -264,6 +264,10 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_dynamics_split_RK2 ===

Expand Down
10 changes: 8 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
WRITE_GEOM = 0 ! default = 1
! If =0, never write the geometry and vertical grid files. If =1, write the
! geometry and vertical grid files only for a new simulation. If =2, always
Expand Down Expand Up @@ -425,6 +425,12 @@ USE_GM_WORK_BUG = True ! [Boolean] default = True
! If true, compute the top-layer work tendency on the u-grid with the incorrect
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
8 changes: 6 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = False
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
WRITE_GEOM = 0 ! default = 1
! If =0, never write the geometry and vertical grid files. If =1, write the
! geometry and vertical grid files only for a new simulation. If =2, always
Expand Down Expand Up @@ -385,6 +385,10 @@ USE_GM_WORK_BUG = True ! [Boolean] default = False
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_dynamics_split_RK2 ===

Expand Down
10 changes: 8 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.

! === module MOM_hor_index ===
! Sets the horizontal array index types.
Expand Down Expand Up @@ -441,6 +441,12 @@ USE_GM_WORK_BUG = True ! [Boolean] default = True
! If true, compute the top-layer work tendency on the u-grid with the incorrect
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
8 changes: 6 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = False
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.

! === module MOM_domains ===
REENTRANT_X = False ! [Boolean] default = True
Expand Down Expand Up @@ -402,6 +402,10 @@ USE_GM_WORK_BUG = True ! [Boolean] default = False
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_dynamics_split_RK2 ===

Expand Down
10 changes: 8 additions & 2 deletions ice_ocean_SIS2/OM4_025.JRA/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
WRITE_GEOM = 0 ! default = 1
! If =0, never write the geometry and vertical grid files. If =1, write the
! geometry and vertical grid files only for a new simulation. If =2, always
Expand Down Expand Up @@ -423,6 +423,12 @@ KHTH_MAX_CFL = 0.1 ! [nondimensional] default = 0.8
! model, but much smaller numbers (e.g. 0.1) seem to work better for ALE-based
! models.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
10 changes: 8 additions & 2 deletions ice_ocean_SIS2/OM4_025/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
WRITE_GEOM = 0 ! default = 1
! If =0, never write the geometry and vertical grid files. If =1, write the
! geometry and vertical grid files only for a new simulation. If =2, always
Expand Down Expand Up @@ -431,6 +431,12 @@ USE_GM_WORK_BUG = True ! [Boolean] default = True
! If true, compute the top-layer work tendency on the u-grid with the incorrect
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
8 changes: 6 additions & 2 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = False
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.
WRITE_GEOM = 0 ! default = 1
! If =0, never write the geometry and vertical grid files. If =1, write the
! geometry and vertical grid files only for a new simulation. If =2, always
Expand Down Expand Up @@ -392,6 +392,10 @@ USE_GM_WORK_BUG = True ! [Boolean] default = False
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_dynamics_split_RK2 ===

Expand Down
10 changes: 8 additions & 2 deletions ice_ocean_SIS2/OM4_05/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ BAD_VAL_SST_MAX = 55.0 ! [deg C] default = 45.0
BAD_VAL_SST_MIN = -3.0 ! [deg C] default = -2.1
! The value of SST below which a bad value message is triggered, if
! CHECK_BAD_SURFACE_VALS is true.
DEFAULT_2018_ANSWERS = True ! [Boolean] default = True
! This sets the default value for the various _2018_ANSWERS parameters.
DEFAULT_ANSWER_DATE = 20181231 ! default = 99991231
! This sets the default value for the various _ANSWER_DATE parameters.

! === module MOM_hor_index ===
! Sets the horizontal array index types.
Expand Down Expand Up @@ -446,6 +446,12 @@ USE_GM_WORK_BUG = True ! [Boolean] default = True
! If true, compute the top-layer work tendency on the u-grid with the incorrect
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
Expand Down
Loading

0 comments on commit 0349f3e

Please sign in to comment.