checking that Ni is not larger than Nl

CliMA · Feb 23, 2024 · 3b36e5f · 3b36e5f
1 parent 2ee1354
commit 3b36e5f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/parcel/parcel.jl b/parcel/parcel.jl
@@ -115,13 +115,13 @@ function parcel_model(dY, Y, p, t)
     if "ImmersionFreezing" in ice_nucleation_modes
         if immersion_freezing_type == "FrostenbergMean"
             INPC = exp(CMI_het.INP_concentration_mean(T))
-            dN_act_dt_immersion = max(FT(0), INPC - N_ice)
+            dN_act_dt_immersion = min(N_liq, max(FT(0), INPC - N_ice))
             dqi_dt_new_immers = dN_act_dt_immersion * q_liq / N_liq
         elseif immersion_freezing_type == "Frostenberg"
             if mod(t, drawing_interval) == 0
                 μ = CMI_het.INP_concentration_mean(T)
                 INPC = exp(rand(Normal(μ, ip_frostenberg.σ)))
-                dN_act_dt_immersion = max(FT(0), INPC - N_ice)
+                dN_act_dt_immersion = min(N_liq, max(FT(0), INPC - N_ice))
                 dqi_dt_new_immers = dN_act_dt_immersion * q_liq / N_liq
             end
         elseif immersion_freezing_type == "ABIFM"
@@ -332,7 +332,7 @@ function run_parcel(IC, t_0, t_end, p)
             print("\n    Immersion freezing Frostenberg mean")
         elseif immersion_freezing_type == "Frostenberg"
             print("\n    Immersion freezing Frostenberg")
-            timestepper = ODE.Euler()
+            #timestepper = ODE.Euler()
         end
     end
     if "HomogeneousFreezing" in ice_nucleation_modes