works without the type

CliMA · Feb 13, 2024 · afde25c · afde25c
1 parent 77e6196
commit afde25c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/Project.toml b/Project.toml
@@ -12,7 +12,7 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
-CLIMAParameters = "0.9"
+CLIMAParameters = "0.8"
 DocStringExtensions = "0.8, 0.9"
 ForwardDiff = "0.10"
 RootSolvers = "0.3, 0.4"

diff --git a/src/Common.jl b/src/Common.jl
@@ -218,7 +218,7 @@ function Chen2022_vel_coeffs(
     ρ::FT,
 ) where {FT}
 
-    (; ρ0, ai, a3_pow, bi, b_ρ, ci) = velo_scheme
+    (; ρ0, a, a3_pow, b, b_ρ, c) = velo_scheme
 
     q = exp(ρ0 * ρ)
     ai = (a[1] * q, a[2] * q, a[3] * q * ρ^a3_pow)

diff --git a/src/parameters/TerminalVelocity.jl b/src/parameters/TerminalVelocity.jl
@@ -143,12 +143,12 @@ DOI: 10.1016/j.atmosres.2022.106171
 $(DocStringExtensions.FIELDS)
 """
 struct Chen2022VelTypeSnowIce{FT} <: ParametersType{FT}
-    As::Array{FT}
-    Bs::Array{FT}
-    Cs::Array{FT}
-    Es::Array{FT}
-    Fs::Array{FT}
-    Gs::Array{FT}
+    As
+    Bs
+    Cs
+    Es
+    Fs
+    Gs
     "density of cloud ice [kg/m3]"
     ρᵢ::FT
 end
@@ -189,11 +189,11 @@ $(DocStringExtensions.FIELDS)
 """
 Base.@kwdef struct Chen2022VelTypeRain{FT} <: ParametersType{FT}
     ρ0::FT
-    a::Array{FT}
+    a
     a3_pow::FT
-    b::Array{FT}
+    b
     b_ρ::FT
-    c::Array{FT}
+    c
 end
 
 Chen2022VelTypeRain(::Type{FT}) where {FT <: AbstractFloat} =

diff --git a/test/Project.toml b/test/Project.toml
@@ -12,5 +12,5 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
-CLIMAParameters = "0.9"
+CLIMAParameters = "0.8"
 KernelAbstractions = "0.9"
diff --git a/test/aerosol_activation_tests.jl b/test/aerosol_activation_tests.jl
@@ -1,5 +1,6 @@
 import Test as TT
 
+import CLIMAParameters
 import CloudMicrophysics as CM
 import Thermodynamics as TD
 

diff --git a/test/common_functions_tests.jl b/test/common_functions_tests.jl
@@ -1,5 +1,6 @@
 import Test as TT
 
+import CLIMAParameters
 import Thermodynamics as TD
 import CloudMicrophysics as CM
 import CloudMicrophysics.Common as CO

diff --git a/test/microphysics0M_tests.jl b/test/microphysics0M_tests.jl
@@ -1,5 +1,6 @@
 import Test as TT
 
+import CLIMAParameters
 import Thermodynamics as TD
 
 import CloudMicrophysics.Parameters as CMP

diff --git a/test/microphysics_noneq_tests.jl b/test/microphysics_noneq_tests.jl
@@ -1,5 +1,6 @@
 import Test as TT
 
+import CLIMAParameters
 import Thermodynamics as TD
 
 import CloudMicrophysics.Parameters as CMP

diff --git a/test/p3_tests.jl b/test/p3_tests.jl
@@ -1,4 +1,5 @@
 import Test as TT
+import CLIMAParameters
 import CloudMicrophysics as CM
 import CloudMicrophysics.P3Scheme as P3
 import CloudMicrophysics.Parameters as CMP

diff --git a/test/performance_tests.jl b/test/performance_tests.jl
@@ -1,6 +1,7 @@
 import Test as TT
 import BenchmarkTools as BT
 
+import CLIMAParameters
 import Thermodynamics as TD
 
 import CloudMicrophysics.Common as CO