Merge #70

70: Hard code pottemp methods to eos and remove entropy option r=charleskawczynski a=charleskawczynski Co-authored-by: Charles Kawczynski <[email protected]>
CliMA · Aug 3, 2021 · 669788a · 669788a
2 parents 560647f + 45dad3d
commit 669788a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 53 deletions.
diff --git a/src/EDMF_Environment.jl b/src/EDMF_Environment.jl
@@ -145,7 +145,7 @@ function saturation_adjustment(self::EnvironmentThermodynamics, EnvVar::Environm
     mph = mph_struct()
 
     @inbounds for k in real_center_indicies(self.Gr)
-        sa = eos(self.t_to_prog_fp, self.prog_to_t_fp, self.Ref.p0_half[k], EnvVar.QT.values[k], EnvVar.H.values[k])
+        sa = eos(self.Ref.p0_half[k], EnvVar.QT.values[k], EnvVar.H.values[k])
 
         EnvVar.T.values[k] = sa.T
         EnvVar.QL.values[k] = sa.ql
@@ -184,7 +184,7 @@ function sgs_mean(self::EnvironmentThermodynamics, EnvVar::EnvironmentVariables,
 
     @inbounds for k in real_center_indicies(self.Gr)
         # condensation
-        sa = eos(self.t_to_prog_fp, self.prog_to_t_fp, self.Ref.p0_half[k], EnvVar.QT.values[k], EnvVar.H.values[k])
+        sa = eos(self.Ref.p0_half[k], EnvVar.QT.values[k], EnvVar.H.values[k])
         # autoconversion and accretion
         mph = microphysics_rain_src(
             Rain.rain_model,
@@ -325,7 +325,7 @@ function sgs_quadrature(self::EnvironmentThermodynamics, EnvVar::EnvironmentVari
                     end
 
                     # condensation
-                    sa = eos(self.t_to_prog_fp, self.prog_to_t_fp, self.Ref.p0_half[k], qt_hat, h_hat)
+                    sa = eos(self.Ref.p0_half[k], qt_hat, h_hat)
                     # autoconversion and accretion
                     mph = microphysics_rain_src(
                         Rain.rain_model,
@@ -411,7 +411,7 @@ function sgs_quadrature(self::EnvironmentThermodynamics, EnvVar::EnvironmentVari
 
         else
             # if variance and covariance are zero do the same as in SA_mean
-            sa = eos(self.t_to_prog_fp, self.prog_to_t_fp, self.Ref.p0_half[k], EnvVar.QT.values[k], EnvVar.H.values[k])
+            sa = eos(self.Ref.p0_half[k], EnvVar.QT.values[k], EnvVar.H.values[k])
             mph = microphysics_rain_src(
                 Rain.rain_model,
                 Rain.max_supersaturation,

diff --git a/src/EDMF_Updrafts.jl b/src/EDMF_Updrafts.jl
@@ -153,8 +153,6 @@ function initialize_DryBubble(self::UpdraftVariables, GMV::GridMeanVariables, Re
                 # for now temperature is provided as diagnostics from LES
 
                 # sa = eos(
-                #     t_to_thetali_c,
-                #     eos_first_guess_thetal,
                 #     Ref.p0_half[k],
                 #     self.QT.values[i,k],
                 #     self.H.values[i,k]
@@ -439,7 +437,7 @@ function buoyancy(
                 elseif UpdVar.Area.values[i, k - 1] > 0.0 && k > self.Gr.gw
                     # TODO: report bug:
                     # qt and h were not defined here before the function call.
-                    sa = eos(self.t_to_prog_fp, self.prog_to_t_fp, self.Ref.p0_half[k], qt, h)
+                    sa = eos(self.Ref.p0_half[k], qt, h)
                     qt -= sa.ql
                     qv = qt
                     t = sa.T

diff --git a/src/ReferenceState.jl b/src/ReferenceState.jl
@@ -50,7 +50,7 @@ function initialize(self::ReferenceState, Gr::Grid, Stats::NetCDFIO_Stats)
     # determine the reference pressure
 
     function rhs(p, u, z)
-        ret = eos(t_to_entropy_c, eos_first_guess_entropy, exp(p), self.qtg, self.sg)
+        ret = eos(exp(p), self.qtg, self.sg; t_to_prog = t_to_entropy_c, prog_to_t = eos_first_guess_entropy)
         q_i = 0.0
         q_l = ret.ql
         T = ret.T
@@ -109,15 +109,15 @@ function initialize(self::ReferenceState, Gr::Grid, Stats::NetCDFIO_Stats)
     # Compute reference state thermodynamic profiles
 
     @inbounds for k in center_indicies(Gr)
-        ret = eos(t_to_entropy_c, eos_first_guess_entropy, p_half_[k], self.qtg, self.sg)
+        ret = eos(p_half_[k], self.qtg, self.sg; t_to_prog = t_to_entropy_c, prog_to_t = eos_first_guess_entropy)
         temperature_half[k] = ret.T
         ql_half[k] = ret.ql
         qv_half[k] = self.qtg - (ql_half[k] + qi_half[k])
         alpha_half[k] = alpha_c(p_half_[k], temperature_half[k], self.qtg, qv_half[k])
     end
 
     @inbounds for k in face_indicies(Gr)
-        ret = eos(t_to_entropy_c, eos_first_guess_entropy, p_[k], self.qtg, self.sg)
+        ret = eos(p_[k], self.qtg, self.sg; t_to_prog = t_to_entropy_c, prog_to_t = eos_first_guess_entropy)
         temperature[k] = ret.T
         ql[k] = ret.ql
         qv[k] = self.qtg - (ql[k] + qi[k])

diff --git a/src/Turbulence_PrognosticTKE.jl b/src/Turbulence_PrognosticTKE.jl
@@ -1372,13 +1372,7 @@ function solve_updraft_scalars(self::EDMF_PrognosticTKE, GMV::GridMeanVariables)
                 end
 
                 # saturation adjustment
-                sa = eos(
-                    self.UpdThermo.t_to_prog_fp,
-                    self.UpdThermo.prog_to_t_fp,
-                    ref_state.p0_half[k],
-                    self.UpdVar.QT.new[i, k],
-                    self.UpdVar.H.new[i, k],
-                )
+                sa = eos(ref_state.p0_half[k], self.UpdVar.QT.new[i, k], self.UpdVar.H.new[i, k])
                 self.UpdVar.QL.new[i, k] = sa.ql
                 self.UpdVar.T.new[i, k] = sa.T
                 continue
@@ -1427,13 +1421,7 @@ function solve_updraft_scalars(self::EDMF_PrognosticTKE, GMV::GridMeanVariables)
             end
 
             # saturation adjustment
-            sa = eos(
-                self.UpdThermo.t_to_prog_fp,
-                self.UpdThermo.prog_to_t_fp,
-                ref_state.p0_half[k],
-                self.UpdVar.QT.new[i, k],
-                self.UpdVar.H.new[i, k],
-            )
+            sa = eos(ref_state.p0_half[k], self.UpdVar.QT.new[i, k], self.UpdVar.H.new[i, k])
             self.UpdVar.QL.new[i, k] = sa.ql
             self.UpdVar.T.new[i, k] = sa.T
         end

diff --git a/src/Variables.jl b/src/Variables.jl
@@ -192,7 +192,7 @@ function satadjust(self::GridMeanVariables)
         h = self.H.values[k]
         qt = self.QT.values[k]
         p0 = self.Ref.p0_half[k]
-        sa = eos(self.t_to_prog_fp, self.prog_to_t_fp, p0, qt, h)
+        sa = eos(p0, qt, h)
         self.QL.values[k] = sa.ql
         self.T.values[k] = sa.T
         qv = qt - sa.ql

diff --git a/src/thermodynamic_functions.jl b/src/thermodynamic_functions.jl
@@ -107,7 +107,7 @@ function eos_first_guess_entropy(H, pd, pv, qt)
     )
 end
 
-function eos(t_to_prog, prog_to_t, p0, qt, prog)
+function eos(p0, qt, prog; t_to_prog = t_to_thetali_c, prog_to_t = eos_first_guess_thetal)
     qv = qt
     ql = 0.0
 

diff --git a/src/types.jl b/src/types.jl
@@ -386,8 +386,6 @@ Base.@kwdef mutable struct GridMeanVariables{PS}
     QT::VariablePrognostic
     RH::VariablePrognostic
     H::VariablePrognostic
-    t_to_prog_fp::Function
-    prog_to_t_fp::Function
     QL::VariableDiagnostic
     T::VariableDiagnostic
     B::VariableDiagnostic
@@ -420,8 +418,6 @@ function GridMeanVariables(namelist, Gr::Grid, Ref::ReferenceState, param_set::P
     RH = VariablePrognostic(Gr, "half", "scalar", "sym", "RH", "%")
 
     H = VariablePrognostic(Gr, "half", "scalar", "sym", "thetal", "K")
-    t_to_prog_fp = t_to_thetali_c
-    prog_to_t_fp = eos_first_guess_thetal
 
     # Diagnostic Variables--same class as the prognostic variables, but we append to diagnostics list
     QL = VariableDiagnostic(Gr, "half", "scalar", "sym", "ql", "kg/kg")
@@ -478,8 +474,6 @@ function GridMeanVariables(namelist, Gr::Grid, Ref::ReferenceState, param_set::P
         QT,
         RH,
         H,
-        t_to_prog_fp,
-        prog_to_t_fp,
         QL,
         T,
         B,
@@ -503,8 +497,6 @@ struct UpdraftThermodynamics{A1, A2}
     Gr::Grid
     Ref::ReferenceState
     n_updraft::Int
-    t_to_prog_fp::Function
-    prog_to_t_fp::Function
     prec_source_h::A2
     prec_source_qt::A2
     prec_source_h_tot::A1
@@ -516,8 +508,6 @@ struct UpdraftThermodynamics{A1, A2}
         UpdVar::UpdraftVariables,
         Rain::RainVariables,
     )
-        t_to_prog_fp = t_to_thetali_c
-        prog_to_t_fp = eos_first_guess_thetal
 
         # rain source from each updraft from all sub-timesteps
         prec_source_h = center_field(Gr, n_updraft)
@@ -528,17 +518,7 @@ struct UpdraftThermodynamics{A1, A2}
         prec_source_qt_tot = center_field(Gr)
         A1 = typeof(prec_source_h_tot)
         A2 = typeof(prec_source_h)
-        return new{A1, A2}(
-            Gr,
-            Ref,
-            n_updraft,
-            t_to_prog_fp,
-            prog_to_t_fp,
-            prec_source_h,
-            prec_source_qt,
-            prec_source_h_tot,
-            prec_source_qt_tot,
-        )
+        return new{A1, A2}(Gr, Ref, n_updraft, prec_source_h, prec_source_qt, prec_source_h_tot, prec_source_qt_tot)
     end
 
 end
@@ -708,8 +688,6 @@ struct EnvironmentThermodynamics{A1}
     Ref::ReferenceState
     quadrature_order::Int
     quadrature_type::String
-    t_to_prog_fp::Function
-    prog_to_t_fp::Function
     qt_dry::A1
     th_dry::A1
     t_cloudy::A1
@@ -738,8 +716,6 @@ struct EnvironmentThermodynamics{A1}
         catch
             "gaussian"
         end
-        t_to_prog_fp = t_to_thetali_c
-        prog_to_t_fp = eos_first_guess_thetal
 
         qt_dry = center_field(Gr)
         th_dry = center_field(Gr)
@@ -761,8 +737,6 @@ struct EnvironmentThermodynamics{A1}
             Ref,
             quadrature_order,
             quadrature_type,
-            t_to_prog_fp,
-            prog_to_t_fp,
             qt_dry,
             th_dry,
             t_cloudy,