Add artifacts directory and point to that in OrbitalData() calls

CliMA · May 16, 2023 · 7c841b0 · 7c841b0
1 parent 02fee8a
commit 7c841b0
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 9 deletions.
diff --git a/artifacts/Artifacts.toml b/artifacts/Artifacts.toml
@@ -0,0 +1,2 @@
+[orb_params_dataset]
+git-tree-sha1 = "4fda5e46a91c2a0cf12c9b46dad3a4189ebcfb37"
diff --git a/docs/tutorials/Bucket/bucket_tutorial.jl b/docs/tutorials/Bucket/bucket_tutorial.jl
@@ -220,7 +220,7 @@ bucket_rad = PrescribedRadiativeFluxes(
     FT,
     SW_d,
     LW_d;
-    orbital_data = Insolation.OrbitalData(Insolation.datadir()),
+    orbital_data = Insolation.OrbitalData(joinpath(pkgdir(ClimaLSM), "artifacts")),
 );
 
 # Prescribed atmospheric variables

diff --git a/experiments/LSM/ozark/ozark_met_drivers_FLUXNET.jl b/experiments/LSM/ozark/ozark_met_drivers_FLUXNET.jl
@@ -132,7 +132,9 @@ radiation = ClimaLSM.PrescribedRadiativeFluxes(
     SW_IN_spline,
     LW_IN_spline;
     θs = zenith_angle,
-    orbital_data = Insolation.OrbitalData(Insolation.datadir()),
+    orbital_data = Insolation.OrbitalData(
+        joinpath(pkgdir(ClimaLSM), "artifacts"),
+    ),
 )
 
 transpiration = DiagnosticTranspiration{FT}()
diff --git a/experiments/Standalone/Soil/evaporation.jl b/experiments/Standalone/Soil/evaporation.jl
@@ -54,7 +54,9 @@ radiation = PrescribedRadiativeFluxes(
     FT,
     SW_d,
     LW_d;
-    orbital_data = Insolation.OrbitalData(Insolation.datadir()),
+    orbital_data = Insolation.OrbitalData(
+        joinpath(pkgdir(ClimaLSM), "artifacts"),
+    ),
 )
 # Atmos
 T_air = 301.15

diff --git a/src/SharedUtilities/drivers.jl b/src/SharedUtilities/drivers.jl
@@ -248,6 +248,8 @@ struct PrescribedRadiativeFluxes{FT, SW, LW, T, OD} <:
     LW_d::LW
     "Sun zenith angle, in radians"
     θs::T
+    "Orbital Data for Insolation.jl"
+    orbital_data::OD
     function PrescribedRadiativeFluxes(
         FT,
         SW_d,

diff --git a/test/Bucket/albedo_map_bucket.jl b/test/Bucket/albedo_map_bucket.jl
@@ -51,7 +51,8 @@ include(joinpath(pkgdir(ClimaLSM), "parameters", "create_parameters.jl"))
             npolynomial = 2,
         ),
     ]
-    orbital_data = Insolation.OrbitalData(Insolation.datadir())
+    orbital_data =
+        Insolation.OrbitalData(joinpath(pkgdir(ClimaLSM), "artifacts"))
 
 
     for bucket_domain in bucket_domains

diff --git a/test/Bucket/snow_bucket_tests.jl b/test/Bucket/snow_bucket_tests.jl
@@ -56,7 +56,7 @@ bucket_domains = [
     ),
 ]
 init_temp(z::FT, value::FT) where {FT} = FT(value)
-orbital_data = Insolation.OrbitalData(Insolation.datadir())
+orbital_data = Insolation.OrbitalData(joinpath(pkgdir(ClimaLSM), "artifacts"))
 for bucket_domain in bucket_domains
 
     @testset "Conservation of water and energy" begin

diff --git a/test/Bucket/soil_bucket_tests.jl b/test/Bucket/soil_bucket_tests.jl
@@ -53,7 +53,7 @@ bucket_domains = [
         npolynomial = 1,
     ),
 ]
-orbital_data = Insolation.OrbitalData(Insolation.datadir())
+orbital_data = Insolation.OrbitalData(joinpath(pkgdir(ClimaLSM), "artifacts"))
 init_temp(z::FT, value::FT) where {FT} = FT(value)
 for bucket_domain in bucket_domains
     @testset "Zero flux RHS" begin

diff --git a/test/Soil/climate_drivers.jl b/test/Soil/climate_drivers.jl
@@ -62,7 +62,9 @@ include(joinpath(pkgdir(ClimaLSM), "parameters", "create_parameters.jl"))
         FT,
         SW_d,
         LW_d;
-        orbital_data = Insolation.OrbitalData(Insolation.datadir()),
+        orbital_data = Insolation.OrbitalData(
+            joinpath(pkgdir(ClimaLSM), "artifacts"),
+        ),
     )
     # Atmos
     precip = (t) -> eltype(t)(1e-8)

diff --git a/test/Vegetation/canopy_model.jl b/test/Vegetation/canopy_model.jl
@@ -99,7 +99,9 @@ include(joinpath(pkgdir(ClimaLSM), "parameters", "create_parameters.jl"))
         shortwave_radiation,
         longwave_radiation;
         θs = zenith_angle,
-        orbital_data = Insolation.OrbitalData(Insolation.datadir()),
+        orbital_data = Insolation.OrbitalData(
+            joinpath(pkgdir(ClimaLSM), "artifacts"),
+        ),
     )
 
     # Plant Hydraulics

diff --git a/test/Vegetation/plant_hydraulics_test.jl b/test/Vegetation/plant_hydraulics_test.jl
@@ -103,7 +103,9 @@ domains = [
         shortwave_radiation,
         longwave_radiation;
         θs = zenith_angle,
-        orbital_data = Insolation.OrbitalData(Insolation.datadir()),
+        orbital_data = Insolation.OrbitalData(
+            joinpath(pkgdir(ClimaLSM), "artifacts"),
+        ),
     )
     for domain in domains
         # Parameters are the same as the ones used in the Ozark tutorial