From de69617c9016db28622077e0f342d77b4153188b Mon Sep 17 00:00:00 2001 From: John Krasting Date: Mon, 9 Apr 2018 11:00:03 -0400 Subject: [PATCH 1/3] Removed Z_INIT_REMAP* overrides from OM4_05 Edited MOM_input so that OM4_05 now uses the default settings for: REMAP_AFTER_INITIALIZATION (default = True) Z_INIT_REMAP_GENERAL (default = False) --- ice_ocean_SIS2/OM4_05/MOM_input | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index 7c6f43702d..4ce7893229 100644 --- 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 From e1ebe6fcddc798afe581c5673a5c600fac4607d1 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Tue, 10 Apr 2018 11:06:11 -0400 Subject: [PATCH 2/3] Set USE_NET_FW_ADJUSTMENT_SIGN_BUG to False - In MOM_saltrestore for the OM4_025 and OM4_05 configurations, USE_NET_FW_ADJUSTMENT_SIGN_BUG should be False. This will only impact solutions for CORE simulations. --- ice_ocean_SIS2/OM4_025/MOM_saltrestore | 3 +++ ice_ocean_SIS2/OM4_05/MOM_saltrestore | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ice_ocean_SIS2/OM4_025/MOM_saltrestore b/ice_ocean_SIS2/OM4_025/MOM_saltrestore index 3ffe016a8e..b12c6f096a 100644 --- 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_saltrestore b/ice_ocean_SIS2/OM4_05/MOM_saltrestore index 47b8761e2a..ec5a1290ce 100644 --- 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. From ba3a9a809e719d04d8894cdd0f6f23760c55611c Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 11 Apr 2018 13:25:09 -0400 Subject: [PATCH 3/3] *OM4: Updated doc files after configuration change - Changes to MOM_saltrestore and MOM_input were submitted without the doc file updates. --- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short | 3 +++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 8 ++++---- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 11 +++-------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 558bd96eaf..4a4acf77c0 100644 --- 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 index 88d43bf691..b4f43c59eb 100644 --- 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_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index e83fa48092..cbb92c6a14 100644 --- 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 index d527b23235..aa83c0ccb3 100644 --- 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