From c178c22aa88456de52ee97d50cfaa51f7c5d30d8 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Wed, 5 Jun 2024 13:25:08 -0400 Subject: [PATCH] MOM6: (*)Fix Kd_interface diag in newer diabatic_ALE - NOAA-GFDL/MOM6@9ab5f3483 (*)Fix Kd_interface diag in newer diabatic_ALE - NOAA-GFDL/MOM6@d6500bc0b +Add DETERMINE_TEMP_CONVERGENCE_BUG parameter - NOAA-GFDL/MOM6@b389a89c3 +(*)Fix sign of neutral_slope_x diag with no EOS - NOAA-GFDL/MOM6@7ccea2a49 Add units to the descriptions of 79 variables - NOAA-GFDL/MOM6@e58b95f3d Ice-shelf dynamics updates - NOAA-GFDL/MOM6@08a6106a1 +Add ROBUST_STOKES_PGF and LA_MISALIGNMENT_BUG - NOAA-GFDL/MOM6@f0badc6b6 Prestore axes_data in set_up_ALE_sponge_field --- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 6 ++++++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 6 ++++++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 6 ++++++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/single_column/BML/MOM_parameter_doc.all | 6 ++++++ src/MOM6 | 2 +- 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 860b61226..b2139177e 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -576,6 +576,12 @@ DETERMINE_TEMP_ADJUST_T_AND_S = False ! [Boolean] default = False ! based on the ratio of the thermal and haline coefficients. Otherwise try to ! match the density by only adjusting temperatures within a maximum range before ! revising estimates of the salinity. +DETERMINE_TEMP_CONVERGENCE_BUG = True ! [Boolean] default = True + ! If true, use layout-dependent tests on the changes in temperature and salinity + ! to determine when the iterations have converged when + ! DETERMINE_TEMP_ADJUST_T_AND_S is false. For realistic equations of state and + ! the default values of the various tolerances, this bug does not impact the + ! solutions. DETERMINE_TEMP_T_MIN = -2.0 ! [degC] default = -2.0 ! The minimum temperature that can be found by determine_temperature. DETERMINE_TEMP_T_MAX = 31.0 ! [degC] default = 31.0 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 13da50425..02861b6cf 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -576,6 +576,12 @@ DETERMINE_TEMP_ADJUST_T_AND_S = False ! [Boolean] default = False ! based on the ratio of the thermal and haline coefficients. Otherwise try to ! match the density by only adjusting temperatures within a maximum range before ! revising estimates of the salinity. +DETERMINE_TEMP_CONVERGENCE_BUG = True ! [Boolean] default = True + ! If true, use layout-dependent tests on the changes in temperature and salinity + ! to determine when the iterations have converged when + ! DETERMINE_TEMP_ADJUST_T_AND_S is false. For realistic equations of state and + ! the default values of the various tolerances, this bug does not impact the + ! solutions. DETERMINE_TEMP_T_MIN = -2.0 ! [degC] default = -2.0 ! The minimum temperature that can be found by determine_temperature. DETERMINE_TEMP_T_MAX = 31.0 ! [degC] default = 31.0 diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index b4ba2f3bc..bc8169aa6 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -576,6 +576,12 @@ DETERMINE_TEMP_ADJUST_T_AND_S = False ! [Boolean] default = False ! based on the ratio of the thermal and haline coefficients. Otherwise try to ! match the density by only adjusting temperatures within a maximum range before ! revising estimates of the salinity. +DETERMINE_TEMP_CONVERGENCE_BUG = True ! [Boolean] default = True + ! If true, use layout-dependent tests on the changes in temperature and salinity + ! to determine when the iterations have converged when + ! DETERMINE_TEMP_ADJUST_T_AND_S is false. For realistic equations of state and + ! the default values of the various tolerances, this bug does not impact the + ! solutions. DETERMINE_TEMP_T_MIN = -2.0 ! [degC] default = -2.0 ! The minimum temperature that can be found by determine_temperature. DETERMINE_TEMP_T_MAX = 31.0 ! [degC] default = 31.0 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 674f80b48..f0c9ab4ab 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -576,6 +576,12 @@ DETERMINE_TEMP_ADJUST_T_AND_S = False ! [Boolean] default = False ! based on the ratio of the thermal and haline coefficients. Otherwise try to ! match the density by only adjusting temperatures within a maximum range before ! revising estimates of the salinity. +DETERMINE_TEMP_CONVERGENCE_BUG = True ! [Boolean] default = True + ! If true, use layout-dependent tests on the changes in temperature and salinity + ! to determine when the iterations have converged when + ! DETERMINE_TEMP_ADJUST_T_AND_S is false. For realistic equations of state and + ! the default values of the various tolerances, this bug does not impact the + ! solutions. DETERMINE_TEMP_T_MIN = -2.0 ! [degC] default = -2.0 ! The minimum temperature that can be found by determine_temperature. DETERMINE_TEMP_T_MAX = 31.0 ! [degC] default = 31.0 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 337986c0e..d61461a23 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -537,6 +537,12 @@ DETERMINE_TEMP_ADJUST_T_AND_S = False ! [Boolean] default = False ! based on the ratio of the thermal and haline coefficients. Otherwise try to ! match the density by only adjusting temperatures within a maximum range before ! revising estimates of the salinity. +DETERMINE_TEMP_CONVERGENCE_BUG = True ! [Boolean] default = True + ! If true, use layout-dependent tests on the changes in temperature and salinity + ! to determine when the iterations have converged when + ! DETERMINE_TEMP_ADJUST_T_AND_S is false. For realistic equations of state and + ! the default values of the various tolerances, this bug does not impact the + ! solutions. DETERMINE_TEMP_T_MIN = -2.0 ! [degC] default = -2.0 ! The minimum temperature that can be found by determine_temperature. DETERMINE_TEMP_T_MAX = 31.0 ! [degC] default = 31.0 diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index f60d9620a..7e7cf1f3d 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -485,6 +485,12 @@ DETERMINE_TEMP_ADJUST_T_AND_S = False ! [Boolean] default = False ! based on the ratio of the thermal and haline coefficients. Otherwise try to ! match the density by only adjusting temperatures within a maximum range before ! revising estimates of the salinity. +DETERMINE_TEMP_CONVERGENCE_BUG = True ! [Boolean] default = True + ! If true, use layout-dependent tests on the changes in temperature and salinity + ! to determine when the iterations have converged when + ! DETERMINE_TEMP_ADJUST_T_AND_S is false. For realistic equations of state and + ! the default values of the various tolerances, this bug does not impact the + ! solutions. DETERMINE_TEMP_T_MIN = -2.0 ! [degC] default = -2.0 ! The minimum temperature that can be found by determine_temperature. DETERMINE_TEMP_T_MAX = 31.0 ! [degC] default = 31.0 diff --git a/src/MOM6 b/src/MOM6 index 9059671be..9ab5f3483 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 9059671be5e4fa5e2fbe314609a0cc3f0592e164 +Subproject commit 9ab5f3483b35a39d15d4d294b9a2a8f6c577ac67