CliMA · Sbozzolo · Apr 15, 2025 · Apr 23, 2025 · AlexisRenchon · Apr 16, 2025
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -31,10 +31,6 @@ steps:
       - "julia --project=test -e 'using Pkg; Pkg.develop(;path=\".\"); Pkg.add(\"MPI\"); Pkg.add(\"CUDA\"); Pkg.instantiate(;verbose=true)'"
       - "julia --project=test -e 'using Pkg; Pkg.status()'"
 
-      - echo "--- Instantiate lib/ClimaLandSimulations"
-      - "julia --project=lib/ClimaLandSimulations -e 'using Pkg; Pkg.develop(;path=\".\"); Pkg.instantiate(;verbose=true)'"
-      - "julia --project=lib/ClimaLandSimulations -e 'using Pkg; Pkg.status()'"
-
     agents:
       slurm_gpus: 1
       # Ensures that we have all the 8 tasks on the same node
@@ -135,12 +131,6 @@ steps:
         env:
           CLIMACOMMS_DEVICE: "CUDA"
 
-  - group: "ClimaLandSimulations"
-    steps:
-      - label: "Ozark figures Makie"
-        command: "julia --color=yes --project=lib/ClimaLandSimulations lib/ClimaLandSimulations/experiments/ozark.jl"
-        artifact_paths: "figures/*pdf"
-
   - group: "CPU: global bucket"
     steps:
       - label: "Global Bucket on CPU (functional albedo)"

diff --git a/.github/workflows/ClimaLandSimulations.yml b/.github/workflows/ClimaLandSimulations.yml
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -3,9 +3,9 @@ AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
 BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
 ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
-ClimaLandSimulations = "348a0bd3-1299-4261-8002-d2cd97df6055"
 ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
 ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"

diff --git a/docs/src/folderstructure.md b/docs/src/folderstructure.md
@@ -6,7 +6,6 @@
 - experiments: contains simple runs of `ClimaLand` models. Most of these experiments is run as part of our CI.
 - src: contains the code of `ClimaLand` models.
 - ext: contains a package extension for Neural Snow and an extension with constructors for model parameters
-- lib: contains two packages that extend ClimaLand functionality: ClimaLandSimulations and ClimaLandDashboards
 - test: contains [unit tests](https://en.wikipedia.org/wiki/Unit_testing), which are meant to ensure small pieces of ClimaLand source code work as intended before merging pull requests.
 
 and 3 GitHub actions folders. GitHub actions are `.yml` files that define workflows that are run at each pull request.
@@ -84,20 +83,6 @@ As well as two files:
 - ClimaLand.jl: This file is the main Julia module of `ClimaLand.jl` repository. It contains all functions defined in `/src` in a nested way, for example `ClimaLand.X`, `ClimaLand.Soil.X`, `ClimaLand.Canopy.X`, etc. When a Julia user install and uses ClimaLand via `]add ClimaLand, using ClimaLand`, they are loading those functions, and are ready to use ClimaLand codebase.
 - Artifacts.jl: Contains functions that return the path of the given artifact name in the current context
 
-## /lib folder
-
-This folder contains a subfolder, `/ClimaLandSimulations`, which contains a library of methods
-to easily and conveniently run ClimaLand at a variety of sites and globally. There are 3 subfolders:
-
-- experiments: This folder contains scripts to run ClimaLand at a fluxnet site using ClimaLandSimulations
-- src: Contains source code for the ClimaLandSimulations package. There are 3 subfolders and
-1 file.
-  - Dashboards: Contains scripts to create dashboards for running simulations at fluxnet sites
-  - Fluxnet: Contains scripts to setup a ClimaLand simulation at a fluxnet site
-  - utilities: Contains utilities used in setup of ClimaLand simulation at a fluxnet sites
-
-- test: Contains tests for the ClimaLandSimulations package
-
 ## /ext folder
 This folder has one subfolder, `/neural_snow`, which contains tools to create the neural network
 for snow and process its data. There are also two files
@@ -121,4 +106,4 @@ subfolders:
 - aqua.jl: Contains code quality assurance tests tha use Aqua.jl
 - Project.toml: Specifies dependencies needed for testing
 - runtests.jl: When `test` is ran from the package manager, this file is ran. It can also be
-manually ran using the `test` environment. This file runs all the other test scripts.
+manually ran using the `test` environment. This file runs all the other test scripts.
diff --git a/docs/src/standalone/apps.jl b/docs/src/standalone/apps.jl
diff --git a/docs/tutorials/calibration/minimal_working_example_obs.jl b/docs/tutorials/calibration/minimal_working_example_obs.jl
@@ -12,12 +12,13 @@
 # 3. The prior distribution of these parameters.
 
 # ## Load packages
-import ClimaLandSimulations.Fluxnet as CLS # to run the model
 import EnsembleKalmanProcesses as EKP # to perform the calibration
 import Random # to use the same seed each run in the tutorial, optional
 import Logging
 Logging.disable_logging(Logging.Warn); # hide julia warnings
 
+include("run_fluxnet.jl")
+
 # ## Write a function returning our model LHF output given the parameters to calibrate
 function Ozark_LHF(params) # params is a 2 element Array
     g1, sc, pc = params

diff --git a/experiments/integrated/fluxnet/met_drivers_FLUXNET.jl b/experiments/integrated/fluxnet/met_drivers_FLUXNET.jl
@@ -163,42 +163,38 @@ atmos = ClimaLand.PrescribedAtmosphere(
     c_co2 = atmos_co2,
 )
 
-function zenith_angle(
-    t,
-    start_date;
-    latitude = lat,
-    longitude = long,
-    insol_params::Insolation.Parameters.InsolationParameters{FT} = earth_param_set.insol_params,
-) where {FT}
-    # This should be time in UTC
-    current_datetime = start_date + Dates.Second(round(t))
-
-    # Orbital Data uses Float64, so we need to convert to our sim FT
-    d, δ, η_UTC =
-        FT.(
-            Insolation.helper_instantaneous_zenith_angle(
-                current_datetime,
-                start_date,
-                insol_params,
-            )
-        )
-
-    FT(
-        Insolation.instantaneous_zenith_angle(
-            d,
-            δ,
-            η_UTC,
-            longitude,
-            latitude,
-        )[1],
-    )
-end
 radiation = ClimaLand.PrescribedRadiativeFluxes(
     FT,
     SW_IN,
     LW_IN,
     UTC_DATETIME[1];
-    θs = zenith_angle,
+    θs = (t, start_date) ->
+        let longitude = long,
+            latitude = lat,
+            insol_params = earth_param_set.insol_params
+            # This should be time in UTC
+            current_datetime = start_date + Dates.Second(round(t))
+
+            # Orbital Data uses Float64, so we need to convert to our sim FT
+            d, δ, η_UTC =
+                FT.(
+                    Insolation.helper_instantaneous_zenith_angle(
+                        current_datetime,
+                        start_date,
+                        insol_params,
+                    )
+                )
+
+            FT(
+                Insolation.instantaneous_zenith_angle(
+                    d,
+                    δ,
+                    η_UTC,
+                    longitude,
+                    latitude,
+                )[1],
+            )
+        end,
     earth_param_set = earth_param_set,
 )