Skip to content

Commit

Permalink
MOM6: +Rename WRIGHT_RED to WRIGHT_REDUCED
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@ded1382bc +Rename WRIGHT_RED to WRIGHT_REDUCED
- NOAA-GFDL/MOM6@ed58758d0 +Make calculate_density_array private
- NOAA-GFDL/MOM6@433ac3097 +Eliminate use_TEOS arg to cons_temp_to_pot_temp
- NOAA-GFDL/MOM6@b832f2ceb Update _Equation_of_State.dox
- NOAA-GFDL/MOM6@9e28271d5 +*Add MOM_temperature_convert.F90
- NOAA-GFDL/MOM6@28f97bbb1 +Add calculate_TFreeze_TEOS_poly
- NOAA-GFDL/MOM6@ae46d7da0 *Avoid re-rescaling T and p in MOM_EOS_Roquet_rho
- NOAA-GFDL/MOM6@4a3b6ac39 +Renamed MOM_EOS_NEMO to MOM_EOS_Roquet_rho
- NOAA-GFDL/MOM6@ed4623b43 *Refactor calculate_specific_vol_wright_full
- NOAA-GFDL/MOM6@3731c276c Do not include MOM_memory.h in EoS modules
- NOAA-GFDL/MOM6@7f164daec +Add EOS_fit_range and analogs for each EoS
- NOAA-GFDL/MOM6@b8a74cceb *+Add calculate_specvol_derivs_UNESCO
- NOAA-GFDL/MOM6@b5b69e721 +Add MOM_EOS_Jackett06.F90
- NOAA-GFDL/MOM6@493cfe524 +Add MOM_EOS_Roquet_SpV.F90
- NOAA-GFDL/MOM6@22729a0a2 *Refactor MOM_EOS_NEMO.F90
- NOAA-GFDL/MOM6@332b7e37e *Refactor MOM_EOS_UNESCO.F90
- NOAA-GFDL/MOM6@b4be5967b (*)+Added calc_density_second_derivs_wright_buggy
- NOAA-GFDL/MOM6@419085d68 +Add calculate_density_second_derivs_UNESCO
- NOAA-GFDL/MOM6@52f567805 *+NEMO equation of state self-consistency
- NOAA-GFDL/MOM6@ca20e2f1a Fix doxygen labels in EOS_Wright_full and _red
- NOAA-GFDL/MOM6@71e0bb7e6 +Add EOS_unit_tests
- NOAA-GFDL/MOM6@5dffa7da0 *Fix bug in calculate_spec_vol_linear with spv_ref
- NOAA-GFDL/MOM6@f650db6e6 +Created the new module MOM_EOS_Wright_red
- NOAA-GFDL/MOM6@4d74bfde6 (*)Rearranged parentheses in MOM_EOS_Wright_full
- NOAA-GFDL/MOM6@0f72e7fbd Fix and tidy Wright_EOS API documentation
- NOAA-GFDL/MOM6@f48bce702 +Add MOM_EOS_Wright_Full
- NOAA-GFDL/MOM6@144486491 +Remove rescaling factors from restart files
- NOAA-GFDL/MOM6@6547b2a65 (*)Use conversion factor for masscello diagnostic
- NOAA-GFDL/MOM6@4038d699c Checksum unrescaled non-Boussinesq thicknesses
- NOAA-GFDL/MOM6@7225642b5 Add better error handling to read_var_sizes
- NOAA-GFDL/MOM6@f9897c80f Correct MLD_EN_VALS rescaling

Added to MOM_parameter_doc.all:
    - USE_WRIGHT_2ND_DERIV_BUG
  • Loading branch information
@marshallward
marshallward committed Apr 24, 2023
1 parent 3c5a8d5 commit 53fae2e
Show file tree
Hide file tree
Showing 93 changed files with 472 additions and 240 deletions.
12 changes: 9 additions & 3 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,20 @@ NK = 63 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,20 @@ NK = 63 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,20 @@ NK = 63 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,20 @@ NK = 63 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,20 @@ NK = 50 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,20 @@ NK = 75 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,20 @@ NK = 75 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,20 @@ NK = 75 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,20 @@ NK = 75 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "LINEAR" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"
TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0
! When TFREEZE_FORM=LINEAR, this is the freezing potential temperature at S=0,
! P=0.
Expand Down
12 changes: 9 additions & 3 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,20 @@ NK = 75 ! [nondim]
! === module MOM_EOS ===
EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT"
! EQN_OF_STATE determines which ocean equation of state should be used.
! Currently, the valid choices are "LINEAR", "UNESCO", "WRIGHT", "NEMO" and
! "TEOS10". This is only used if USE_EOS is true.
! 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.
USE_WRIGHT_2ND_DERIV_BUG = False ! [Boolean] default = False
! If true, use a bug in the calculation of the second derivatives of density
! with temperature and with temperature and pressure that causes some terms to
! be only 2/3 of what they should be.
EOS_QUADRATURE = False ! [Boolean] default = False
! If true, always use the generic (quadrature) code code for the integrals of
! density.
TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"

! === module MOM_restart ===
PARALLEL_RESTARTFILES = True ! [Boolean] default = False
Expand Down
3 changes: 2 additions & 1 deletion ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ NK = 75 ! [nondim]
! === module MOM_EOS ===
TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR"
! TFREEZE_FORM determines which expression should be used for the freezing
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS10"
! point. Currently, the valid choices are "LINEAR", "MILLERO_78", "TEOS_POLY",
! "TEOS10"

! === module MOM_restart ===
PARALLEL_RESTARTFILES = True ! [Boolean] default = False
Expand Down
Loading

0 comments on commit 53fae2e

Please sign in to comment.