Merge branch 'jkrasting-user/jpk/OM4_05_remap_overrides' into dev/gfdl

NOAA-GFDL · Apr 11, 2018 · 192fb89 · 192fb89
2 parents 46b529c + ba3a9a8
commit 192fb89
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
@@ -2078,7 +2078,7 @@ ADJUST_NET_SRESTORE_BY_SCALING = False ! [Boolean] default = False
 ADJUST_NET_FRESH_WATER_TO_ZERO = True ! [Boolean] default = False
  ! If true, adjusts the net fresh-water forcing seen
  ! by the ocean (including restoring) to zero.
-USE_NET_FW_ADJUSTMENT_SIGN_BUG = True ! [Boolean] default = True
+USE_NET_FW_ADJUSTMENT_SIGN_BUG = False ! [Boolean] default = True
  ! If true, use the wrong sign for the adjustment to
  ! the net fresh-water.
 ADJUST_NET_FRESH_WATER_BY_SCALING = False ! [Boolean] default = False

diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
@@ -828,6 +828,9 @@ MAX_P_SURF = 0.0 ! [Pa] default = -1.0
 ADJUST_NET_FRESH_WATER_TO_ZERO = True ! [Boolean] default = False
  ! If true, adjusts the net fresh-water forcing seen
  ! by the ocean (including restoring) to zero.
