Merge pull request #4000 from CliMA/zs/implicit_1m_entr

make entrainment implicit in 1m

Author: szy21

config/model_configs/prognostic_edmfx_rico_implicit_column.yml

@@ -5,6 +5,8 @@ surface_setup: "Rico"
 turbconv: "prognostic_edmfx"
 implicit_diffusion: true
 implicit_sgs_advection: true
+implicit_sgs_entr_detr: true
+implicit_nh_pressure: true
 approximate_linear_solve_iters: 2
 max_newton_iters_ode: 3
 edmfx_upwinding: first_order
@@ -26,8 +28,8 @@ y_elem: 2
 z_elem: 100
 z_stretch: false
 perturb_initstate: false
-dt: "60secs"
-t_end: "6hours"
+dt: "50secs"
+t_end: "8hours"
 dt_save_state_to_disk: "60mins"
 toml: [toml/prognostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 100]

src/prognostic_equations/implicit/manual_sparse_jacobian.jl

@@ -997,6 +997,26 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
                         (ᶠinterp(ᶜentrʲs.:(1) + ᶜturb_entrʲs.:(1))) *
                         (one_C3xACT3,),
                     ))
+                if p.atmos.moisture_model isa NonEquilMoistModel && (
+                    p.atmos.microphysics_model isa Microphysics1Moment ||
+                    p.atmos.microphysics_model isa Microphysics2Moment
+                )
+                    sgs_microphysics_tracers = (
+                        (@name(c.sgsʲs.:(1).q_liq)),
+                        (@name(c.sgsʲs.:(1).q_ice)),
+                        (@name(c.sgsʲs.:(1).q_rai)),
+                        (@name(c.sgsʲs.:(1).q_sno)),
+                    )
+                    MatrixFields.unrolled_foreach(
+                        sgs_microphysics_tracers,
+                    ) do (qʲ_name)
+                        MatrixFields.has_field(Y, qʲ_name) || return
+
+                        ∂ᶜqʲ_err_∂ᶜqʲ = matrix[qʲ_name, qʲ_name]
+                        @. ∂ᶜqʲ_err_∂ᶜqʲ -=
+                            dtγ * DiagonalMatrixRow(ᶜentrʲs.:(1) + ᶜturb_entrʲs.:(1))
+                    end
+                end
             end
 
             # non-hydrostatic pressure drag