fix land interpolation method; increase longrun timeout

Author: juliasloan25

.buildkite/longruns/pipeline.yml

@@ -13,7 +13,7 @@ env:
   SLURM_KILL_BAD_EXIT: 1
   CONFIG_PATH: "config/longrun_configs"
 
-timeout_in_minutes: 1440 # 24 hours
+timeout_in_minutes: 1800 # 30 hours
 
 steps:
   - label: "init :computer:"
@@ -196,7 +196,7 @@ steps:
   - group: "CMIP simulations"
 
     steps:
-      - label: "ClimaAtmos + ClimaLand + ClimaOcean + PrescribedSeaIce"
+      - label: "GPU CMIP: ClimaAtmos + ClimaLand + ClimaOcean + PrescribedSeaIce"
         key: "cmip_edonly_land"
         command:
             - "julia --color=yes --project=experiments/ClimaEarth experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/cmip_edonly_land.yml --job_id cmip_edonly_land"
@@ -210,7 +210,7 @@ steps:
           slurm_gpus: 1
           slurm_time: 12:00:00
 
-      - label: "ClimaAtmos + Bucket + ClimaOcean + PrescribedSeaIce"
+      - label: "GPU CMIP: ClimaAtmos + Bucket + ClimaOcean + PrescribedSeaIce"
         key: "cmip_edonly_bucket"
         command:
             - "julia --color=yes --project=experiments/ClimaEarth experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/cmip_edonly_bucket.yml --job_id cmip_edonly_bucket"

config/longrun_configs/cmip_edonly_bucket.yml

@@ -16,6 +16,6 @@ prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 rmse_check: true
 start_date: "20100101"
 surface_setup: "PrescribedSurface"
-t_end: "93days"
+t_end: "186days"
 topo_smoothing: true
 topography: "Earth"

config/longrun_configs/cmip_edonly_land.yml

@@ -16,6 +16,6 @@ prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 rmse_check: true
 start_date: "20100101"
 surface_setup: "PrescribedSurface"
-t_end: "93days"
+t_end: "186days"
 topo_smoothing: true
 topography: "Earth"

experiments/ClimaEarth/components/land/climaland_integrated.jl

@@ -321,12 +321,7 @@ function create_canopy_args(::Type{FT}, domain, earth_param_set, start_date, sto
     # Set up photosynthesis
     photosynthesis_args = (; parameters = CL.Canopy.FarquharParameters(FT, is_c3; Vcmax25 = Vcmax25))
     # Set up plant hydraulics
-    LAIfunction = CL.prescribed_lai_modis(
-        surface_space,
-        start_date,
-        stop_date;
-        time_interpolation_method = LinearInterpolation(PeriodicCalendar()),
-    )
+    LAIfunction = CL.prescribed_lai_modis(surface_space, start_date, stop_date)
     ai_parameterization = CL.Canopy.PrescribedSiteAreaIndex{FT}(LAIfunction, SAI, RAI)
 
     plant_hydraulics_ps = CL.Canopy.PlantHydraulics.PlantHydraulicsParameters(;