Merge branch 'al/AIDA_HOM_UKI' of https://github.com/CliMA/CloudMicro…

…physics.jl into al/AIDA_HOM_UKI
CliMA · Oct 14, 2024 · 902d913 · 902d913
2 parents 03a4493 + 98bdc5a
commit 902d913
Show file tree

Hide file tree

Showing 39 changed files with 969 additions and 1,030 deletions.
diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
@@ -1,7 +1,7 @@
 agents:
   queue: new-central
   slurm_mem: 8G
-  modules: climacommon/2024_05_27
+  modules: climacommon/2024_10_09
 
 env:
   OPENBLAS_NUM_THREADS: 1

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 agents:
   queue: new-central
   slurm_mem: 8G
-  modules: climacommon/2024_05_27
+  modules: climacommon/2024_10_09
 
 env:
   OPENBLAS_NUM_THREADS: 1

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,19 +27,16 @@ jobs:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
-        arch:
-          - x64
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/cache@v1
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/cache@v2
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           file: lcov.info
           token: ${{secrets.CODECOV_TOKEN}}
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -7,6 +7,7 @@ Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
+Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

diff --git a/docs/bibliography.bib b/docs/bibliography.bib
@@ -463,7 +463,7 @@ @article{MitchellHeymsfield2005
   year = {2005},
   volume = {62},
   number = {5},
-  doi = {https://doi.org/10.1175/JAS3413.1},
+  doi = {10.1175/JAS3413.1},
   pages= {1637--1644}
 }
 
@@ -732,7 +732,7 @@ @article{Liu1997
   volume = {123},
   number = {542},
   pages = {1789-1795},
-  doi = {https://doi.org/10.1002/qj.49712354220},
+  doi = {10.1002/qj.49712354220},
   year = {1997}
 }
 

diff --git a/docs/make.jl b/docs/make.jl
@@ -38,6 +38,7 @@ Parameterizations = [
     "1-moment precipitation microphysics" => "Microphysics1M.md",
     "2-moment precipitation microphysics" => "Microphysics2M.md",
     "P3 Scheme" => "P3Scheme.md",
+    "Terminal Velocity" => "TerminalVelocity.md",
     "Non-equilibrium cloud formation" => "MicrophysicsNonEq.md",
     "Smooth transition at thresholds" => "ThresholdsTransition.md",
     "Aerosol activation" => "AerosolActivation.md",

diff --git a/docs/src/API.md b/docs/src/API.md
@@ -10,6 +10,7 @@ MicrophysicsNonEq
 MicrophysicsNonEq.τ_relax
 MicrophysicsNonEq.conv_q_vap_to_q_liq_ice
 MicrophysicsNonEq.conv_q_vap_to_q_liq_ice_MM2015
+MicrophysicsNonEq.terminal_velocity
 ```
 
 # 0-moment precipitation microphysics
@@ -131,9 +132,11 @@ Common.H2SO4_soln_saturation_vapor_pressure
 Common.a_w_xT
 Common.a_w_eT
 Common.a_w_ice
-Common.Chen2022_vel_add
-Common.Chen2022_vel_coeffs_small
-Common.Chen2022_vel_coeffs_large
+Common.Chen2022_monodisperse_pdf
+Common.Chen2022_exponential_pdf
+Common.Chen2022_vel_coeffs_B1
+Common.Chen2022_vel_coeffs_B2
+Common.Chen2022_vel_coeffs_B4
 ```
 
 # Parameters