@@ -6,19 +6,19 @@ function Diffusivity(Model, Node, Temp) result(EnthalpyDiffusivity)
66 type (Variable_t), pointer :: Density
77 integer :: Node ! current node number
88
9- real (kind= dp) :: Temp, & ! [K]
10- T_ptr, & ! [K] Temp. (of water) at triple point
11- rho, & ! [kg m^-3]
9+ real (kind= dp) :: Temp, & ! [K]
10+ rho, & ! [kg m^-3]
11+ rho_i, & ! [kg m^-3]
1212 Heat_Capacity, & ! [J kg^-1 K^-1
1313 EnthalpyDiffusivity, & ! [kg m^-1 a^-1]
1414 HeatConductivity, & ! [W K^-1 m^-1] thermal conductivity
15- K_rho, & ! [W K^-1 m^-1] desnity dependence of ""
16- K_ice, & ! [W K^-1 m^-1] "" of ice
17- K_ptr , & ! [W K^-1 m^-1] "" at triple point of water
18- CapA, & ! [J kg-1 K-2]
19- CapB, & ! [J kg-1 K-1]
20- CondA, & ! [W m^5 K^-1 kg^-2]
21- CondB, & ! [W m^2 K^-1 kg^-1]
15+ K_rho, & ! [W K^-1 m^-1] desnity dependence of ""
16+ K_ice, & ! [W K^-1 m^-1] "" of ice
17+ K_rho_i , & ! [W K^-1 m^-1] "" at rho of ice
18+ CapA, & ! [J kg-1 K-2]
19+ CapB, & ! [J kg-1 K-1]
20+ CondA, & ! [W m^5 K^-1 kg^-2]
21+ CondB, & ! [W m^2 K^-1 kg^-1]
2222 CondC ! [W kg-1 m-1]
2323
2424 Density = > VariableGet(Model % Variables, ' Densi' ) ! [kg m^-3]
@@ -27,7 +27,7 @@ function Diffusivity(Model, Node, Temp) result(EnthalpyDiffusivity)
2727 CondA = GetConstReal(Model % Constants, " Enthalpy Heat Conductivity A" ) ! [W m^5 K^-1 kg^-2]
2828 CondB = GetConstReal(Model % Constants, " Enthalpy Heat Conductivity B" ) ! [W m^2 K^-1 kg^-1]
2929 CondC = GetConstReal(Model % Constants, " Enthalpy Heat Conductivity C" ) ! [W kg-1 m-1]
30- T_ptr = GetConstReal(Model % Constants, " T_triple " ) ! [K]
30+ rho_i = GetConstReal(Model % Constants, " rho_i " ) ! [K]
3131
3232 Temp = Temp + 273.15 ! [K] <-- [C]
3333 rho = Density% values(Density% perm(Node)) ! [kg m^-3]
@@ -36,12 +36,12 @@ function Diffusivity(Model, Node, Temp) result(EnthalpyDiffusivity)
3636 Heat_Capacity = CapA * Temp + CapB
3737
3838 ! Intermediate conductivity calcs. [W kg-1 m-1]]
39- K_rho = CondA * rho** 2 - CondB * rho + CondC
39+ K_rho = CondA * rho** 2 - CondB * rho + CondC
40+ K_rho_i = CondA * rho_i** 2 - CondB * rho_i + CondC
4041 K_ice = 9.828 * exp (- 5.7e-3 * (Temp))
41- K_ptr = 9.828 * exp (- 5.7e-3 * (T_ptr))
4242
4343 ! Conductivity [J a^-1 kg^-1 K^-1] <-- [W K^-1 m^-1] == [J s^-1 K^-1 m^-1]
44- HeatConductivity = (K_ice / K_ptr * K_rho ) * 3600.0 * 24.0 * 365.25
44+ HeatConductivity = (K_rho / K_rho_i * K_ice ) * 3600.0 * 24.0 * 365.25
4545
4646 ! Diffusivity [kg m^-1 a^-1]
4747 EnthalpyDiffusivity = HeatConductivity / Heat_Capacity
0 commit comments