Merge pull request #379 from CliMA/ne/deps

Clean dependencies, reorder runtests
CliMA · Apr 19, 2024 · 0bebd22 · 0bebd22
2 parents e3a1d83 + 6d72646
commit 0bebd22
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -15,7 +15,6 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 [weakdeps]
 Cloudy = "9e3b23bb-e7cc-4b94-886c-65de2234ba87"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-EnsembleKalmanProcesses = "aa8a2aa5-91d8-4396-bcef-d4f2ec43552d"
 MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
 
 [extensions]
@@ -27,10 +26,9 @@ ClimaParams = "0.10.5"
 Cloudy = "0.4"
 DataFrames = "1.6"
 DocStringExtensions = "0.8, 0.9"
-EnsembleKalmanProcesses = "1.1.5"
 ForwardDiff = "0.10"
 MLJ = "0.20"
-QuadGK = "2.9.4"
+QuadGK = "2.9"
 RootSolvers = "0.3, 0.4"
 SpecialFunctions = "1, 2"
 Thermodynamics = "0.12.4"

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -9,7 +9,6 @@ DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"

diff --git a/test/Project.toml b/test/Project.toml
@@ -32,5 +32,6 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
 ClimaParams = "0.10.5"
+EnsembleKalmanProcesses = "1.1.5"
 KernelAbstractions = "0.9"
 Optim = "<1.9.3"
diff --git a/test/microphysics1M_tests.jl b/test/microphysics1M_tests.jl
@@ -9,7 +9,7 @@ import CloudMicrophysics.Parameters as CMP
 import CloudMicrophysics.Common as CMC
 import CloudMicrophysics.Microphysics1M as CM1
 
-@info "Microphysics Tests"
+@info "Microphysics 1M Tests"
 
 function test_microphysics1M(FT)
 

diff --git a/test/microphysics2M_tests.jl b/test/microphysics2M_tests.jl
@@ -8,7 +8,7 @@ import CloudMicrophysics.Parameters as CMP
 import CloudMicrophysics.Common as CMC
 import CloudMicrophysics.Microphysics2M as CM2
 
-@info "Microphysics Tests"
+@info "Microphysics 2M Tests"
 
 function test_microphysics2M(FT)
 

diff --git a/test/microphysicsflexible_tests.jl b/test/microphysicsflexible_tests.jl
@@ -6,7 +6,7 @@ import CloudMicrophysics.MicrophysicsFlexible as CMF
 import Cloudy.ParticleDistributions as CPD
 import Cloudy.KernelFunctions as CPK
 
-@info "Microphysics Tests"
+@info "MicrophysicsFlexible Tests"
 
 function test_microphysics_flexible(FT)
     # Thermodynamics and air properties parameters

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,11 +1,8 @@
 using ClimaParams
 
-include("performance_tests.jl")
 include("aerosol_activation_tests.jl")
-include("aerosol_activation_calibration.jl")
 include("heterogeneous_ice_nucleation_tests.jl")
 include("homogeneous_ice_nucleation_tests.jl")
-include("ice_nucleation_calibration.jl")
 include("microphysics0M_tests.jl")
 include("microphysics1M_tests.jl")
 include("microphysics2M_tests.jl")
@@ -16,3 +13,6 @@ include("nucleation_unit_tests.jl")
 include("precipitation_susceptibility_tests.jl")
 include("p3_tests.jl")
 include("aqua.jl")
+include("performance_tests.jl")
+include("aerosol_activation_calibration.jl")
+include("ice_nucleation_calibration.jl")