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 d150f628f0..ee89f52006 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 @@ -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. 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 8130bcc236..8eed8ae6d3 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 @@ -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. 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 a905395be8..506ea27627 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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 5cb24d9b44..60a091485f 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -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. 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 bd94e4f22f..15f750ffdf 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 @@ -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. 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 97efc7bec1..3d1b4a5e1b 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -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. 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 76c0a738a7..a0a2fafa4c 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -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. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 8a62f6cfb3..a0e392b145 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -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. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 45bf5130d9..f0ec00458b 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -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. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 0f44866474..0a622c330f 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short index 6c78c5de8d..cb1fd8f786 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short @@ -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 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index e759797483..6da72ae035 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -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. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 727d68a652..96fb1b8e1e 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -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. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 66b7f330ba..7af70e9d5d 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -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. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index da8ec5f032..c8a9809fd9 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -308,8 +308,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -323,7 +324,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index 86a2ee381b..d63f44c861 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -102,8 +102,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. 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 dea05f421e..c100f954ca 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 @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index c3742c0d8e..f91b61b0e7 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index 69bfb90ebb..7ab7b269f5 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index ec66324eb5..0ba5afb974 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index 6fa697eb3e..3807fbc635 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -308,8 +308,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -323,7 +324,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 4d7a8a6064..4253649f2c 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -102,8 +102,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. 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 b5f5c06836..7f3264d44a 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 @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 071d1a6129..d1e3e50e5e 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index f77a584893..0cf0a7852c 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index e97f2b05e4..33f9ab6a66 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index a1e51f597c..103066527c 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -308,8 +308,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -323,7 +324,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short index 6bbcfd5a23..1d10f8cac6 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short @@ -102,8 +102,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. 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 1af10940ec..436ca0fca8 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 @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short index 28f8287984..e861b66e74 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 15be51b901..b23b5d0f62 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short index 5871482b00..eca3bac634 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index d88d4150a8..b64d4a47bb 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -308,8 +308,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -323,7 +324,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short index 25367a027e..3bc0dfd231 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short @@ -102,8 +102,9 @@ NK = 63 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. 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 9d60fc0b2f..a96b47213d 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 @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short index a93dcca899..034f9051b5 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index f9b73a5866..a2b85d03b4 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -316,8 +316,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short index 813669cef4..9588e17961 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 400 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 10d812df44..e22b1f714b 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -316,8 +316,9 @@ NK = 600 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 @@ -331,7 +332,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 6d89c8ace9..5e1e8e9f01 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -109,8 +109,9 @@ NK = 600 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DS = 0.0 ! [kg m-3 PSU-1] default = 0.8 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! salinity. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index b983518eea..736647e0c7 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -314,8 +314,9 @@ NK = 25 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -329,7 +330,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index 5e05390873..dfd21b3bc7 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -115,8 +115,9 @@ NK = 25 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 3f332fb38b..aab52a6e4f 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -319,8 +319,9 @@ NK = 25 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -334,7 +335,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 7b4b442134..0813fb8cdd 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -113,8 +113,9 @@ NK = 25 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 01d8f39c3a..62bc745ba3 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -319,8 +319,9 @@ NK = 25 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -334,7 +335,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index e7bfb44e02..76dcb17349 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -113,8 +113,9 @@ NK = 25 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index e78267d330..27e1f63dd4 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -320,14 +320,20 @@ NK = 22 ! [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. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 88ecb61119..c8f5019ede 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -314,8 +314,9 @@ NK = 21 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 @@ -329,7 +330,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index ff2038a452..6621ae41a2 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -116,8 +116,9 @@ NK = 21 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. ! === module MOM_tracer_flow_control === diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 2edaa5030f..173dac8b6a 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -325,8 +325,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -340,7 +341,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index b06735dbf8..6b00defbc0 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -110,8 +110,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 95da3c833e..64031f8ad5 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -330,8 +330,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -345,7 +346,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 1b11fb8a06..ae282c02ec 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -108,8 +108,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 891ba2c618..045ce929cb 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -330,8 +330,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -345,7 +346,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index 649f0d984e..03a3f02e36 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -108,8 +108,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index ad662ca67c..1547bafe26 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -330,8 +330,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -345,7 +346,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index d99fe73270..e8df6d841c 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -108,8 +108,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index a2e3d576ce..4f610b536c 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -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. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 169006e5f5..418896ab7c 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -328,14 +328,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. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index be023314bb..3b70365ebd 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -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. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index cf2ce24cdb..e9fbf701f5 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -314,8 +314,9 @@ NK = 21 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 @@ -329,7 +330,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index dd5d67c41b..2229f7bafc 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -111,8 +111,9 @@ NK = 21 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. ! === module MOM_tracer_flow_control === diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 94bcc82e91..b81bdff6ab 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -319,8 +319,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 @@ -334,7 +335,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index 78f398fede..c66f718a8b 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -98,8 +98,9 @@ NK = 40 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. ! === module MOM_tracer_flow_control === diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index c71612e1cf..8689444339 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -314,14 +314,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. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 754236a571..76454dbbaa 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -314,8 +314,9 @@ NK = 9 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -329,7 +330,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index 691b585f99..60c14efb74 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -104,8 +104,9 @@ NK = 9 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 0508aaf68b..7b7b1859a0 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -319,8 +319,9 @@ NK = 9 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -334,7 +335,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index 756e9a9a06..ca20bcd276 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -102,8 +102,9 @@ NK = 9 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 0dfd413f80..07e8b55929 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -325,8 +325,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -340,7 +341,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index 94bfc88aba..9b6d5ff4f3 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -109,8 +109,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 713d10ec3f..17cc826f33 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -330,8 +330,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -345,7 +346,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index b1a881690d..dd85a0a954 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -107,8 +107,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 889a442132..fa8a9fcae1 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -330,8 +330,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -345,7 +346,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index b7d4bff3db..13fc6d5fa9 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -107,8 +107,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index e8facf80fd..be753df301 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -330,8 +330,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -345,7 +346,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index 9d8e23f8df..f08da6228e 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -107,8 +107,9 @@ NK = 20 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 9c73af7c7f..f0753fad70 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -308,14 +308,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. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index cdde92e08c..e870edfbab 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -316,14 +316,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. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index ea4cebe002..231cf72b1a 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -316,14 +316,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. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 593348e410..2214a476e9 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -317,8 +317,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -332,7 +333,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index c893b11520..c15c225480 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -107,8 +107,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index f63756560a..cb27ef2768 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -322,8 +322,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -337,7 +338,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 35a56b938e..66a74be420 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 1330d9bdd0..0b4b3b8784 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -322,8 +322,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -337,7 +338,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 0c41c81f86..7741ea7c6b 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -105,8 +105,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 9eb55fb647..499bbdd728 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -314,8 +314,9 @@ NK = 5 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 @@ -329,7 +330,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 28c80469da..146ccd0f25 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -111,8 +111,9 @@ NK = 5 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. ! === module MOM_tracer_flow_control === USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 4ecaf32106..fc9258fe3f 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -319,8 +319,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -334,7 +335,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index ef9463e628..7cf8044f6b 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -112,8 +112,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index f552feff12..bb73b4189b 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -319,8 +319,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 @@ -334,7 +335,8 @@ EOS_QUADRATURE = False ! [Boolean] default = False ! 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. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index c8902006aa..05070b48ad 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -112,8 +112,9 @@ NK = 10 ! [nondim] ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! 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. DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 ! When EQN_OF_STATE=LINEAR, this is the partial derivative of density with ! temperature. diff --git a/src/MOM6 b/src/MOM6 index c32be04711..ded1382bc7 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit c32be04711df4fc2ecc2357339143b9b7ba8778a +Subproject commit ded1382bc7410d2b6f500272aa77b719ea6810ee