From ef80b764f0074f6642cf87269e578b0dbd790987 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Fri, 23 Feb 2024 10:07:29 -0800 Subject: [PATCH] Update to ClimaParams v0.10 --- Project.toml | 6 +++--- README.md | 2 +- box/Alpert_Knopf_2016_backward.jl | 2 +- box/Project.toml | 2 +- docs/Project.toml | 3 +-- docs/src/DevelopersGuide.md | 6 +++--- docs/src/Microphysics0M.md | 2 +- docs/src/Microphysics1M.md | 6 +++--- docs/src/Microphysics2M.md | 2 +- docs/src/MicrophysicsNonEq.md | 2 +- docs/src/guides/Parameters.jl | 6 +++--- docs/src/plots/ARGplots.jl | 4 ++-- docs/src/plots/ARGplots_fig1.jl | 2 +- docs/src/plots/Baumgartner2022_fig5.jl | 2 +- docs/src/plots/CLOUD_Nucleation_Plots.jl | 2 +- docs/src/plots/Frostenberg_fig1.jl | 2 +- docs/src/plots/HomFreezingPlots.jl | 2 +- docs/src/plots/Kirkby_organic_nucleation_plots.jl | 2 +- docs/src/plots/KnopfAlpert2013_fig5.jl | 2 +- docs/src/plots/Microphysics1M_plots.jl | 2 +- docs/src/plots/Microphysics2M_plots.jl | 2 +- docs/src/plots/P3LambdaErrorPlots.jl | 2 +- docs/src/plots/P3SchemePlots.jl | 2 +- docs/src/plots/P3ShapeSolverPlots.jl | 2 +- docs/src/plots/RainEvapoartionSB2006.jl | 2 +- docs/src/plots/Riccobono_mixed_nucleation_plots.jl | 2 +- docs/src/plots/T_vs_wateractivity.jl | 2 +- docs/src/plots/TerminalVelocityComparisons.jl | 2 +- docs/src/plots/Thersholds_transitions.jl | 4 ++-- docs/src/plots/compare_vehkamaki_CLOUD_nucleation.jl | 2 +- p3_sandbox/Project.toml | 4 +--- p3_sandbox/p3_sandbox.jl | 2 +- parcel/Example_Deposition_Nucleation.jl | 2 +- parcel/Example_Immersion_Freezing.jl | 2 +- parcel/Example_Jensen_et_al_2022.jl | 2 +- parcel/Example_Liquid_only.jl | 2 +- parcel/Example_P3_ice_nuc.jl | 2 +- parcel/Example_Tully_et_al_2023.jl | 2 +- parcel/ParcelModel.jl | 2 +- parcel/ParcelTendencies.jl | 2 +- parcel/Project.toml | 2 +- src/Microphysics0M.jl | 2 +- src/Nucleation.jl | 6 +++--- src/P3Scheme.jl | 2 +- src/parameters/Parameters.jl | 2 +- test/Project.toml | 3 +-- test/aerosol_activation_tests.jl | 2 +- test/common_functions_tests.jl | 2 +- test/gpu_tests.jl | 2 +- test/heterogeneous_ice_nucleation_tests.jl | 2 +- test/homogeneous_ice_nucleation_tests.jl | 2 +- test/microphysics0M_tests.jl | 2 +- test/microphysics1M_tests.jl | 2 +- test/microphysics2M_tests.jl | 2 +- test/microphysics_noneq_tests.jl | 2 +- test/nucleation_unit_tests.jl | 2 +- test/p3_tests.jl | 2 +- test/performance_tests.jl | 2 +- 58 files changed, 70 insertions(+), 74 deletions(-) diff --git a/Project.toml b/Project.toml index cac9a0d805..b9fe0d6c83 100644 --- a/Project.toml +++ b/Project.toml @@ -1,10 +1,10 @@ name = "CloudMicrophysics" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" authors = ["Climate Modeling Alliance"] -version = "0.16.0" +version = "0.16.1" [deps] -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" @@ -12,7 +12,7 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" [compat] -CLIMAParameters = "0.9" +ClimaParams = "0.10" DocStringExtensions = "0.8, 0.9" ForwardDiff = "0.10" RootSolvers = "0.3, 0.4" diff --git a/README.md b/README.md index 6cf40aa95d..cc7966c5e1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ See [our documentation](https://clima.github.io/CloudMicrophysics.jl/dev/) for t CloudMicrophysics.jl is a Julia registered package. It depends on a couple of standard Julia packages as well as the [Thermodynamics.jl](https://github.com/CliMA/Thermodynamics.jl) and - [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) + [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) (two Julia packages developed at [CliMA](https://github.com/CliMA)). See the [Project.toml](https://github.com/CliMA/CloudMicrophysics.jl/blob/main/Project.toml) for a full list of CloudMicrophysics.jl's dependencies. diff --git a/box/Alpert_Knopf_2016_backward.jl b/box/Alpert_Knopf_2016_backward.jl index 1411f9c9ca..2a9e734597 100644 --- a/box/Alpert_Knopf_2016_backward.jl +++ b/box/Alpert_Knopf_2016_backward.jl @@ -3,7 +3,7 @@ import Dierckx as DX import Random as RD import Distributions as DS -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics as CM import CloudMicrophysics.Parameters as CMP diff --git a/box/Project.toml b/box/Project.toml index 56b6670d37..38ad81e2ed 100644 --- a/box/Project.toml +++ b/box/Project.toml @@ -1,5 +1,5 @@ [deps] -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" diff --git a/docs/Project.toml b/docs/Project.toml index 20772a3894..d4330d85e9 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" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" @@ -16,6 +16,5 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" [compat] -CLIMAParameters = "0.9" Documenter = "1.1" DocumenterCitations = "1.2" diff --git a/docs/src/DevelopersGuide.md b/docs/src/DevelopersGuide.md index 2fcec8fc9d..fb20098e09 100644 --- a/docs/src/DevelopersGuide.md +++ b/docs/src/DevelopersGuide.md @@ -90,9 +90,9 @@ The name of the function should be self-explanatory yet brief. All functions should have docstrings describing the API, as well as documentation focusing on the scientific aspects of what they do. All functions should have their own unit, performance and GPU tests. -All free parameters should be stored in [CLIMAParameters](https://github.com/CliMA/CLIMAParameters.jl). +All free parameters should be stored in [ClimaParams](https://github.com/CliMA/ClimaParams.jl). It is usually faster to prototype defining the free parameters locally, - and move them to `CLIMAParameters` at a last step. + and move them to `ClimaParams` at a last step. Other files that may require editing after you make a new function are: - `CloudMicrophysics.jl` (found in `src` folder) if you need to include a new source file, @@ -134,7 +134,7 @@ They can be found in the `test` folder under files named after corresponding sou If you create a new function, please also create a new test that checks it. If creating a new file for unit tests, make sure you import `Test` and any other necessary libraries. There is some boilerplate code needed to create the sets with free parameters - based on the default `toml` file from [CLIMAParameters](https://github.com/CliMA/CLIMAParameters.jl). + based on the default `toml` file from [ClimaParams](https://github.com/CliMA/ClimaParams.jl). Some possible tests include checking if the returned values agree with values in the literature, if something is smaller/greater at warmer/cooler diff --git a/docs/src/Microphysics0M.md b/docs/src/Microphysics0M.md index 25963c376a..090e0263d7 100644 --- a/docs/src/Microphysics0M.md +++ b/docs/src/Microphysics0M.md @@ -12,7 +12,7 @@ The ``q_{tot}`` (total water specific humidity) sink due to precipitation The threshold for removing excess ``q_{tot}`` is defined either by the condensate specific humidity or supersaturation. The thresholds and the relaxation timescale are defined in - `CLIMAParameters.jl`. + `ClimaParams.jl`. !!! note diff --git a/docs/src/Microphysics1M.md b/docs/src/Microphysics1M.md index 8e7e18daf3..7b73c36878 100644 --- a/docs/src/Microphysics1M.md +++ b/docs/src/Microphysics1M.md @@ -21,7 +21,7 @@ Particles are assumed to follow power-law relationships involving the mass(radiu denoted by ``m(r)``, the cross section(radius), denoted by ``a(r)``, and the terminal velocity(radius), denoted by ``v_{term}(r)``, respectively. The coefficients are defined in the - [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) package + [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) package and are shown in the table below. For rain and ice they correspond to spherical liquid water drops and ice particles, respectively. @@ -226,7 +226,7 @@ where: and is equal to ``1 \, kg/m^3`` The coefficients are defined in - [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) + [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) package and are shown in the table below. | symbol | definition | units | default value | reference | @@ -275,7 +275,7 @@ Parameterized processes include: do not sediment). Parameters used in the parameterization are defined in - [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) package. + [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) package. They consist of: | symbol | definition | units | default value | reference | diff --git a/docs/src/Microphysics2M.md b/docs/src/Microphysics2M.md index 0c96be2871..38d29ebfc5 100644 --- a/docs/src/Microphysics2M.md +++ b/docs/src/Microphysics2M.md @@ -10,7 +10,7 @@ The microphysics variables are expressed as specific humidities [kg/kg] and numb - `N_liq` - cloud droplets number density, - `N_rai` - raindrops number density. The default values of free parameters are defined in - [CLIMAParameters](https://github.com/CliMA/CLIMAParameters.jl) + [ClimaParams](https://github.com/CliMA/ClimaParams.jl) and can be overwritten using the `toml` files. ## The Seifert and Beheng (2006) parametrization diff --git a/docs/src/MicrophysicsNonEq.md b/docs/src/MicrophysicsNonEq.md index 70cd07213d..9749e1a290 100644 --- a/docs/src/MicrophysicsNonEq.md +++ b/docs/src/MicrophysicsNonEq.md @@ -11,7 +11,7 @@ The cloud microphysics variables are expressed as specific humidities: - `q_ice` - cloud ice specific humidity, Parameters used in the parameterization are defined in - [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) package. + [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) package. They consist of: | symbol | definition | units | default value | reference | diff --git a/docs/src/guides/Parameters.jl b/docs/src/guides/Parameters.jl index 5950bc498f..0b5c048268 100644 --- a/docs/src/guides/Parameters.jl +++ b/docs/src/guides/Parameters.jl @@ -8,12 +8,12 @@ # `CloudMicrophysics.jl` is designed to allow easy parameter calibrations. # As a result, free parameters are not hard-coded in the source code but are instead # passed as arguments to functions. The default values are stored in a separate -# repository [CLIMAParameters.jl](https://github.com/CliMA/CLIMAParameters.jl) in a `toml` file. +# repository [ClimaParams.jl](https://github.com/CliMA/ClimaParams.jl) in a `toml` file. -# We start by importing the `CLIMAParameters` package and the needed +# We start by importing the `ClimaParams` package and the needed # `CloudMicrophysics.jl` modules. We define the precision type. -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.Microphysics1M as CM1 import CloudMicrophysics.Microphysics2M as CM2 diff --git a/docs/src/plots/ARGplots.jl b/docs/src/plots/ARGplots.jl index 380d1c5b48..7808b02e7e 100644 --- a/docs/src/plots/ARGplots.jl +++ b/docs/src/plots/ARGplots.jl @@ -1,13 +1,13 @@ import Plots import CloudMicrophysics -import CLIMAParameters +import ClimaParams import Thermodynamics const PL = Plots const AM = CloudMicrophysics.AerosolModel const AA = CloudMicrophysics.AerosolActivation -const CP = CLIMAParameters +const CP = ClimaParams const CMP = CloudMicrophysics.Parameters const TD = Thermodynamics diff --git a/docs/src/plots/ARGplots_fig1.jl b/docs/src/plots/ARGplots_fig1.jl index 15d2c2a362..ca131dcc82 100644 --- a/docs/src/plots/ARGplots_fig1.jl +++ b/docs/src/plots/ARGplots_fig1.jl @@ -1,7 +1,7 @@ import Plots import CloudMicrophysics -import CLIMAParameters +import ClimaParams import Thermodynamics const PL = Plots diff --git a/docs/src/plots/Baumgartner2022_fig5.jl b/docs/src/plots/Baumgartner2022_fig5.jl index 798e9cdfea..02a59f3919 100644 --- a/docs/src/plots/Baumgartner2022_fig5.jl +++ b/docs/src/plots/Baumgartner2022_fig5.jl @@ -3,7 +3,7 @@ import CairoMakie as MK import CloudMicrophysics as CM import Thermodynamics as TD -import CLIMAParameters as CP +import ClimaParams as CP const CMO = CM.Common const CMP = CM.Parameters diff --git a/docs/src/plots/CLOUD_Nucleation_Plots.jl b/docs/src/plots/CLOUD_Nucleation_Plots.jl index 7a0fe7b66c..b1dc21ac29 100644 --- a/docs/src/plots/CLOUD_Nucleation_Plots.jl +++ b/docs/src/plots/CLOUD_Nucleation_Plots.jl @@ -1,6 +1,6 @@ using Plots -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.Nucleation as Nucleation diff --git a/docs/src/plots/Frostenberg_fig1.jl b/docs/src/plots/Frostenberg_fig1.jl index 3c47955f2a..3deffd243b 100644 --- a/docs/src/plots/Frostenberg_fig1.jl +++ b/docs/src/plots/Frostenberg_fig1.jl @@ -2,7 +2,7 @@ import Plots as PL import CloudMicrophysics as CM import CloudMicrophysics.HetIceNucleation as IN -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP FT = Float32 diff --git a/docs/src/plots/HomFreezingPlots.jl b/docs/src/plots/HomFreezingPlots.jl index ea3ff0fa7c..e202631a6b 100644 --- a/docs/src/plots/HomFreezingPlots.jl +++ b/docs/src/plots/HomFreezingPlots.jl @@ -2,7 +2,7 @@ import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP const CMO = CM.Common const CMI = CM.HomIceNucleation diff --git a/docs/src/plots/Kirkby_organic_nucleation_plots.jl b/docs/src/plots/Kirkby_organic_nucleation_plots.jl index 75a2028579..1eeace63ef 100644 --- a/docs/src/plots/Kirkby_organic_nucleation_plots.jl +++ b/docs/src/plots/Kirkby_organic_nucleation_plots.jl @@ -1,6 +1,6 @@ using Plots -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.Nucleation as Nucleation diff --git a/docs/src/plots/KnopfAlpert2013_fig5.jl b/docs/src/plots/KnopfAlpert2013_fig5.jl index d76f99cfbd..00d3550db7 100644 --- a/docs/src/plots/KnopfAlpert2013_fig5.jl +++ b/docs/src/plots/KnopfAlpert2013_fig5.jl @@ -1,6 +1,6 @@ import CairoMakie as MK -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics as CM import CloudMicrophysics.Common as CMO diff --git a/docs/src/plots/Microphysics1M_plots.jl b/docs/src/plots/Microphysics1M_plots.jl index d0cab59efc..76f03de6f2 100644 --- a/docs/src/plots/Microphysics1M_plots.jl +++ b/docs/src/plots/Microphysics1M_plots.jl @@ -2,7 +2,7 @@ import Plots import Thermodynamics import CloudMicrophysics -import CLIMAParameters +import ClimaParams const PL = Plots const CM1 = CloudMicrophysics.Microphysics1M diff --git a/docs/src/plots/Microphysics2M_plots.jl b/docs/src/plots/Microphysics2M_plots.jl index d8a2236280..82574314ef 100644 --- a/docs/src/plots/Microphysics2M_plots.jl +++ b/docs/src/plots/Microphysics2M_plots.jl @@ -1,7 +1,7 @@ using CairoMakie CairoMakie.activate!(type = "svg") -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics import CloudMicrophysics.Microphysics1M as CM1 diff --git a/docs/src/plots/P3LambdaErrorPlots.jl b/docs/src/plots/P3LambdaErrorPlots.jl index 8dc2c3c76f..4f1e6f57d6 100644 --- a/docs/src/plots/P3LambdaErrorPlots.jl +++ b/docs/src/plots/P3LambdaErrorPlots.jl @@ -1,7 +1,7 @@ import CloudMicrophysics as CM import CloudMicrophysics.P3Scheme as P3 import CloudMicrophysics.Parameters as CMP -import CLIMAParameters as CP +import ClimaParams as CP import SpecialFunctions as SF import RootSolvers as RS import CairoMakie as Plt diff --git a/docs/src/plots/P3SchemePlots.jl b/docs/src/plots/P3SchemePlots.jl index a904615f69..824909b61d 100644 --- a/docs/src/plots/P3SchemePlots.jl +++ b/docs/src/plots/P3SchemePlots.jl @@ -1,6 +1,6 @@ import CairoMakie as Plt import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.P3Scheme as P3 diff --git a/docs/src/plots/P3ShapeSolverPlots.jl b/docs/src/plots/P3ShapeSolverPlots.jl index 878b4b47b9..16eff0b55a 100644 --- a/docs/src/plots/P3ShapeSolverPlots.jl +++ b/docs/src/plots/P3ShapeSolverPlots.jl @@ -1,6 +1,6 @@ import CairoMakie as Plt import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.P3Scheme as P3 diff --git a/docs/src/plots/RainEvapoartionSB2006.jl b/docs/src/plots/RainEvapoartionSB2006.jl index 0a0085b6a6..9470687834 100644 --- a/docs/src/plots/RainEvapoartionSB2006.jl +++ b/docs/src/plots/RainEvapoartionSB2006.jl @@ -4,7 +4,7 @@ import SpecialFunctions as SF import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.Common as CO diff --git a/docs/src/plots/Riccobono_mixed_nucleation_plots.jl b/docs/src/plots/Riccobono_mixed_nucleation_plots.jl index 6d931c2f54..e97df0b6a6 100644 --- a/docs/src/plots/Riccobono_mixed_nucleation_plots.jl +++ b/docs/src/plots/Riccobono_mixed_nucleation_plots.jl @@ -1,6 +1,6 @@ using Plots -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Nucleation as Nucleation import CloudMicrophysics.Parameters as CMP diff --git a/docs/src/plots/T_vs_wateractivity.jl b/docs/src/plots/T_vs_wateractivity.jl index 06acd04e41..c22ecf240d 100644 --- a/docs/src/plots/T_vs_wateractivity.jl +++ b/docs/src/plots/T_vs_wateractivity.jl @@ -2,7 +2,7 @@ import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP const CMO = CM.Common const CMP = CM.Parameters diff --git a/docs/src/plots/TerminalVelocityComparisons.jl b/docs/src/plots/TerminalVelocityComparisons.jl index 7f19cfb2e8..39992a80ae 100644 --- a/docs/src/plots/TerminalVelocityComparisons.jl +++ b/docs/src/plots/TerminalVelocityComparisons.jl @@ -1,6 +1,6 @@ import Plots as PL -import CLIMAParameters as CP +import ClimaParams as CP FT = Float64 diff --git a/docs/src/plots/Thersholds_transitions.jl b/docs/src/plots/Thersholds_transitions.jl index 2b95ce7fe4..3ce630226c 100644 --- a/docs/src/plots/Thersholds_transitions.jl +++ b/docs/src/plots/Thersholds_transitions.jl @@ -1,11 +1,11 @@ import Plots import CloudMicrophysics -import CLIMAParameters +import ClimaParams const PL = Plots const CM1 = CloudMicrophysics.Microphysics1M const CM2 = CloudMicrophysics.Microphysics2M -const CP = CLIMAParameters +const CP = ClimaParams const CMP = CloudMicrophysics.Parameters FT = Float64 diff --git a/docs/src/plots/compare_vehkamaki_CLOUD_nucleation.jl b/docs/src/plots/compare_vehkamaki_CLOUD_nucleation.jl index 07a589807d..eb14f5ddea 100644 --- a/docs/src/plots/compare_vehkamaki_CLOUD_nucleation.jl +++ b/docs/src/plots/compare_vehkamaki_CLOUD_nucleation.jl @@ -1,6 +1,6 @@ using Plots -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics as CM import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.Nucleation as Nucleation diff --git a/p3_sandbox/Project.toml b/p3_sandbox/Project.toml index 5c6f2144f5..c1bac283e3 100644 --- a/p3_sandbox/Project.toml +++ b/p3_sandbox/Project.toml @@ -1,5 +1,5 @@ [deps] -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" @@ -8,5 +8,3 @@ RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" -[compat] -CLIMAParameters = "0.9" diff --git a/p3_sandbox/p3_sandbox.jl b/p3_sandbox/p3_sandbox.jl index b1e4a3a30d..51f29a7972 100644 --- a/p3_sandbox/p3_sandbox.jl +++ b/p3_sandbox/p3_sandbox.jl @@ -1,6 +1,6 @@ import OrdinaryDiffEq as ODE -import CLIMAParameters +import ClimaParams import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.P3Scheme as P3 import CloudMicrophysics.HetIceNucleation as CMI_het diff --git a/parcel/Example_Deposition_Nucleation.jl b/parcel/Example_Deposition_Nucleation.jl index 9093dd3a98..64aaa97d26 100644 --- a/parcel/Example_Deposition_Nucleation.jl +++ b/parcel/Example_Deposition_Nucleation.jl @@ -2,7 +2,7 @@ import OrdinaryDiffEq as ODE import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP # definition of the ODE problem for parcel model include(joinpath(pkgdir(CM), "parcel", "Parcel.jl")) diff --git a/parcel/Example_Immersion_Freezing.jl b/parcel/Example_Immersion_Freezing.jl index 3cbb77c270..a0e67f2ffc 100644 --- a/parcel/Example_Immersion_Freezing.jl +++ b/parcel/Example_Immersion_Freezing.jl @@ -3,7 +3,7 @@ import OrdinaryDiffEq as ODE import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP # definition of the ODE problem for parcel model include(joinpath(pkgdir(CM), "parcel", "Parcel.jl")) diff --git a/parcel/Example_Jensen_et_al_2022.jl b/parcel/Example_Jensen_et_al_2022.jl index 27db1a2663..19f1d0fd39 100644 --- a/parcel/Example_Jensen_et_al_2022.jl +++ b/parcel/Example_Jensen_et_al_2022.jl @@ -2,7 +2,7 @@ import OrdinaryDiffEq as ODE import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import Distributions as DS import CloudMicrophysics.Parameters as CMP diff --git a/parcel/Example_Liquid_only.jl b/parcel/Example_Liquid_only.jl index ceb1345434..e6d6556305 100644 --- a/parcel/Example_Liquid_only.jl +++ b/parcel/Example_Liquid_only.jl @@ -3,7 +3,7 @@ import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM import CloudMicrophysics.Parameters as CMP -import CLIMAParameters as CP +import ClimaParams as CP include(joinpath(pkgdir(CM), "parcel", "Parcel.jl")) diff --git a/parcel/Example_P3_ice_nuc.jl b/parcel/Example_P3_ice_nuc.jl index 3a9f0701da..4034244726 100644 --- a/parcel/Example_P3_ice_nuc.jl +++ b/parcel/Example_P3_ice_nuc.jl @@ -2,7 +2,7 @@ import OrdinaryDiffEq as ODE import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP # definition of the ODE problem for parcel model include(joinpath(pkgdir(CM), "parcel", "Parcel.jl")) diff --git a/parcel/Example_Tully_et_al_2023.jl b/parcel/Example_Tully_et_al_2023.jl index 91f4fe8dea..7915c5ef65 100644 --- a/parcel/Example_Tully_et_al_2023.jl +++ b/parcel/Example_Tully_et_al_2023.jl @@ -3,7 +3,7 @@ import CairoMakie as MK import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP # definition of the ODE problem for parcel model include(joinpath(pkgdir(CM), "parcel", "Parcel.jl")) diff --git a/parcel/ParcelModel.jl b/parcel/ParcelModel.jl index 69248752f8..3084407909 100644 --- a/parcel/ParcelModel.jl +++ b/parcel/ParcelModel.jl @@ -172,7 +172,7 @@ The parcel parameters struct comes with default values that can be overwritten: - deposition_growth - string with deposition/sublimation options for ice crystals ["None" (default), "Deposition"] - size_distribution - string with cloud droplet and ice crystal size disribution choice ["Monodisperse" (default), "Gamma"] - aerosol - a struct with aerosol parameters required by the nucleation parameterizations, see CloudMicrophysics documentation for all the options. The default is an Empty struct. - - wps, aps, tps, ips, H₂SO₄ps - structs with additional free parameters needed by the parameterizations. By default we use the values stored in ClimaParameters.jl. See CloudMicrophysics docs for more details. + - wps, aps, tps, ips, H₂SO₄ps - structs with additional free parameters needed by the parameterizations. By default we use the values stored in ClimaParams.jl. See CloudMicrophysics docs for more details. - const_dt - model timestep [s]. Parcel model is using a simple Euler timestepper. Default value is 1 s - w - parcel vertical velocity [m/s]. Default value is 1 m/s - r_nuc - assumed size of nucleating ice crystals. Default value is 5e-11 [m] diff --git a/parcel/ParcelTendencies.jl b/parcel/ParcelTendencies.jl index c9f1462ecf..3ed449e167 100644 --- a/parcel/ParcelTendencies.jl +++ b/parcel/ParcelTendencies.jl @@ -137,7 +137,7 @@ function homogeneous_freezing(params::P3_hom, PSD, state) FT = eltype(state) (; Nₗ, T) = state (; const_dt) = params - #TODO - use CLIMAParameters + #TODO - use ClimaParams return T < FT(233.15) && Nₗ > FT(0) ? Nₗ / const_dt : FT(0) end diff --git a/parcel/Project.toml b/parcel/Project.toml index 0c0168db26..0129945f4e 100644 --- a/parcel/Project.toml +++ b/parcel/Project.toml @@ -1,5 +1,5 @@ [deps] -CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" +ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" diff --git a/src/Microphysics0M.jl b/src/Microphysics0M.jl index 72e72df8b0..64d9f1387a 100644 --- a/src/Microphysics0M.jl +++ b/src/Microphysics0M.jl @@ -27,7 +27,7 @@ to a state with precipitable water removed. The threshold for when to remove `q_tot` is defined either by the condensate specific humidity or supersaturation. The thresholds and the relaxation timescale are defined in -CLIMAParameters. +ClimaParams. """ remove_precipitation( (; τ_precip, qc_0)::CMP.Parameters0M, diff --git a/src/Nucleation.jl b/src/Nucleation.jl index 8ad7b5159b..140a9b25f4 100644 --- a/src/Nucleation.jl +++ b/src/Nucleation.jl @@ -43,7 +43,7 @@ end - `nh3_conc` - Concentration of nh3 (1/m³) - `negative_ion_conc` - Concentration of negative ions (1/m³) - `temp` - Temperature (K) - - `params` - NamedTuple parameter set obtained from CLIMAParameters. + - `params` - NamedTuple parameter set obtained from ClimaParams. Calculates the rate of binary H2SO4-H2O and ternary H2SO4-H2O-NH3 nucleation for a single timestep (1/m³/s). The particle formation rate is parameterized using data from the CLOUD experiment, through neutral and ion-induced channels. This is an implementation of Dunne et al 1016 doi:10.1126/science.aaf2649 Appendix 8-10 @@ -97,7 +97,7 @@ end - `OH_conc` - Concentration of OH (1/m³) - `temp` - Temperature (K) - `condensation_sink` - Condensation sink (1/s) - - `params` - NamedTuple parameter set obtained from CLIMAParameters. + - `params` - NamedTuple parameter set obtained from ClimaParams. Returns nucleation rate of pure biogenic particles (1/m³/s) The parameterization is an implementation of Kirkby at al 2016 doi.org/10.1038/nature17953 @@ -161,7 +161,7 @@ end - `OH_conc` - Concentration of OH (1/m³) - `temp` - Temperature (K) - `condensation_sink` - Condensation sink (1/s) -- `params` - NamedTuple parameter set obtained from CLIMAParameters. +- `params` - NamedTuple parameter set obtained from ClimaParams. Returns nucleation rate of sulfuric acid and oxidized organic molecules (1/m³/s). This is an implementation of Riccobono et al 2014 (https://doi.org/10.1126/science.1243527) diff --git a/src/P3Scheme.jl b/src/P3Scheme.jl index b682ebfbcf..6b7386d9d4 100644 --- a/src/P3Scheme.jl +++ b/src/P3Scheme.jl @@ -14,7 +14,7 @@ module P3Scheme import SpecialFunctions as SF import RootSolvers as RS -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP const PSP3 = CMP.ParametersP3 diff --git a/src/parameters/Parameters.jl b/src/parameters/Parameters.jl index 343afba844..3d1fdd8d71 100644 --- a/src/parameters/Parameters.jl +++ b/src/parameters/Parameters.jl @@ -7,7 +7,7 @@ module Parameters using DocStringExtensions -import CLIMAParameters as CP +import ClimaParams as CP # Super-types (dispatch, broadcasting, etc...) include("AbstractTypes.jl") diff --git a/test/Project.toml b/test/Project.toml index 63a215dc53..238e5446c6 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" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" @@ -12,5 +12,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" [compat] -CLIMAParameters = "0.9" KernelAbstractions = "0.9" diff --git a/test/aerosol_activation_tests.jl b/test/aerosol_activation_tests.jl index cbb5b3fb56..fe112bbace 100644 --- a/test/aerosol_activation_tests.jl +++ b/test/aerosol_activation_tests.jl @@ -1,6 +1,6 @@ import Test as TT -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics as CM import Thermodynamics as TD diff --git a/test/common_functions_tests.jl b/test/common_functions_tests.jl index b36f665861..0254099a86 100644 --- a/test/common_functions_tests.jl +++ b/test/common_functions_tests.jl @@ -1,6 +1,6 @@ import Test as TT -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics as CM import CloudMicrophysics.Common as CO diff --git a/test/gpu_tests.jl b/test/gpu_tests.jl index acb3a3313e..7e0b0b2b53 100644 --- a/test/gpu_tests.jl +++ b/test/gpu_tests.jl @@ -4,7 +4,7 @@ using ClimaComms # Needed for parameters import CloudMicrophysics.Parameters as CMP -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics as TD # Modules to test diff --git a/test/heterogeneous_ice_nucleation_tests.jl b/test/heterogeneous_ice_nucleation_tests.jl index cc411112d6..66647c50a8 100644 --- a/test/heterogeneous_ice_nucleation_tests.jl +++ b/test/heterogeneous_ice_nucleation_tests.jl @@ -2,7 +2,7 @@ import Test as TT import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Common as CO import CloudMicrophysics.Parameters as CMP diff --git a/test/homogeneous_ice_nucleation_tests.jl b/test/homogeneous_ice_nucleation_tests.jl index 0ef8b14e52..4d578b6659 100644 --- a/test/homogeneous_ice_nucleation_tests.jl +++ b/test/homogeneous_ice_nucleation_tests.jl @@ -2,7 +2,7 @@ import Test as TT import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Common as CO import CloudMicrophysics.Parameters as CMP diff --git a/test/microphysics0M_tests.jl b/test/microphysics0M_tests.jl index a2cc4af08b..3a0a262df9 100644 --- a/test/microphysics0M_tests.jl +++ b/test/microphysics0M_tests.jl @@ -1,6 +1,6 @@ import Test as TT -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics.Parameters as CMP diff --git a/test/microphysics1M_tests.jl b/test/microphysics1M_tests.jl index 6a1fe7e492..ca71287bad 100644 --- a/test/microphysics1M_tests.jl +++ b/test/microphysics1M_tests.jl @@ -2,7 +2,7 @@ import Test as TT import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import Thermodynamics.Parameters as TDP import CloudMicrophysics.Parameters as CMP diff --git a/test/microphysics2M_tests.jl b/test/microphysics2M_tests.jl index 7044115cce..895cd335f9 100644 --- a/test/microphysics2M_tests.jl +++ b/test/microphysics2M_tests.jl @@ -2,7 +2,7 @@ import Test as TT import Thermodynamics as TD import CloudMicrophysics as CM -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics.Parameters as CMP import CloudMicrophysics.Common as CMC diff --git a/test/microphysics_noneq_tests.jl b/test/microphysics_noneq_tests.jl index 126fd326ba..da4e016886 100644 --- a/test/microphysics_noneq_tests.jl +++ b/test/microphysics_noneq_tests.jl @@ -1,6 +1,6 @@ import Test as TT -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics.Parameters as CMP diff --git a/test/nucleation_unit_tests.jl b/test/nucleation_unit_tests.jl index f758bdfbda..67c168a9df 100644 --- a/test/nucleation_unit_tests.jl +++ b/test/nucleation_unit_tests.jl @@ -1,5 +1,5 @@ using Test -import CLIMAParameters as CP +import ClimaParams as CP import CloudMicrophysics as CM import CloudMicrophysics.Parameters.MixedNucleationParameters diff --git a/test/p3_tests.jl b/test/p3_tests.jl index 36aa1c78ec..c12748466d 100644 --- a/test/p3_tests.jl +++ b/test/p3_tests.jl @@ -1,5 +1,5 @@ import Test as TT -import CLIMAParameters +import ClimaParams import CloudMicrophysics as CM import CloudMicrophysics.P3Scheme as P3 import CloudMicrophysics.Parameters as CMP diff --git a/test/performance_tests.jl b/test/performance_tests.jl index c7fc5d5bbf..cbe34b7e33 100644 --- a/test/performance_tests.jl +++ b/test/performance_tests.jl @@ -1,7 +1,7 @@ import Test as TT import BenchmarkTools as BT -import CLIMAParameters +import ClimaParams import Thermodynamics as TD import CloudMicrophysics.Common as CO