no more ts but gpu error

Author: szy21

src/cache/precomputed_quantities.jl

@@ -43,7 +43,6 @@ function implicit_precomputed_quantities(Y, atmos)
         ᶠu³ = similar(Y.f, CT3{FT}),
         ᶠu = similar(Y.f, CT123{FT}),
         ᶜK = similar(Y.c, FT),
-        ᶜts = similar(Y.c, TST),
         ᶜT = similar(Y.c, FT),
         ᶜq_tot_safe = similar(Y.c, FT),
         ᶜq_liq_rai = similar(Y.c, FT),
@@ -439,13 +438,6 @@ function thermo_vars(::NonEquilMoistModel, ::Any, ᶜY, K, Φ)
     return (; e_int, q_pt = TD.PhasePartition(q_pt_args...))
 end
 
-ts_gs(thermo_params, moisture_model, microphysics_model, ᶜY, K, Φ, ρ) =
-    thermo_state(
-        thermo_params;
-        thermo_vars(moisture_model, microphysics_model, ᶜY, K, Φ)...,
-        ρ,
-    )
-
 """
     T_gs(thermo_params, moisture_model, microphysics_model, ᶜY, K, Φ, ρ)
 
@@ -656,7 +648,7 @@ quantities are updated.
 NVTX.@annotate function set_implicit_precomputed_quantities!(Y, p, t)
     (; turbconv_model, moisture_model, microphysics_model) = p.atmos
     (; ᶜΦ) = p.core
-    (; ᶜu, ᶠu³, ᶠu, ᶜK, ᶜts, ᶜT, ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno, ᶜh_tot, ᶜp) = p.precomputed
+    (; ᶜu, ᶠu³, ᶠu, ᶜK, ᶜT, ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno, ᶜh_tot, ᶜp) = p.precomputed
     ᶠuₕ³ = p.scratch.ᶠtemp_CT3
     n = n_mass_flux_subdomains(turbconv_model)
     thermo_params = CAP.thermodynamics_params(p.params)
@@ -688,7 +680,6 @@ NVTX.@annotate function set_implicit_precomputed_quantities!(Y, p, t)
         # @. ᶜK += Y.c.ρtke / Y.c.ρ
         # TODO: We should think more about these increments before we use them.
     end
-    @. ᶜts = ts_gs(thermo_args..., Y.c, ᶜK, ᶜΦ, Y.c.ρ)
     @. ᶜT = T_gs(thermo_args..., Y.c, ᶜK, ᶜΦ, Y.c.ρ)
     @. ᶜq_tot_safe = q_tot_safe_gs(thermo_args..., Y.c, ᶜK, ᶜΦ, Y.c.ρ)
     @. ᶜq_liq_rai = q_liq_rai_gs(thermo_args..., Y.c, ᶜK, ᶜΦ, Y.c.ρ)

src/prognostic_equations/forcing/external_forcing.jl

@@ -318,7 +318,7 @@ function external_forcing_tendency!(
     # horizontal advection, vertical fluctuation, nudging, subsidence (need to add),
     (; params) = p
     thermo_params = CAP.thermodynamics_params(params)
-    (; ᶜts, ᶜT) = p.precomputed
+    (; ᶜT) = p.precomputed
     (;
         ᶜdTdt_fluc,
         ᶜdqtdt_fluc,
@@ -560,7 +560,7 @@ function external_forcing_tendency!(Yₜ, Y, p, t, ::ISDACForcing)
     FT = Spaces.undertype(axes(Y.c))
     (; params) = p
     thermo_params = CAP.thermodynamics_params(params)
-    (; ᶜts, ᶜp, ᶜT) = p.precomputed
+    (; ᶜp, ᶜT) = p.precomputed
 
     ᶜinv_τ_scalar = APL.ISDAC_inv_τ_scalar(FT)  # s⁻¹
     ᶜinv_τ_wind = APL.ISDAC_inv_τ_wind(FT)  # s⁻¹

src/prognostic_equations/implicit/manual_sparse_jacobian.jl

@@ -428,7 +428,8 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
     (; matrix) = cache
     (; params) = p
     (; ᶜΦ, ᶠgradᵥ_ᶜΦ) = p.core
-    (; ᶠu³, ᶜK, ᶜts, ᶜp, ᶜT) = p.precomputed
+    (; ᶜu, ᶠu³, ᶜK, ᶜp, ᶜT) = p.precomputed
+    (; ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno, ᶜh_tot) = p.precomputed
     (;
         ∂ᶜK_∂ᶜuₕ,
         ∂ᶜK_∂ᶠu₃,
@@ -466,11 +467,7 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
     Δcv_i = FT(CAP.cp_i(params) - CAP.cv_v(params))
     e_int_v0 = FT(CAP.e_int_v0(params))
     e_int_s0 = FT(CAP.e_int_i0(params)) + e_int_v0
-    # This term appears a few times in the Jacobian, and is technically
-    # minus ∂e_int_∂q_tot
-    ∂e_int_∂q_tot = T_0 * (Δcv_v - R_d) - e_int_v0
     thermo_params = CAP.thermodynamics_params(params)
-    (; ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno, ᶜh_tot) = p.precomputed
 
     ᶜρ = Y.c.ρ
     ᶜuₕ = Y.c.uₕ
@@ -483,7 +480,6 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
     zmax = z_max(axes(Y.f))
 
     ᶜkappa_m = p.scratch.ᶜtemp_scalar
-    (; ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno) = p.precomputed
     @. ᶜkappa_m =
         TD.gas_constant_air(thermo_params, ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno) /
         TD.cv_m(thermo_params, ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno)
@@ -660,8 +656,7 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
                     p.scratch.ᶜbidiagonal_adjoint_matrix_c3 ⋅
                     p.scratch.ᶠband_matrix_wvec ⋅
                     DiagonalMatrixRow(
-                        e_int_func(thermo_params, p.precomputed.ᶜts) + ᶜΦ +
-                        $(Kin(ᶜwₚ, p.precomputed.ᶜu)),
+                        e_int_func(thermo_params, ᶜT) + ᶜΦ + $(Kin(ᶜwₚ, ᶜu)),
                     )
             end
         end

src/prognostic_equations/remaining_tendency.jl

@@ -144,7 +144,7 @@ NVTX.@annotate function additional_tendency!(Yₜ, Y, p, t)
     (; ls_adv, scm_coriolis) = p.atmos
     (; params) = p
     thermo_params = CAP.thermodynamics_params(params)
-    (; ᶜp, sfc_conditions, ᶜK, ᶜts, ᶜT, ᶜh_tot, ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno) = p.precomputed
+    (; ᶜp, sfc_conditions, ᶜK, ᶜT, ᶜh_tot, ᶜq_tot_safe, ᶜq_liq_rai, ᶜq_ice_sno) = p.precomputed
 
     vst_uₕ = viscous_sponge_tendency_uₕ(ᶜuₕ, viscous_sponge)
     vst_u₃ = viscous_sponge_tendency_u₃(ᶠu₃, viscous_sponge)