diff --git a/Project.toml b/Project.toml index 54c8f48f..caed5721 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Thermodynamics" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" authors = ["Climate Modeling Alliance"] -version = "0.12.3" +version = "0.12.4" [deps] DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" @@ -9,18 +9,18 @@ KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" # Required for backwards compatibility with Julia <1.9 -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] +ClimaParams = "0.10" DocStringExtensions = "0.8.1, 0.9" KernelAbstractions = "0.9" Random = "1" RootSolvers = "0.4" julia = "1.6" -CLIMAParameters = "0.9" diff --git a/docs/Project.toml b/docs/Project.toml index bbb4ad94..38eeb2a3 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,5 +1,5 @@ [deps] -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244" ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04" diff --git a/docs/src/Clausius_Clapeyron.jl b/docs/src/Clausius_Clapeyron.jl index b4c08cc7..b8b087f5 100644 --- a/docs/src/Clausius_Clapeyron.jl +++ b/docs/src/Clausius_Clapeyron.jl @@ -1,6 +1,7 @@ import ForwardDiff +import ClimaParams as CP + import Thermodynamics as TD -import CLIMAParameters as CP using Thermodynamics.TestedProfiles import Thermodynamics.Parameters as TP diff --git a/docs/src/TemperatureProfiles.md b/docs/src/TemperatureProfiles.md index 6512f82c..b3a32580 100644 --- a/docs/src/TemperatureProfiles.md +++ b/docs/src/TemperatureProfiles.md @@ -10,7 +10,7 @@ Several temperature profiles are available in `Thermodynamics.TemperatureProfile Using a profile involves passing two arguments: - - `param_set` a parameter set, from [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) + - `param_set` a parameter set, from [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) - `z` altitude to one of the temperature profile constructors. @@ -20,7 +20,7 @@ to one of the temperature profile constructors. ```@example import Thermodynamics as TD import Plots -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64 param_set = TP.ThermodynamicsParameters(FT) @@ -44,7 +44,7 @@ Plots.savefig("isothermal.svg"); ```@example import Thermodynamics as TD import Plots -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64 param_set = TP.ThermodynamicsParameters(FT) @@ -67,7 +67,7 @@ Plots.savefig("decaying.svg") ```@example import Thermodynamics as TD import Plots -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64 param_set = TP.ThermodynamicsParameters(FT) diff --git a/docs/src/TestedProfiles.md b/docs/src/TestedProfiles.md index 6aacb150..15f1cbcc 100644 --- a/docs/src/TestedProfiles.md +++ b/docs/src/TestedProfiles.md @@ -7,7 +7,7 @@ Thermodynamics.jl is tested using a set of profiles specified in `src/TestedProf ```@example import Thermodynamics as TD import Plots -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64 param_set = TP.ThermodynamicsParameters(FT) @@ -26,7 +26,7 @@ Plots.savefig("tested_profiles_dry.svg"); ```@example import Thermodynamics as TD import Plots -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64 param_set = TP.ThermodynamicsParameters(FT) diff --git a/docs/src/saturation_adjustment.jl b/docs/src/saturation_adjustment.jl index 82f3af9f..6de338b0 100644 --- a/docs/src/saturation_adjustment.jl +++ b/docs/src/saturation_adjustment.jl @@ -3,7 +3,7 @@ import Plots import Thermodynamics as TD import Thermodynamics.Parameters as TP -import CLIMAParameters as CP +import ClimaParams as CP FT = Float64 diff --git a/ext/CreateParametersExt.jl b/ext/CreateParametersExt.jl index d1405531..8547e113 100644 --- a/ext/CreateParametersExt.jl +++ b/ext/CreateParametersExt.jl @@ -1,7 +1,7 @@ module CreateParametersExt import Thermodynamics.Parameters.ThermodynamicsParameters -import CLIMAParameters as CP +import ClimaParams as CP ThermodynamicsParameters(::Type{FT}) where {FT <: Real} = ThermodynamicsParameters(CP.create_toml_dict(FT)) diff --git a/gpuenv/Project.toml b/gpuenv/Project.toml index 6ba34545..af85f154 100644 --- a/gpuenv/Project.toml +++ b/gpuenv/Project.toml @@ -1,6 +1,6 @@ [deps] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -10,7 +10,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" [compat] -CLIMAParameters = "0.9" CUDA = "3.5, 4, 5" KernelAbstractions = "0.9" RootSolvers = "0.4" diff --git a/perf/Project.toml b/perf/Project.toml index 2f502166..b0546811 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -1,6 +1,6 @@ [deps] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CountFlops = "1db9610d-79e1-487a-8d40-77f3295c7593" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" @@ -16,7 +16,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" [compat] -CLIMAParameters = "0.9" KernelAbstractions = "0.9" RootSolvers = "0.4" julia = "1.7" diff --git a/perf/allocs.jl b/perf/allocs.jl index 1a815d66..bde73400 100644 --- a/perf/allocs.jl +++ b/perf/allocs.jl @@ -1,10 +1,10 @@ import Thermodynamics import RootSolvers -import CLIMAParameters +import ClimaParams import ReportMetrics dirs_to_monitor = - [".", pkgdir(Thermodynamics), pkgdir(RootSolvers), pkgdir(CLIMAParameters)] + [".", pkgdir(Thermodynamics), pkgdir(RootSolvers), pkgdir(ClimaParams)] for constructor in ["ρeq", "pθq", "pTq"] ENV["ALLOCATION_CONSTRUCTOR"] = constructor diff --git a/perf/common.jl b/perf/common.jl index 459b999c..cb5ba10b 100644 --- a/perf/common.jl +++ b/perf/common.jl @@ -5,7 +5,7 @@ import RootSolvers as RS import Thermodynamics as TD import Thermodynamics.Parameters as TP -import CLIMAParameters as CP +import ClimaParams as CP const FT = Float64 const param_set = TP.ThermodynamicsParameters(FT) diff --git a/perf/common_micro_bm.jl b/perf/common_micro_bm.jl index 654a3cee..f4a0b7c4 100644 --- a/perf/common_micro_bm.jl +++ b/perf/common_micro_bm.jl @@ -7,7 +7,7 @@ import BenchmarkTools import Thermodynamics as TD import Thermodynamics.Parameters as TP -import CLIMAParameters as CP +import ClimaParams as CP ##### ##### Finding indexes in profiles satisfying certain conditions diff --git a/perf/kernel_bm.jl b/perf/kernel_bm.jl index bf7ec873..f85a2086 100644 --- a/perf/kernel_bm.jl +++ b/perf/kernel_bm.jl @@ -13,7 +13,7 @@ import RootSolvers as RS import Thermodynamics as TD import Thermodynamics.Parameters as TP -import CLIMAParameters as CP +import ClimaParams as CP if get(ARGS, 1, "Array") == "CuArray" import CUDA diff --git a/src/Parameters.jl b/src/Parameters.jl index 86c053d7..fd51b602 100644 --- a/src/Parameters.jl +++ b/src/Parameters.jl @@ -9,7 +9,7 @@ Parameters for Thermodynamics.jl. # Example ``` -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64; diff --git a/src/Thermodynamics.jl b/src/Thermodynamics.jl index 13edeef3..4cef0f87 100644 --- a/src/Thermodynamics.jl +++ b/src/Thermodynamics.jl @@ -8,12 +8,12 @@ saturation specific humidities. ## AbstractParameterSet's -Many functions defined in this module rely on CLIMAParameters.jl. -CLIMAParameters.jl defines several functions (e.g., many planet +Many functions defined in this module rely on ClimaParams.jl. +ClimaParams.jl defines several functions (e.g., many planet parameters). For example, to compute the mole-mass ratio: ```julia -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TP FT = Float64 param_set = TP.ThermodynamicsParameters(FT) diff --git a/test/Project.toml b/test/Project.toml index cb6dbcdd..460d9ce7 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,7 +1,7 @@ [deps] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6" @@ -18,7 +18,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" [compat] -CLIMAParameters = "0.9" KernelAbstractions = "0.9" RootSolvers = "0.4" julia = "1.7" diff --git a/test/TemperatureProfiles.jl b/test/TemperatureProfiles.jl index bc845e09..b1fbb526 100644 --- a/test/TemperatureProfiles.jl +++ b/test/TemperatureProfiles.jl @@ -4,7 +4,7 @@ import Thermodynamics.Parameters as TP import Thermodynamics.TemperatureProfiles as TDTP using ForwardDiff -import CLIMAParameters as CP +import ClimaParams as CP @testset "TemperatureProfiles - DecayingTemperatureProfile" begin for FT in [Float32, Float64] diff --git a/test/relations.jl b/test/relations.jl index 3f0b51f2..fc4f4514 100644 --- a/test/relations.jl +++ b/test/relations.jl @@ -10,7 +10,7 @@ import Thermodynamics as TD import Thermodynamics.Parameters as TP using Thermodynamics.TemperatureProfiles using Thermodynamics.TestedProfiles -import CLIMAParameters as CP +import ClimaParams as CP # Tolerances for tested quantities: param_set_Float64 = TP.ThermodynamicsParameters(Float64) diff --git a/test/runtests_gpu.jl b/test/runtests_gpu.jl index ba47da66..dbd84d38 100644 --- a/test/runtests_gpu.jl +++ b/test/runtests_gpu.jl @@ -13,7 +13,7 @@ import RootSolvers as RS import Thermodynamics as TD import Thermodynamics.Parameters as TP -import CLIMAParameters as CP +import ClimaParams as CP if get(ARGS, 1, "Array") == "CuArray" import CUDA