From 252201ec597094c5345211c3323f152eb8c6e7c5 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Wed, 28 Feb 2024 12:01:02 -0800 Subject: [PATCH] Update to ClimaParams v0.10 --- Project.toml | 12 ++++++------ docs/Project.toml | 2 +- docs/src/index.md | 4 ++-- docs/src/plot_bonan_profiles.jl | 2 +- docs/src/plot_universal_functions.jl | 2 +- ext/CreateParametersExt.jl | 2 +- test/Project.toml | 2 +- test/runtests.jl | 2 +- test/runtests_gpu.jl | 2 +- test/test_cases.jl | 2 +- test/test_convergence.jl | 2 +- test/test_universal_functions.jl | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Project.toml b/Project.toml index 641fd97e..3d5e8ccd 100644 --- a/Project.toml +++ b/Project.toml @@ -1,23 +1,23 @@ name = "SurfaceFluxes" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" authors = ["Climate Modeling Alliance"] -version = "0.9.4" +version = "0.10.0" [deps] DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -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] -CLIMAParameters = "0.9" +ClimaParams = "0.10" DocStringExtensions = "0.8, 0.9" RootSolvers = "0.2, 0.3, 0.4" -Thermodynamics = "0.12" +Thermodynamics = "0.12.4" julia = "1.9" diff --git a/docs/Project.toml b/docs/Project.toml index 67b78d3a..c6311c12 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" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" diff --git a/docs/src/index.md b/docs/src/index.md index 599696bf..95c77d08 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -28,9 +28,9 @@ SurfaceFluxes.recover_profile # Parameters Convenience constructors are provided for the `SurfaceFluxesParameters` and the various `UniversalFunctions` parameter structs. -To use them, you must first import CLIMAParameters: +To use them, you must first import ClimaParams: ```julia -import CLIMAParameters as CP +import ClimaParams as CP import SurfaceFluxes.Parameters as SFP import SurfaceFluxes.UniversalFunctions as UF diff --git a/docs/src/plot_bonan_profiles.jl b/docs/src/plot_bonan_profiles.jl index a83a031e..20fb952d 100644 --- a/docs/src/plot_bonan_profiles.jl +++ b/docs/src/plot_bonan_profiles.jl @@ -2,7 +2,7 @@ if !("." in LOAD_PATH) # for ease of local testing push!(LOAD_PATH, ".") end -import CLIMAParameters as CP +import ClimaParams as CP import SurfaceFluxes import SurfaceFluxes as SF import SurfaceFluxes.UniversalFunctions diff --git a/docs/src/plot_universal_functions.jl b/docs/src/plot_universal_functions.jl index 2c7de5d8..7adcf436 100644 --- a/docs/src/plot_universal_functions.jl +++ b/docs/src/plot_universal_functions.jl @@ -3,7 +3,7 @@ import Plots import SurfaceFluxes as SF import SurfaceFluxes.Parameters.SurfaceFluxesParameters as SFP import SurfaceFluxes.UniversalFunctions as UF -import CLIMAParameters as CP +import ClimaParams as CP const FT = Float32 diff --git a/ext/CreateParametersExt.jl b/ext/CreateParametersExt.jl index ceda3030..84a353bc 100644 --- a/ext/CreateParametersExt.jl +++ b/ext/CreateParametersExt.jl @@ -10,7 +10,7 @@ import SurfaceFluxes.UniversalFunctions: BeljaarsParams, ChengParams, HoltslagParams -import CLIMAParameters as CP +import ClimaParams as CP function SurfaceFluxesParameters(::Type{FT}, UFParams) where {FT <: AbstractFloat} SurfaceFluxesParameters(CP.create_toml_dict(FT), UFParams) diff --git a/test/Project.toml b/test/Project.toml index b6df799e..b3b30d72 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,7 +1,7 @@ [deps] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a" -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" diff --git a/test/runtests.jl b/test/runtests.jl index dcc29bfd..59d6106c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -10,7 +10,7 @@ import SurfaceFluxes as SF import SurfaceFluxes.UniversalFunctions as UF import SurfaceFluxes.Parameters as SFP import SurfaceFluxes.UniversalFunctions.BusingerParams -import CLIMAParameters as CP +import ClimaParams as CP device(::T) where {T <: Array} = CPU() diff --git a/test/runtests_gpu.jl b/test/runtests_gpu.jl index f2b388fd..6ccb0134 100644 --- a/test/runtests_gpu.jl +++ b/test/runtests_gpu.jl @@ -9,7 +9,7 @@ import Thermodynamics as TD import SurfaceFluxes as SF import SurfaceFluxes.Parameters as SFP import SurfaceFluxes.UniversalFunctions.BusingerParams -import CLIMAParameters as CP +import ClimaParams as CP ArrayType = CUDA.CuArray diff --git a/test/test_cases.jl b/test/test_cases.jl index 38aba2d3..fa6cd704 100644 --- a/test/test_cases.jl +++ b/test/test_cases.jl @@ -1,7 +1,7 @@ import SurfaceFluxes as SF import SurfaceFluxes.UniversalFunctions as UF import Thermodynamics as TD -import CLIMAParameters as CP +import ClimaParams as CP import SurfaceFluxes.Parameters as SFP @testset "Test specific ClimaAtmos outcomes" begin diff --git a/test/test_convergence.jl b/test/test_convergence.jl index b6fb5eea..2c87177c 100644 --- a/test/test_convergence.jl +++ b/test/test_convergence.jl @@ -3,7 +3,7 @@ using Test import SurfaceFluxes as SF import SurfaceFluxes.UniversalFunctions as UF import SurfaceFluxes.Parameters.SurfaceFluxesParameters -import CLIMAParameters as CP +import ClimaParams as CP using Statistics using Thermodynamics diff --git a/test/test_universal_functions.jl b/test/test_universal_functions.jl index 325362d1..f8ec9830 100644 --- a/test/test_universal_functions.jl +++ b/test/test_universal_functions.jl @@ -4,7 +4,7 @@ import QuadGK import SurfaceFluxes as SF import SurfaceFluxes.UniversalFunctions as UF -import CLIMAParameters as CP +import ClimaParams as CP FT = Float32 param_set = SFP.SurfaceFluxesParameters(FT, BusingerParams)