Skip to content

Commit

Permalink
Merge pull request #163 from CliMA/ne/update_cp
Browse files Browse the repository at this point in the history 
Update to ClimaParams v0.10
  • Loading branch information
@nefrathenrici
nefrathenrici authored Feb 28, 2024
2 parents 3510794 + 252201e commit 5aa8b34
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion docs/Project.toml
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docs/src/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/src/plot_bonan_profiles.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/src/plot_universal_functions.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ext/CreateParametersExt.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion test/runtests_gpu.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/test_cases.jl
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_convergence.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_universal_functions.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

2 comments on commit 5aa8b34

@nefrathenrici
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/101954

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.10.0 -m "<description of version>" 5aa8b34984b636f53e9fb6df306c3036a3424388
git push origin v0.10.0

Please sign in to comment.