Skip to content

Commit

Permalink
MOM6: Alternative interface to EQN_OF_STATE="LINEAR" (#842)
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@9e7cfe9ec Alternative interface to EQN_OF_STATE="LINEAR" (#842)
  • Loading branch information
@mom6bot @Hallberg-NOAA
mom6bot authored and Hallberg-NOAA committed Feb 25, 2025
1 parent 2045e77 commit 74bc126
Show file tree
Hide file tree
Showing 36 changed files with 281 additions and 71 deletions.
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
10 changes: 8 additions & 2 deletions ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,20 @@ EQN_OF_STATE = "LINEAR" ! default = "WRIGHT"
! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT",
! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and
! "TEOS10". This is only used if USE_EOS is true.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
RHO_TREF_SREF = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=TREF, S=SREF.
TREF = 0.0 ! [degC] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference temperature.
SREF = 0.0 ! [psu] default = 0.0
! When EQN_OF_STATE=LINEAR, this is the reference salinity.
DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! temperature.
DRHO_DS = 0.764 ! [kg m-3 ppt-1] default = 0.8
! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with
! salinity.
RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0
! When EQN_OF_STATE=LINEAR, this is the density at T=0, S=0.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
Expand Down
Loading

0 comments on commit 74bc126

Please sign in to comment.