Skip to content

Commit 080e46e

Browse files
authored
Merge pull request #1259 from CliMA/js/ext
add FluxnetSimulations ext
2 parents 2323645 + 670b74f commit 080e46e

17 files changed

+43
-21
lines changed

.buildkite/Manifest-v1.11.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ version = "0.17.2"
484484
weakdeps = ["BSON", "CSV", "CairoMakie", "ClimaAnalysis", "DataFrames", "Flux", "GeoMakie", "HTTP", "Poppler_jll", "Printf", "StatsBase"]
485485

486486
[deps.ClimaLand.extensions]
487-
LandSimulationVisualization = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
487+
LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
488488
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
489489

490490
[[deps.ClimaParams]]

.buildkite/Manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ version = "0.17.2"
481481
weakdeps = ["BSON", "CSV", "CairoMakie", "ClimaAnalysis", "DataFrames", "Flux", "GeoMakie", "HTTP", "Poppler_jll", "Printf", "StatsBase"]
482482

483483
[deps.ClimaLand.extensions]
484-
LandSimulationVisualization = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
484+
LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
485485
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
486486

487487
[[deps.ClimaParams]]

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ClimaLand.jl Release Notes
33

44
main
55
-------
6+
- Rename LandSimulationVisualization to LandSimulationVisualizationExt; add template for FluxnetSimulationsExt PR[#1259](https://github.com/CliMA/ClimaLand.jl/pull/1259)
67
- Remove root_depths from the PrescribeGroundConditions struct, and treat these ground ``drivers" consistently with how we handle atmospheric forcing PR[#1199](https://github.com/CliMA/ClimaLand.jl/pull/1240)
78
- Add constructors with default values for Canopy components PR[#1233](https://github.com/CliMA/ClimaLand.jl/pull/1233)
89

Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
2929
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
3030
ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"
3131
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
32+
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
3233
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
3334
GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
3435
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
@@ -37,13 +38,14 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
3738
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
3839

3940
[extensions]
40-
LandSimulationVisualization = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
41+
FluxnetSimulationsExt = ["DelimitedFiles"]
42+
LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
4143
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
4244

4345
[compat]
4446
BSON = "0.3.9"
45-
CairoMakie = "0.12"
4647
CSV = "0.10.14"
48+
CairoMakie = "0.12"
4749
ClimaAnalysis = "0.5.17"
4850
ClimaComms = "0.6.2"
4951
ClimaCore = "0.14.23"
@@ -53,6 +55,7 @@ ClimaTimeSteppers = "0.8"
5355
ClimaUtilities = "0.1.24"
5456
DataFrames = "1.4"
5557
Dates = "1"
58+
DelimitedFiles = "1.9"
5659
DocStringExtensions = "0.9"
5760
Flux = "0.15, 0.16"
5861
GeoMakie = "< 0.7.13"

docs/Manifest-v1.11.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
406406
version = "0.17.2"
407407

408408
[deps.ClimaLand.extensions]
409-
LandSimulationVisualization = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
409+
LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
410410
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
411411

412412
[deps.ClimaLand.weakdeps]

docs/Manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
409409
version = "0.17.2"
410410

411411
[deps.ClimaLand.extensions]
412-
LandSimulationVisualization = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
412+
LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
413413
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
414414

415415
[deps.ClimaLand.weakdeps]

experiments/long_runs/bucket.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ using CairoMakie, GeoMakie, Poppler_jll, ClimaAnalysis
3737
LandSimVis =
3838
Base.get_extension(
3939
ClimaLand,
40-
:LandSimulationVisualization,
41-
).LandSimulationVisualization;
40+
:LandSimulationVisualizationExt,
41+
).LandSimulationVisualizationExt;
4242

4343
const FT = Float64;
4444
time_interpolation_method = LinearInterpolation(PeriodicCalendar())

experiments/long_runs/land_region.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ using CairoMakie, GeoMakie, Poppler_jll, ClimaAnalysis
4141
LandSimVis =
4242
Base.get_extension(
4343
ClimaLand,
44-
:LandSimulationVisualization,
45-
).LandSimulationVisualization;
44+
:LandSimulationVisualizationExt,
45+
).LandSimulationVisualizationExt;
4646

4747
const FT = Float64;
4848
context = ClimaComms.context()
@@ -115,7 +115,7 @@ function setup_model(FT, context, start_date, Δt, domain, earth_param_set)
115115
SAI = FT(0.0) # m2/m2
116116
f_root_to_shoot = FT(3.5)
117117
RAI = FT(1.0)
118-
K_sat_plant = FT(7e-8) # m/s
118+
K_sat_plant = FT(7e-8) # m/s
119119
ψ63 = FT(-4 / 0.0098) # / MPa to m
120120
Weibull_param = FT(4) # unitless
121121
a = FT(0.2 * 0.0098) # 1/m

experiments/long_runs/snowy_land.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ using CairoMakie, GeoMakie, Poppler_jll, ClimaAnalysis
4343
LandSimVis =
4444
Base.get_extension(
4545
ClimaLand,
46-
:LandSimulationVisualization,
47-
).LandSimulationVisualization;
46+
:LandSimulationVisualizationExt,
47+
).LandSimulationVisualizationExt;
4848

4949
const FT = Float64;
5050
# If you want to do a very long run locally, you can enter `export

experiments/long_runs/soil.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ using CairoMakie, GeoMakie, Poppler_jll, ClimaAnalysis
3838
LandSimVis =
3939
Base.get_extension(
4040
ClimaLand,
41-
:LandSimulationVisualization,
42-
).LandSimulationVisualization;
41+
:LandSimulationVisualizationExt,
42+
).LandSimulationVisualizationExt;
4343

4444
const FT = Float64;
4545
# If you want to do a very long run locally, you can enter `export

0 commit comments

Comments
 (0)