mereg with main

CliMA · Feb 15, 2024 · ff72717 · ff72717
2 parents a3fe665 + 9bccc3f
commit ff72717
Show file tree

Hide file tree

Showing 9 changed files with 606 additions and 20 deletions.
diff --git a/Project.toml b/Project.toml
@@ -11,6 +11,21 @@ RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
+[weakdeps]
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+DataFramesMeta = "1313f7d8-7da2-5740-9ea0-a2ca25f37964"
+Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
+Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
+GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9"
+KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
+MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
+MLJFlux = "094fc8d1-fd35-5302-93ea-dabda2abf845"
+MLJModels = "d491faf4-2d78-11e9-2867-c94bc002c0b7"
+StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+
+[extensions]
+EmulatorModelsExt = "DataFrames"
+
 [compat]
 CLIMAParameters = "0.9"
 DocStringExtensions = "0.8, 0.9"

diff --git a/docs/src/plots/ARGdata.jl b/docs/src/plots/ARGdata.jl
@@ -15,6 +15,8 @@ Fig1_y_obs = [
     0.34946619217081853,
     0.17580071174377226,
 ]
+Fig1_x_PySDM = [100.0, 1325.0, 2550.0, 3775.0, 5000.0]
+Fig1_y_PySDM = [0.76, 0.5, 0.38, 0.3, 0.26]
 Fig1_x_param = [
     0,
     12.891344383057117,
@@ -129,6 +131,8 @@ Fig2a_y_obs = [
     0.5986159169550174,
     0.4975778546712803,
 ]
+Fig2a_x_PySDM = [100.0, 1325.0, 2550.0, 3775.0, 5000.0]
+Fig2a_y_PySDM = [0.8, 0.68, 0.62, 0.6, 0.56]
 Fig2a_x_param = [
     12.567324955116646,
     44.88330341113101,
@@ -191,6 +195,8 @@ Fig2b_y_obs = [
     0.1949367088607595,
     0.1329113924050633,
 ]
+Fig2b_x_PySDM = [100.0, 1325.0, 2550.0, 3775.0, 5000.0]
+Fig2b_y_PySDM = [0.38, 0.26, 0.22, 0.2, 0.18]
 Fig2b_x_param = [
     78.80910683012257,
     113.83537653239921,
@@ -233,6 +239,8 @@ Fig3a_x_obs = [
     1.0034965034965033,
 ]
 Fig3a_y_obs = [0.7586666666666667, 0.7453333333333334, 0.732, 0.72, 0.712]
+Fig3a_x_PySDM = [0.1, 0.325, 0.55, 0.775, 1.0]
+Fig3a_y_PySDM = [0.8, 0.78, 0.76, 0.76, 0.76]
 Fig3a_x_param = [
     0.10069930069930072,
     0.14405594405594407,
@@ -269,6 +277,8 @@ Fig3b_y_obs = [
     0.6734982332155477,
     0.7074204946996467,
 ]
+Fig3b_x_PySDM = [0.1, 0.325, 0.55, 0.775, 1.0]
+Fig3b_y_PySDM = [0.38, 0.58, 0.66, 0.72, 0.76]
 Fig3b_x_param = [
     0.10270270270270272,
     0.12000000000000002,
@@ -321,6 +331,8 @@ Fig4a_y_obs = [
     0.4013333333333333,
     0.12266666666666667,
 ]
+Fig4a_x_PySDM = [0.01, 0.02659148, 0.07071068, 0.18803015, 0.5]
+Fig4a_y_PySDM = [0.82, 0.78, 0.74, 0.58, 0.18]
 Fig4a_x_param = [
     0.010398558176237407,
     0.011922822170487846,
@@ -379,6 +391,8 @@ Fig4b_y_obs = [
     0.9805194805194806,
     0.9844155844155846,
 ]
+Fig4b_x_PySDM = [0.01, 0.02659148, 0.07071068, 0.18803015, 0.5]
+Fig4b_y_PySDM = [0.08, 0.46, 0.86, 0.98, 1.0]
 Fig4b_x_param = [
     0.010822678662544178,
     0.012760436250146357,
@@ -441,6 +455,8 @@ Fig5a_y_obs = [
     0.9223427331887204,
     0.975704989154013,
 ]
+Fig5a_x_PySDM = [0.01, 0.04728708, 0.2236068, 1.05737126, 5.0]
+Fig5a_y_PySDM = [0.12, 0.42, 0.68, 0.88, 0.98]
 Fig5a_x_param = [
     0.012498045610787637,
     0.0206913808111479,
@@ -493,6 +509,8 @@ Fig5b_y_obs = [
     0.6230508474576271,
     0.7993220338983051,
 ]
+Fig5b_x_PySDM = [0.01, 0.04728708, 0.2236068, 1.05737126, 5.0]
+Fig5b_y_PySDM = [0.02, 0.1, 0.26, 0.54, 0.84]
 Fig5b_x_param = [
     0.011331300304886677,
     0.013602279391211175,

diff --git a/docs/src/plots/ARGplots.jl b/docs/src/plots/ARGplots.jl
@@ -1,15 +1,14 @@
-import Plots
+import Plots as PL
 
 import CloudMicrophysics
-import CLIMAParameters
-import Thermodynamics
-
-const PL = Plots
-const AM = CloudMicrophysics.AerosolModel
-const AA = CloudMicrophysics.AerosolActivation
-const CP = CLIMAParameters
-const CMP = CloudMicrophysics.Parameters
-const TD = Thermodynamics
+import CloudMicrophysics:
+    AerosolModel as AM,
+    AerosolActivation as AA,
+    Parameters as CMP,
+    CommonTypes as CMT
+import CLIMAParameters as CP
+import Thermodynamics as TD
+import DataFrames as DF
 
 FT = Float64
 
@@ -42,6 +41,16 @@ M_insol = 0.044       # molar mass of insol
 ρ_insol = 1770.0      # density of insol
 κ_insol = 0.0         # hygroscopicity of insol
 
+# Schemes
+ARG_scheme = CMT.ARG2000Type()
+#ML_scheme = AA.MLEmulatedAerosolActivation(
+#    joinpath(
+#        pkgdir(CloudMicrophysics),
+#        "aerosol_activation_emulators",
+#        "2modal_nn_machine_naive.jls",
+#    ),
+#)
+
 function mass2vol(mass_mixing_ratios)
     if length(mass_mixing_ratios) == 2
         densities = (sulfate.ρ, ρ_insol)
@@ -56,7 +65,7 @@ end
 
 # Abdul-Razzak and Ghan 2000
 # https://doi.org/10.1029/1999JD901161
-function make_ARG_figX(X)
+function make_ARG_figX(X, scheme = ARG_scheme)
     p1 = PL.plot()
     p2 = PL.plot()
 
@@ -181,11 +190,15 @@ function make_ARG_figX(X)
 
             x1_obs = Fig1_x_obs
             y1_obs = Fig1_y_obs
+            x1_PySDM = Fig1_x_PySDM
+            y1_PySDM = Fig1_y_PySDM
             x1_param = Fig1_x_param
             y1_param = Fig1_y_param
 
             x2_obs = Fig1_x_obs
             y2_obs = Fig1_y_obs
+            x2_PySDM = Fig1_x_PySDM
+            y2_PySDM = Fig1_y_PySDM
             x2_param = Fig1_x_param
             y2_param = Fig1_y_param
 
@@ -237,11 +250,15 @@ function make_ARG_figX(X)
 
             x1_obs = Fig2a_x_obs
             y1_obs = Fig2a_y_obs
+            x1_PySDM = Fig2a_x_PySDM
+            y1_PySDM = Fig2a_y_PySDM
             x1_param = Fig2a_x_param
             y1_param = Fig2a_y_param
 
             x2_obs = Fig2b_x_obs
             y2_obs = Fig2b_y_obs
+            x2_PySDM = Fig2b_x_PySDM
+            y2_PySDM = Fig2b_y_PySDM
             x2_param = Fig2b_x_param
             y2_param = Fig2b_y_param
 
@@ -295,11 +312,15 @@ function make_ARG_figX(X)
 
             x1_obs = Fig3a_x_obs
             y1_obs = Fig3a_y_obs
+            x1_PySDM = Fig3a_x_PySDM
+            y1_PySDM = Fig3a_y_PySDM
             x1_param = Fig3a_x_param
             y1_param = Fig3a_y_param
 
             x2_obs = Fig3b_x_obs
             y2_obs = Fig3b_y_obs
+            x2_PySDM = Fig3b_x_PySDM
+            y2_PySDM = Fig3b_y_PySDM
             x2_param = Fig3b_x_param
             y2_param = Fig3b_y_param
 
@@ -350,11 +371,15 @@ function make_ARG_figX(X)
 
             x1_obs = Fig4a_x_obs
             y1_obs = Fig4a_y_obs
+            x1_PySDM = Fig4a_x_PySDM
+            y1_PySDM = Fig4a_y_PySDM
             x1_param = Fig4a_x_param
             y1_param = Fig4a_y_param
 
             x2_obs = Fig4b_x_obs
             y2_obs = Fig4b_y_obs
+            x2_PySDM = Fig4b_x_PySDM
+            y2_PySDM = Fig4b_y_PySDM
             x2_param = Fig4b_x_param
             y2_param = Fig4b_y_param
 
@@ -407,11 +432,15 @@ function make_ARG_figX(X)
 
             x1_obs = Fig5a_x_obs
             y1_obs = Fig5a_y_obs
+            x1_PySDM = Fig5a_x_PySDM
+            y1_PySDM = Fig5a_y_PySDM
             x1_param = Fig5a_x_param
             y1_param = Fig5a_y_param
 
             x2_obs = Fig5b_x_obs
             y2_obs = Fig5b_y_obs
+            x2_PySDM = Fig5b_x_PySDM
+            y2_PySDM = Fig5b_y_PySDM
             x2_param = Fig5b_x_param
             y2_param = Fig5b_y_param
 
@@ -454,6 +483,14 @@ function make_ARG_figX(X)
             )
             PL.scatter!(p2, x2_obs, y2_obs, markercolor = :black)
             PL.plot!(p2, x2_param, y2_param, linecolor = :black)
+            PL.scatter!(
+                p1,
+                x1_PySDM,
+                y1_PySDM,
+                markercolor = :green,
+                label = "PySDM observations",
+            )
+            PL.scatter!(p2, x2_PySDM, y2_PySDM, markercolor = :green)
         end
     end