+USE_NET_FW_ADJUSTMENT_SIGN_BUG = False ! [Boolean] default = True
+ ! If true, use the wrong sign for the adjustment to
+ ! the net fresh-water.
 FLUXCONST = 0.1667 ! [m day-1]
  ! The constant that relates the restoring surface fluxes
  ! to the relative surface anomalies (akin to a piston

diff --git a/ice_ocean_SIS2/OM4_025/MOM_saltrestore b/ice_ocean_SIS2/OM4_025/MOM_saltrestore
@@ -18,3 +18,6 @@ SRESTORE_AS_SFLUX = True ! [Boolean] default = False
  ! flux instead of as a freshwater flux.
 MAX_DELTA_SRESTORE = 5.0 ! [PSU or g kg-1] default = 999.0
  ! The maximum salinity difference used in restoring terms.
+USE_NET_FW_ADJUSTMENT_SIGN_BUG = False ! [Boolean] default = True
+ ! If true, use the wrong sign for the adjustment to
+ ! the net fresh-water.
diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input
@@ -281,11 +281,6 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM"
  ! PPM_IH4 (3rd-order accurate)
  ! PQM_IH4IH3 (4th-order accurate)
  ! PQM_IH6IH5 (5th-order accurate)
-REMAP_AFTER_INITIALIZATION = False ! [Boolean] default = True
- ! If true, applies regridding and remapping immediately after
- ! initialization so that the state is ALE consistent. This is a
- ! legacy step and should not be needed if the initialization is
- ! consistent with the coordinate mode.
 
 ! === module MOM_grid ===
 ! Parameters providing information about the lateral grid.
@@ -316,9 +311,6 @@ Z_INIT_FILE_SALT_VAR = "s_an" ! default = "salt"
  ! SALT_Z_INIT_FILE.
 Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False
  ! If True, then remap straight to model coordinate from file.
-Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False
- ! If false, only initializes to z* coordinates.
- ! If true, allows initialization directly to general coordinates.
 
 ! === module MOM_diag_mediator ===
 NUM_DIAG_COORDS = 2 ! default = 1

diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
@@ -515,7 +515,7 @@ REMAP_BOUND_INTERMEDIATE_VALUES = False ! [Boolean] default = False
 REMAP_BOUNDARY_EXTRAP = False ! [Boolean] default = False
  ! If true, values at the interfaces of boundary cells are
  ! extrapolated instead of piecewise constant
-REMAP_AFTER_INITIALIZATION = False ! [Boolean] default = True
+REMAP_AFTER_INITIALIZATION = True ! [Boolean] default = True
  ! If true, applies regridding and remapping immediately after
  ! initialization so that the state is ALE consistent. This is a
  ! legacy step and should not be needed if the initialization is
@@ -568,10 +568,10 @@ Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False
 Z_INIT_REMAPPING_SCHEME = "PPM_IH4" ! default = "PPM_IH4"
  ! The remapping scheme to use if using Z_INIT_ALE_REMAPPING
  ! is True.
-Z_INIT_REMAP_GENERAL = True  ! [Boolean] default = False
+Z_INIT_REMAP_GENERAL = False ! [Boolean] default = False
  ! If false, only initializes to z* coordinates.
  ! If true, allows initialization directly to general coordinates.
-Z_INIT_REMAP_FULL_COLUMN = True ! [Boolean] default = True
+Z_INIT_REMAP_FULL_COLUMN = False ! [Boolean] default = False
  ! If false, only reconstructs profiles for valid data points.
  ! If true, inserts vanished layers below the valid data.
 Z_INIT_REMAP_OLD_ALG = True ! [Boolean] default = True
@@ -2107,7 +2107,7 @@ ADJUST_NET_SRESTORE_BY_SCALING = False ! [Boolean] default = False
 ADJUST_NET_FRESH_WATER_TO_ZERO = True ! [Boolean] default = False
  ! If true, adjusts the net fresh-water forcing seen
  ! by the ocean (including restoring) to zero.
-USE_NET_FW_ADJUSTMENT_SIGN_BUG = True ! [Boolean] default = True
+USE_NET_FW_ADJUSTMENT_SIGN_BUG = False ! [Boolean] default = True
  ! If true, use the wrong sign for the adjustment to
  ! the net fresh-water.
 ADJUST_NET_FRESH_WATER_BY_SCALING = False ! [Boolean] default = False

diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
@@ -272,11 +272,6 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM"
  ! PPM_IH4 (3rd-order accurate)
  ! PQM_IH4IH3 (4th-order accurate)
  ! PQM_IH6IH5 (5th-order accurate)
-REMAP_AFTER_INITIALIZATION = False ! [Boolean] default = True
- ! If true, applies regridding and remapping immediately after
- ! initialization so that the state is ALE consistent. This is a
- ! legacy step and should not be needed if the initialization is
- ! consistent with the coordinate mode.
 
 ! === module MOM_grid ===
 ! Parameters providing information about the lateral grid.
@@ -307,9 +302,6 @@ Z_INIT_FILE_SALT_VAR = "s_an" ! default = "salt"
  ! SALT_Z_INIT_FILE.
 Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False
  ! If True, then remap straight to model coordinate from file.
-Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False
- ! If false, only initializes to z* coordinates.
- ! If true, allows initialization directly to general coordinates.
 
 ! === module MOM_diag_mediator ===
 NUM_DIAG_COORDS = 2 ! default = 1
@@ -879,6 +871,9 @@ MAX_P_SURF = 0.0 ! [Pa] default = -1.0
 ADJUST_NET_FRESH_WATER_TO_ZERO = True ! [Boolean] default = False
  ! If true, adjusts the net fresh-water forcing seen
  ! by the ocean (including restoring) to zero.
+USE_NET_FW_ADJUSTMENT_SIGN_BUG = False ! [Boolean] default = True
+ ! If true, use the wrong sign for the adjustment to
+ ! the net fresh-water.
 FLUXCONST = 0.1667 ! [m day-1]
  ! The constant that relates the restoring surface fluxes
  ! to the relative surface anomalies (akin to a piston

diff --git a/ice_ocean_SIS2/OM4_05/MOM_saltrestore b/ice_ocean_SIS2/OM4_05/MOM_saltrestore
@@ -18,3 +18,6 @@ SRESTORE_AS_SFLUX = True ! [Boolean] default = False
  ! flux instead of as a freshwater flux.
 MAX_DELTA_SRESTORE = 5.0 ! [PSU or g kg-1] default = 999.0
  ! The maximum salinity difference used in restoring terms.
+USE_NET_FW_ADJUSTMENT_SIGN_BUG = False ! [Boolean] default = True
+ ! If true, use the wrong sign for the adjustment to
+ ! the net fresh-water.