diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index d61f72479..69108055c 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -2009,6 +2009,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 0bf0b9ddc..700dfe4d5 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -2055,6 +2055,9 @@ EPBL_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index 7a419dede..6ea046ee3 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -2074,6 +2074,9 @@ EPBL_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index bcf2ba87d..da0fdcb97 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -2055,6 +2055,9 @@ EPBL_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 406f7caf9..ea83ddf6d 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -2074,6 +2074,9 @@ EPBL_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index a06295fbb..372d2d48b 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -2033,6 +2033,9 @@ EPBL_ANSWER_DATE = 20181231 ! default = 20181231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index cbee38a58..23f8b9a13 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -1322,6 +1322,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index de6442c4c..214722057 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -1322,6 +1322,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 9b218055f..b8947570f 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -1322,6 +1322,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 01142e7e3..7b39f2d23 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -1322,6 +1322,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 2e5bdc4cc..624e4e260 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -2059,6 +2059,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 8583b3581..f80197084 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -2006,6 +2006,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index cc6e2b46b..d761a4891 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -1476,6 +1476,9 @@ EPBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the energetic PBL ! calculations. Values below 20190101 recover the answers from the end of 2018, ! while higher values use updated and more robust forms of the same expressions. + ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several + ! expressions, while higher values use the integer root function cuberoot(A) and + ! therefore can work with scaled variables. EPBL_ORIGINAL_PE_CALC = True ! [Boolean] default = True ! If true, the ePBL code uses the original form of the potential energy change ! code. Otherwise, the newer version that can work with successive increments diff --git a/src/MOM6 b/src/MOM6 index 5137442fc..671c85d32 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 5137442fc91aced5162e00f5b8d2a1b5906b8e32 +Subproject commit 671c85d32864d89bce6cfe270a2c556c54b03ba4