small changes

CliMA · Jan 31, 2024 · 38eb16c · 38eb16c
1 parent 12b9ad6
commit 38eb16c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/parcel/Deposition_Nucleation.jl b/parcel/Deposition_Nucleation.jl
@@ -41,14 +41,14 @@ Sₗ = FT(e / eₛ)
 IC = [Sₗ, p₀, T₀, qᵥ, qₗ, qᵢ, Nₐ, Nₗ, Nᵢ, x_sulph]
 
 # Simulation parameters passed into ODE solver
-r_nuc = FT(0.5 * 1.e-4 * 1e-6)             # assumed size of nucleated particles
-w = FT(0.7)                                # updraft speed
+r_nuc = FT(5e-11)             # assumed size of nucleated particles
+w = FT(3.5 * 1e-2)                                # updraft speed
 α_m = FT(0.5)                              # accomodation coefficient
 const_dt = FT(0.1)                           # model timestep
-t_max = FT(60)
+t_max = FT(100)
 aerosol_1 = CMP.ArizonaTestDust(FT)             # aersol type for DustDeposition
-aerosol_2 = CMP.Kaolinite(FT)              # aersol type for DepositionNucleation
-ice_nucleation_modes_list = [["DustDeposition"], ["DepositionNucleation"]]
+aerosol_2 = CMP.Feldspar(FT)              # aersol type for DepositionNucleation
+ice_nucleation_modes_list = [["DustDeposition"], ["ActivityBasedDeposition"]]
 growth_modes = ["Deposition"]
 droplet_size_distribution_list = [["Monodisperse"]]
 

diff --git a/parcel/parcel.jl b/parcel/parcel.jl
@@ -79,21 +79,18 @@ function parcel_model(dY, Y, p, t)
             T,
         )
         dN_act_dt_depo = max(FT(0), AF * N_aer - N_ice) / const_dt
-        dqi_dt_new_depo = dN_act_dt_depo * 4 / 3 * π * r_nuc^3 * ρ_ice / ρ_air
+        dqi_dt_new_depo = dN_act_dt_depo * 4 / 3 * FT(π) * r_nuc^3 * ρ_ice / ρ_air
     end
-    if "DepositionNucleation" in ice_nucleation_modes
+    if "ActivityBasedDeposition" in ice_nucleation_modes
         Δa_w = CMO.a_w_eT(tps, e, T) - CMO.a_w_ice(tps, T)
         J_deposition = CMI_het.deposition_J(aerosol, Δa_w)
         if "Monodisperse" in droplet_size_distribution
             A_aer = 4 * FT(π) * r_nuc^2
             dN_act_dt_depo = max(FT(0), J_deposition * N_aer * A_aer)
             dqi_dt_new_depo = dN_act_dt_depo * 4 / 3 * FT(π) * r_nuc^3 * ρ_ice / ρ_air
         end
-        if "Gamma" in droplet_size_distribution
-            A_aer = 4 * FT(π) * r_nuc^2
-            dN_act_dt_depo = max(FT(0), J_deposition * N_aer * A_aer)
-            dqi_dt_new_depo = dN_act_dt_depo * 4 / 3 * FT(π) * r_nuc^3 * ρ_ice / ρ_air
-        end
+        println("N_aer = ", N_aer)
+        println("A_aer = ", A_aer)
         println("J_deposition = ", J_deposition)
     end