Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOM6: (*)Use cuberoot in ePBL_column #439

Merged
merged 1 commit into from
Feb 6, 2024
Merged

MOM6: (*)Use cuberoot in ePBL_column #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/hycom/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/z/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/single_column/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Open in desktop
Submodule MOM6 updated 10 files
+1 −1 .gitlab-ci.yml
+28 −0 docs/forcing.rst
+8 −5 src/core/MOM_unit_tests.F90
+11 −9 src/diagnostics/MOM_spatial_means.F90
+12 −5 src/framework/MOM_diag_remap.F90
+17 −3 src/framework/MOM_file_parser.F90
+211 −1 src/framework/MOM_intrinsic_functions.F90
+3 −1 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+77 −28 src/parameterizations/vertical/MOM_energetic_PBL.F90
+6 −6 src/tracer/oil_tracer.F90
Loading