Merge pull request #673 from CliMA/ar/fix_dashboard

up dashboard
CliMA · Jul 5, 2024 · 3c3bf63 · 3c3bf63
2 parents f92a51e + b4f78f0
commit 3c3bf63
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/docs/src/standalone/Project.toml b/docs/src/standalone/Project.toml
@@ -1,6 +1,7 @@
 [deps]
 Bonito = "824d6782-a2ef-11e9-3a09-e5662e0c26f8"
 ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
+ClimaLandSimulations = "348a0bd3-1299-4261-8002-d2cd97df6055"
 ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 ParamViz = "9706fb73-1de9-418d-83da-fef8cd99bb4a"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
diff --git a/docs/src/standalone/apps.jl b/docs/src/standalone/apps.jl
@@ -6,6 +6,7 @@ using ClimaLand.Canopy
 using ClimaLand.Soil.Biogeochemistry
 import ClimaParams as CP
 import ClimaLand.Parameters as LP
+using ClimaLandSimulations
 FT = Float64
 earth_param_set = LP.LandParameters(FT)
 RTparams = BeerLambertParameters(FT)
@@ -32,11 +33,15 @@ Rh_app = Rh_app_f();
 include("apps/leaf_an_ci.jl");
 An_ci_app = An_ci_app_f();
 An_ci_app = An_ci_app_f();
+# Fluxnet DashBoard
+fluxnet_app = ClimaLandSimulations.Dashboards.fluxnet_app();
+fluxnet_app = ClimaLandSimulations.Dashboards.fluxnet_app();
 
 # Route apps
 route!(server, "/leaf_An" => An_app)
 route!(server, "/beer_APAR" => beer_app)
 route!(server, "/leaf_An_ci" => An_ci_app)
 route!(server, "/Rh" => Rh_app)
+route!(server, "/fluxnet" => fluxnet_app)
 
 wait()
diff --git a/lib/ClimaLandSimulations/Project.toml b/lib/ClimaLandSimulations/Project.toml
@@ -42,11 +42,9 @@ cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
 [compat]
 ArtifactWrappers = "0.2"
 Bonito = "3"
-CairoMakie = "0.11"
-ClimaComms = "0.5.6, 0.6"
-ClimaCore = "0.13.2, 0.14"
-ClimaDiagnostics = "0.2"
-ClimaParams = "0.10.2"
+CairoMakie = "0.12"
+ClimaComms = "0.6"
+ClimaParams = "0.10"
 ClimaTimeSteppers = "0.7"
 ClimaUtilities = "0.1.2"
 DataFrames = "1"

diff --git a/lib/ClimaLandSimulations/src/Dashboards/fluxnet_dashboard.jl b/lib/ClimaLandSimulations/src/Dashboards/fluxnet_dashboard.jl
@@ -10,7 +10,7 @@ function fluxnet_dashboard(menu, menu2)
         @info value
         sv = run_fluxnet(value)[1]
         simulation_inputs = make_inputs_df(value)[1]
-        simulation_outputs = make_output_df(sv, simulation_inputs)
+        simulation_outputs = make_output_df(value, sv, simulation_inputs)
         figs = make_plots(
             simulation_inputs,
             simulation_outputs;