diff --git a/components/mpas-albany-landice/bld/namelist_files/namelist_defaults_mali.xml b/components/mpas-albany-landice/bld/namelist_files/namelist_defaults_mali.xml
index ebf0744c64ba..b52dc0eb28a5 100644
--- a/components/mpas-albany-landice/bld/namelist_files/namelist_defaults_mali.xml
+++ b/components/mpas-albany-landice/bld/namelist_files/namelist_defaults_mali.xml
@@ -113,7 +113,7 @@
0.9
-910.0
+-1.0
1028.0
0.0
3.1709792e-24
diff --git a/components/mpas-albany-landice/bld/namelist_files/namelist_definition_mali.xml b/components/mpas-albany-landice/bld/namelist_files/namelist_definition_mali.xml
index da5e3dca8b61..42329bde441f 100644
--- a/components/mpas-albany-landice/bld/namelist_files/namelist_definition_mali.xml
+++ b/components/mpas-albany-landice/bld/namelist_files/namelist_definition_mali.xml
@@ -842,7 +842,7 @@ Default: Defined in namelist_defaults.xml
category="physical_parameters" group="physical_parameters">
ice density to use (assumed constant and uniform)
-Valid values: Any positive real value
+Valid values: Any positive real value, or a negative value to use model default
Default: Defined in namelist_defaults.xml
diff --git a/components/mpas-albany-landice/src/Registry.xml b/components/mpas-albany-landice/src/Registry.xml
index a6bf14cc9664..430d8b24ca7b 100644
--- a/components/mpas-albany-landice/src/Registry.xml
+++ b/components/mpas-albany-landice/src/Registry.xml
@@ -524,7 +524,7 @@
SHR_CONST_CPICE,&
- latent_heat_ice => SHR_CONST_LATICE,&
- triple_point => SHR_CONST_TKTRIP,&
- rho_water => SHR_CONST_RHOFW, &
- cp_freshwater => SHR_CONST_CPFW, &
- cp_seawater => SHR_CONST_CPSW, &
- pii => SHR_CONST_PI, &
- gravity => SHR_CONST_G
- implicit none
- save
+ use shr_const_mod, only: &
+ cp_ice => SHR_CONST_CPICE,&
+ latent_heat_ice => SHR_CONST_LATICE,&
+ triple_point => SHR_CONST_TKTRIP,&
+ rho_water => SHR_CONST_RHOFW, &
+ cp_freshwater => SHR_CONST_CPFW, &
+ cp_seawater => SHR_CONST_CPSW, &
+ pii => SHR_CONST_PI, &
+ gravity => SHR_CONST_G, &
+ shr_gas_constant => SHR_CONST_RGAS, &
+ iceConductivity => SHR_CONST_CONDICE, &
+ kelvin_to_celsius => SHR_CONST_TKFRZ, &
+ seconds_per_day => SHR_CONST_CDAY
+ implicit none
+ save
+
+ real (kind=RKIND), parameter, public :: idealGasConstant = shr_gas_constant * 1.0e-3_RKIND !< ideal gas constant (J mol^-1 K^-1), converted from SHR_CONST_RGAS (J kmol^-1 K^-1)
#else
@@ -41,36 +47,36 @@ module li_constants
save
! physical constants
- real (kind=RKIND), parameter, public :: cp_ice = 2009.0_RKIND !< heat capacity of ice (J/kg/K)
- real (kind=RKIND), parameter, public :: latent_heat_ice = 335.0e3_RKIND !< Latent heat of melting of ice (J/kg)
+ real (kind=RKIND), parameter, public :: cp_ice = 2.11727e3_RKIND !< heat capacity of ice (J/kg/K), aligned with SHR_CONST_CPICE
+ real (kind=RKIND), parameter, public :: latent_heat_ice = 3.337e5_RKIND !< Latent heat of melting of ice (J/kg), aligned with SHR_CONST_LATICE
real (kind=RKIND), parameter, public :: triple_point = 273.16_RKIND !< Triple point of water (K)
real (kind=RKIND), parameter, public :: rho_water = 1000.0_RKIND !< Density of fresh water (kg m^-3)
real (kind=RKIND), parameter, public :: cp_freshwater = 4.188e3_RKIND !< heat capacity of freshwater (J/kg/K)
- real (kind=RKIND), parameter, public :: cp_seawater = 3.974e3_RKIND !< heat capacity of seawater (J/kg/K)
- real (kind=RKIND), parameter, public :: pii = 3.141592653589793_RKIND !< Constant: Pi
+ real (kind=RKIND), parameter, public :: cp_seawater = 3.996e3_RKIND !< heat capacity of seawater (J/kg/K), aligned with SHR_CONST_CPSW
+ real (kind=RKIND), parameter, public :: pii = 3.14159265358979323846_RKIND !< Constant: Pi
real (kind=RKIND), parameter, public :: gravity = 9.80616_RKIND !< Constant: Acceleration due to gravity [m s-2]
+ real (kind=RKIND), parameter, private :: shr_gas_constant = 8314.467591_RKIND
+ real (kind=RKIND), parameter, public :: idealGasConstant = shr_gas_constant * 1.0e-3_RKIND !< ideal gas constant (J mol^-1 K^-1), converted from SHR_CONST_RGAS
+ real (kind=RKIND), parameter, public :: iceConductivity = 2.1_RKIND !< thermal conductivity of ice (W m^-1 K^-1)
+ real (kind=RKIND), parameter, public :: kelvin_to_celsius = 273.15_RKIND !< factor to convert Kelvin to Celsius
+ real (kind=RKIND), parameter, public :: seconds_per_day = 86400.0_RKIND !< Conversion from days to seconds
#endif
+ real (kind=RKIND), parameter, public :: glacier_ice_density = 910.0_RKIND !< Density of glacier ice (kg m^-3)
+ real (kind=RKIND), parameter, private :: oceanFreezingTempPressureDependence = -7.43e-8_RKIND
real (kind=RKIND), parameter, public :: kin_visc_water = 1.793e-6_RKIND !< kinematic viscosity of freshwater at 0 deg C (m^2 s^-1)
- real (kind=RKIND), parameter, public :: idealGasConstant = 8.314_RKIND !< ideal gas constant (J mol^-1 K^-1)
- real (kind=RKIND), parameter, public :: iceConductivity = 2.1_RKIND !< thermal conductivity of ice (W m^-1 K^-1)
+ real (kind=RKIND), parameter, public :: oceanFreezingTempDepthDependence = oceanFreezingTempPressureDependence * rho_water * gravity !< Rate of change of freezing temperature with depth (deg m^-1)
real (kind=RKIND), parameter, public :: &
- oceanFreezingTempSurface = -1.92_RKIND, & !< Freezing temperature of seawater (deg C) at surface pressure,
- !< given S = 35 PSU
- oceanFreezingTempDepthDependence = -7.53e-4_RKIND !< Rate of change of freezing temperature of seawater
- !< with depth (deg m^-1), given S = 35 PSU
- !< These values are from the Ocean Water Freezing Point Calculator,
- !< http://www.csgnetwork.com/h2ofreezecalc.html (25 Nov. 2014)
+ oceanFreezingTempSurface = -1.92_RKIND !< Freezing temperature of seawater (deg C) at surface pressure,
+ !< given S = 35 PSU
real (kind=RKIND), parameter, public :: iceMeltingPointPressureDependence = 7.9e-8_RKIND
!< Clausius-Clapeyron constant: Dependence of ice melting point on pressure (K Pa^-1)
! conversion factors
- real (kind=RKIND), parameter, public :: kelvin_to_celsius = 273.15_RKIND !< factor to convert Kelvin to Celsius
- real (kind=RKIND), parameter, public :: scyr = 31536000.0_RKIND !< seconds in a 365-day year; used for diagnostics
- real (kind=RKIND), parameter, public :: seconds_per_day = 86400.0_RKIND !< Conversion from days to seconds
+ real (kind=RKIND), parameter, public :: scyr = seconds_per_day * 365.0_RKIND !< seconds in a 365-day year; used for diagnostics
!***********************************************************************
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
index 47fc7eacb6ec..2691a9d4c0c2 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -473,7 +473,7 @@
10.0
0.0
2.009e3
-918
+-1
2.5e-3
4.48e-3
4.48e-3
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
index 0419719ffaa3..9de3cbe0d9fb 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
@@ -1776,7 +1776,7 @@ Default: Defined in namelist_defaults.xml
category="land_ice_fluxes" group="land_ice_fluxes">
The density of land ice.
-Valid values: Any positive real number
+Valid values: Any positive real number, or a negative value to use model default
Default: Defined in namelist_defaults.xml
diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index dd218f789e4f..3859702781d9 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -1117,7 +1117,7 @@
/>