Merge pull request #456 from CliMA/ne/update_cp

Update to ClimaParams v0.10
CliMA · Feb 28, 2024 · 636ea41 · 636ea41
2 parents 2fa105e + b3bbd80
commit 636ea41
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/Project.toml b/Project.toml
@@ -12,13 +12,13 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 GaussQuadrature = "d54b0c1a-921d-58e0-8e36-89d8069c0969"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
-CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
+ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 
 [weakdeps]
-CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
+ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 
 [extensions]
-CreateParametersExt = "CLIMAParameters"
+CreateParametersExt = "ClimaParams"
 
 [compat]
 Adapt = "3.3"
@@ -30,4 +30,4 @@ GaussQuadrature = "0.5"
 Random = "1"
 StaticArrays = "1.4"
 julia = "1.7"
-CLIMAParameters = "0.9"
+ClimaParams = "0.10"
diff --git a/examples/Project.toml b/examples/Project.toml
@@ -2,7 +2,7 @@
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
-CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
+ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

diff --git a/ext/CreateParametersExt.jl b/ext/CreateParametersExt.jl
@@ -1,7 +1,7 @@
 module CreateParametersExt
 
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 
 RRTMGPParameters(::Type{FT}, overrides = NamedTuple()) where {FT <: AbstractFloat} =
     RRTMGPParameters(CP.create_toml_dict(FT), overrides)

diff --git a/gpuenv/Manifest.toml b/gpuenv/Manifest.toml
@@ -2,7 +2,7 @@
 
 julia_version = "1.10.0"
 manifest_format = "2.0"
-project_hash = "64fe974084ed75deefcd86f61ac1c5f7bba255ba"
+project_hash = "957d1ab0a9c2314f7c3216e54e479035f61cd467"
 
 [[deps.AbstractFFTs]]
 deps = ["LinearAlgebra"]
@@ -84,12 +84,6 @@ git-tree-sha1 = "ed2e76c1c3c43fd9d0cb9248674620b29d71f2d1"
 uuid = "179af706-886a-5703-950a-314cd64e0468"
 version = "0.1.2"
 
-[[deps.CLIMAParameters]]
-deps = ["DocStringExtensions", "TOML", "Test"]
-git-tree-sha1 = "10473c458cd10f3808a438492447ca10d4dde7d0"
-uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
-version = "0.9.0"
-
 [[deps.CUDA]]
 deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "Statistics", "UnsafeAtomicsLLVM"]
 git-tree-sha1 = "95ac638373ac40e29c1b6d086a3698f5026ff6a6"
@@ -128,6 +122,12 @@ git-tree-sha1 = "57c054ddd4280ca8e2b5915ef1cf1395c4edbc78"
 uuid = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 version = "0.5.6"
 
+[[deps.ClimaParams]]
+deps = ["DocStringExtensions", "TOML", "Test"]
+git-tree-sha1 = "f55c42259e444c29b2e7aeb6314ed8090a95f251"
+uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
+version = "0.10.0"
+
 [[deps.CodeTracking]]
 deps = ["InteractiveUtils", "UUIDs"]
 git-tree-sha1 = "c0216e792f518b39b22212127d4a84dc31e4e386"
@@ -693,11 +693,11 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"]
 path = ".."
 uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
-version = "0.12.0"
-weakdeps = ["CLIMAParameters"]
+version = "0.12.1"
+weakdeps = ["ClimaParams"]
 
     [deps.RRTMGP.extensions]
-    CreateParametersExt = "CLIMAParameters"
+    CreateParametersExt = "ClimaParams"
 
 [[deps.Random]]
 deps = ["SHA"]

diff --git a/gpuenv/Project.toml b/gpuenv/Project.toml
@@ -2,9 +2,9 @@
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
-CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
+ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

diff --git a/test/Project.toml b/test/Project.toml
@@ -1,7 +1,7 @@
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
-CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
+ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

diff --git a/test/all_sky_dyamond_gpu_benchmark.jl b/test/all_sky_dyamond_gpu_benchmark.jl
@@ -19,7 +19,7 @@ using RRTMGP.AngularDiscretizations
 using RRTMGP.RTE
 using RRTMGP.RTESolver
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 # overriding some parameters to match with RRTMGP FORTRAN code
 
 include("reference_files.jl")

diff --git a/test/all_sky_utils.jl b/test/all_sky_utils.jl
@@ -17,7 +17,7 @@ using RRTMGP.AngularDiscretizations
 using RRTMGP.RTE
 using RRTMGP.RTESolver
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 # overriding some parameters to match with RRTMGP FORTRAN code
 
 include("reference_files.jl")

diff --git a/test/clear_sky_utils.jl b/test/clear_sky_utils.jl
@@ -17,7 +17,7 @@ using RRTMGP.AngularDiscretizations
 using RRTMGP.RTE
 using RRTMGP.RTESolver
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 
 # overriding some parameters to match with RRTMGP FORTRAN code
 

diff --git a/test/gray_atm_utils.jl b/test/gray_atm_utils.jl
@@ -14,9 +14,9 @@ using RRTMGP.AtmosphericStates
 using RRTMGP.Sources
 using RRTMGP.BCs
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 
-# overriding CLIMAParameters as different precision is needed by RRTMGP
+# overriding ClimaParams as different precision is needed by RRTMGP
 
 #using Plots
 

diff --git a/test/rfmip_clear_sky_lw.jl b/test/rfmip_clear_sky_lw.jl
@@ -15,7 +15,7 @@ using RRTMGP.AngularDiscretizations
 using RRTMGP.RTE
 using RRTMGP.RTESolver
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 # overriding some parameters to match with RRTMGP FORTRAN code
 
 include("reference_files.jl")

diff --git a/test/rfmip_clear_sky_sw.jl b/test/rfmip_clear_sky_sw.jl
@@ -14,7 +14,7 @@ using RRTMGP.BCs
 using RRTMGP.RTE
 using RRTMGP.RTESolver
 import RRTMGP.Parameters.RRTMGPParameters
-import CLIMAParameters as CP
+import ClimaParams as CP
 # overriding some parameters to match with RRTMGP FORTRAN code
 
 include("reference_files.jl")