use Tempest for land regrid

CliMA · Jun 13, 2024 · 31ceed8 · 31ceed8
1 parent c222ed0
commit 31ceed8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -46,7 +46,6 @@ steps:
       - echo "--- Instantiate ClimaEarth env"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project=.buildkite -e 'using Pkg; Pkg.add(url=\"https://github.com/CliMA/ClimaUtilities.jl.git\", rev=\"js/spacefillingcurve\"); Pkg.instantiate(;verbose=true)'"
-      - "julia --project=.buildkite -e 'using Pkg; Pkg.add(url=\"https://github.com/CliMA/ClimaLand.jl.git\", rev=\"js/utilities-fix\"); Pkg.instantiate(;verbose=true)'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'"
       - "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'"
 

diff --git a/experiments/ClimaEarth/components/land/climaland_bucket.jl b/experiments/ClimaEarth/components/land/climaland_bucket.jl
@@ -29,8 +29,8 @@ Interfacer.name(::BucketSimulation) = "BucketSimulation"
 """
     get_new_cache(p, Y, energy_check)
 
-Returns a new `p` with an updated field to store e_per_area if energy conservation 
-    checks are turned on. 
+Returns a new `p` with an updated field to store e_per_area if energy conservation
+    checks are turned on.
 """
 function get_new_cache(p, Y, energy_check)
     if energy_check
@@ -72,10 +72,10 @@ function bucket_init(
     α_snow = FT(0.8) # snow albedo
     if albedo_type == "map_static" # Read in albedo from static data file (default type)
         # By default, this uses a file containing bareground albedo without a time component. Snow albedo is specified separately.
-        albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, space)
+        albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, space; regridder_type = :TempestRegridder)
     elseif albedo_type == "map_temporal" # Read in albedo from data file containing data over time
         # By default, this uses a file containing linearly-interpolated monthly data of total albedo, generated by CESM2's land model (CLM).
-        albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(date_ref, t_start, space)
+        albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(date_ref, t_start, space; regridder_type = :TempestRegridder)
     elseif albedo_type == "function" # Use prescribed function of lat/lon for surface albedo
         function α_bareground(coordinate_point)
             (; lat, long) = coordinate_point