Skip to content

Commit

Permalink
Update to ClimaParams v0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
nefrathenrici committed Feb 23, 2024
1 parent 6bf8059 commit f2c2f49
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 32 deletions.
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion docs/Project.toml
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"
ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Clausius_Clapeyron.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ForwardDiff
import Thermodynamics as TD
import CLIMAParameters as CP
import ClimaParams as CP
using Thermodynamics.TestedProfiles
import Thermodynamics.Parameters as TP

Expand Down
8 changes: 4 additions & 4 deletions docs/src/TemperatureProfiles.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/TestedProfiles.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/saturation_adjustment.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ext/CreateParametersExt.jl
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
3 changes: 1 addition & 2 deletions gpuenv/Project.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions perf/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[deps]
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Expand All @@ -15,7 +15,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"
4 changes: 2 additions & 2 deletions perf/allocs.jl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion perf/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion perf/common_micro_bm.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion perf/kernel_bm.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Parameters.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Parameters for Thermodynamics.jl.
# Example
```
import CLIMAParameters as CP
import ClimaParams as CP
import Thermodynamics.Parameters as TP
FT = Float64;
Expand Down
6 changes: 3 additions & 3 deletions src/Thermodynamics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
2 changes: 1 addition & 1 deletion test/TemperatureProfiles.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion test/relations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/runtests_gpu.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f2c2f49

Please sign in to comment.