Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update deps #694

Merged
merged 2 commits into from
Mar 14, 2024
Merged

update deps #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9447486
use ClimaParams
juliasloan25 Mar 14, 2024
64b417a
up deps
juliasloan25 Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ authors = ["CliMA Contributors <[email protected]>"]
version = "0.1.0"

[deps]
CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
Expand All @@ -24,22 +24,22 @@ TempestRemap_jll = "8573a8c5-1df0-515e-a024-abad257ee284"
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
CLIMAParameters = "0.9"
ClimaAtmos = "0.21"
ClimaAtmos = "0.22"
ClimaComms = "0.5.6"
ClimaCore = "0.12"
ClimaCore = "0.13"
ClimaCoreTempestRemap = "0.3"
ClimaLand = "0.10"
ClimaLand = "0.11"
ClimaParams = "0.10"
Dates = "1"
DocStringExtensions = "0.8, 0.9"
Insolation = "0.9"
Insolation = "0.9.2"
JLD2 = "0.4"
NCDatasets = "0.11, 0.12, 0.13, =0.14.1"
Plots = "1.39.0"
SciMLBase = "1, 2"
StaticArrays = "1"
Statistics = "1"
SurfaceFluxes = "0.9"
SurfaceFluxes = "0.11"
TempestRemap_jll = "2"
Thermodynamics = "< 0.12.4"
Thermodynamics = "0.12.4"
julia = "1.8"
6 changes: 3 additions & 3 deletions artifacts/Artifacts.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ git-tree-sha1 = "0c6039bfcc39f6c6cb20fb331a71f6a381d93f24"
[land_mask]
git-tree-sha1 = "e41bc8c44124f867b64a9d70f1599515ae27f38a"

[pr_obs_data]
git-tree-sha1 = "7486bf32e9352493f69364aead26f01eaf90d2af"

[sic]
git-tree-sha1 = "139d23f6de29900917d79b41a87a8ee6483c72d0"

[sst]
git-tree-sha1 = "9969543acd3c9084b8238b7858d0c76aa0bf98a7"

[pr_obs_data]
git-tree-sha1 = "7486bf32e9352493f69364aead26f01eaf90d2af"
209 changes: 108 additions & 101 deletions experiments/AMIP/Manifest.toml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion experiments/AMIP/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a"
AtmosphericProfilesLibrary = "86bc3604-9858-485a-bdbe-831ec50de11d"
CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"
ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
Expand All @@ -12,6 +11,7 @@ ClimaCorePlots = "cf7c7e5a-b407-4c48-9047-11a94a308626"
ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
ClimaCoupler = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
Expand Down
30 changes: 15 additions & 15 deletions experiments/AMIP/components/land/climaland_bucket.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import ClimaTimeSteppers as CTS
import Thermodynamics as TD
using Dates: DateTime
using ClimaComms: AbstractCommsContext
import CLIMAParameters
import ClimaParams

import ClimaLand
using ClimaLand.Bucket: BucketModel, BucketModelParameters, AbstractAtmosphericDrivers, AbstractRadiativeDrivers
import ClimaLand.Bucket: BulkAlbedoTemporal, BulkAlbedoStatic, BulkAlbedoFunction
import ClimaLand.Bucket: PrescribedSurfaceAlbedo, PrescribedBaregroundAlbedo
using ClimaLand:
make_exp_tendency,
initialize,
Expand Down Expand Up @@ -67,36 +67,36 @@ function bucket_init(
@assert config == "sphere"
end

earth_param_set = LP.LandParameters(FT)

α_snow = FT(0.8) # snow albedo
if albedo_type == "map_static" # Read in albedo from static data file (default type)
# By default, this uses a file containing bareground albedo without a time component. Snow albedo is specified separately.
albedo = BulkAlbedoStatic{FT}(regrid_dirpath, space, α_snow = α_snow)
albedo = PrescribedBaregroundAlbedo{FT}(α_snow, regrid_dirpath, space)
elseif albedo_type == "map_temporal" # Read in albedo from data file containing data over time
# By default, this uses a file containing linearly-interpolated monthly data of total albedo, generated by CESM2's land model (CLM).
albedo = BulkAlbedoTemporal{FT}(regrid_dirpath, date_ref, t_start, space)
albedo = PrescribedSurfaceAlbedo{FT}(regrid_dirpath, date_ref, t_start, space)
elseif albedo_type == "function" # Use prescribed function of lat/lon for surface albedo
function α_bareground(coordinate_point)
(; lat, long) = coordinate_point
return typeof(lat)(0.38)
end
albedo = BulkAlbedoFunction{FT}(α_snow, α_bareground, space)
albedo = PrescribedBaregroundAlbedo{FT}(α_snow, α_bareground, space)
else
error("invalid albedo type $albedo_type")
end

σS_c = FT(0.2)
W_f = FT(10)
d_soil = FT(3.5) # soil depth
z_0m = FT(1e-3) # roughness length for momentum over smooth bare soil
z_0b = FT(1e-3) # roughness length for tracers over smooth bare soil
κ_soil = FT(0.7)
ρc_soil = FT(2e8)
t_crit = FT(dt) # This is the timescale on which snow exponentially damps to zero, in the case where all
# the snow would melt in time t_crit. It prevents us from having to specially time step in cases where
τc = FT(dt) # This is the timescale on which snow exponentially damps to zero, in the case where all
# the snow would melt in time `τc`. It prevents us from having to specially time step in cases where
# all the snow melts in a single timestep.
params = BucketModelParameters(κ_soil, ρc_soil, albedo, σS_c, W_f, z_0m, z_0b, t_crit, earth_param_set)
σS_c = FT(0.2) # critical snow water equivalent
W_f = FT(10) # bucket capacity
κ_soil = FT(0.7) # soil conductivity
ρc_soil = FT(2e8) # soil volumetric heat capacity

params = BucketModelParameters(FT; albedo, z_0m, z_0b, τc, σS_c, W_f, κ_soil, ρc_soil)

n_vertical_elements = 7
# Note that this does not take into account topography of the surface, which is OK for this land model.
# But it must be taken into account when computing surface fluxes, for Δz.
Expand Down Expand Up @@ -317,7 +317,7 @@ function make_land_domain(
vertdomain = ClimaCore.Domains.IntervalDomain(
ClimaCore.Geometry.ZPoint(FT(zlim[1])),
ClimaCore.Geometry.ZPoint(FT(zlim[2]));
boundary_tags = (:bottom, :top),
boundary_names = (:bottom, :top),
)

vertmesh = ClimaCore.Meshes.IntervalMesh(vertdomain, ClimaCore.Meshes.Uniform(), nelems = nelements[2])
Expand Down
Loading
Loading