Change albedo artifacts to use ClimaArtifacts

Artifacts.toml

@@ -1,3 +1,10 @@
+[cesm2_albedo]
+git-tree-sha1 = "316096635acaa8102477820f480ca02fe66eb828"
+
+    [[cesm2_albedo.download]]
+    sha256 = "5ac358d4485f6ba7bae129d4570cabc712b793d4a3e22caa8808de147b2c8f9b"
+    url = "https://caltech.box.com/shared/static/awz2lku3ngoto6t78muktzfk3kjloxsw.gz"
+
 [clm_data]
 git-tree-sha1 = "5fcb868a751f4a2e32181612bb0c123e9a8e7e97"
 

src/Artifacts.jl

@@ -293,6 +293,20 @@ function mizoguchi1990_soil_freezing_data(; context = nothing)
     return dataset_path
 end
 
+"""
+    cesm2_albedo_dataset_folder()
+
+Triggers the download of the CESM2 albedo folder, if not
+already downloaded, using Julia Artifacts, and returns the path to
+this file.
+
+This dataset contains monthly albedo data from 15/01/1850
+to 15/12/2014.
+"""
+function cesm2_albedo_dataset_folder(; context = nothing)
+    return artifact_path = @clima_artifact("cesm2_albedo", context)
+end
+
 """
     cesm2_albedo_dataset_path()
 
@@ -304,19 +318,9 @@ This dataset contains monthly albedo data from 15/01/1850
 to 15/12/2014.
 """
 function cesm2_albedo_dataset_path(; context = nothing)
-    dir = joinpath(@__DIR__, "../")
-    land_albedo_dataset = ArtifactWrapper(
-        dir,
-        "land_albedo",
-        ArtifactFile[ArtifactFile(
-            url = "https://caltech.box.com/shared/static/1uhqspj4xujkyz661x0pio59hvmgsi5c.nc",
-            filename = "esw_albedo_Amon_CESM2_historical_r1i1p1f1_gn_185001-201412_v2.nc",
-        ),],
-    )
-    path = get_data_folder(land_albedo_dataset)
     return joinpath(
-        path,
-        "esw_albedo_Amon_CESM2_historical_r1i1p1f1_gn_185001-201412_v2.nc",
+        cesm2_albedo_dataset_folder(; context),
+        "sw_albedo_Amon_CESM2_historical_r1i1p1f1_gn_185001-201412_v2_no-nans.nc",
     )
 end
 
@@ -330,17 +334,10 @@ this file.
 This dataset does not contain a time component.
 """
 function bareground_albedo_dataset_path(; context = nothing)
-    dir = joinpath(@__DIR__, "../")
-    bareground_albedo_dataset = ArtifactWrapper(
-        dir,
-        "bareground_albedo",
-        ArtifactFile[ArtifactFile(
-            url = "https://caltech.box.com/shared/static/ga9385kyl82t955dylsbnn4x51b412md.nc",
-            filename = "bareground_albedo.nc",
-        ),],
+    return joinpath(
+        cesm2_albedo_dataset_folder(; context),
+        "bareground_albedo.nc",
     )
-    path = get_data_folder(bareground_albedo_dataset)
-    return joinpath(path, "bareground_albedo.nc")
 end
 
 end

src/standalone/Bucket/Bucket.jl

@@ -56,9 +56,6 @@ export BucketModelParameters,
     surface_albedo,
     partition_snow_surface_fluxes
 
-include(
-    joinpath(pkgdir(ClimaLand), "src/standalone/Bucket/artifacts/artifacts.jl"),
-)
 
 abstract type AbstractBucketModel{FT} <: AbstractExpModel{FT} end