Merge pull request #896 from CliMA/as/climaland-compat

Update to fix compat with breaking ClimaLand release
Restores default hyperdiffusion for topo longrun config
Removes unnecessary info statement

config/longrun_configs/amip_target_topo.yml

@@ -14,7 +14,6 @@ hourly_checkpoint: true
 land_albedo_type: "map_temporal"
 mode_name: "amip"
 mono_surface: false
-hyperdiffusion: "ClimaHyperdiffusion"
 netcdf_interpolate_z_over_msl: true
 rad: "allskywithclear"
 start_date: "20100101"

experiments/ClimaEarth/Project.toml

@@ -60,7 +60,7 @@ AtmosphericProfilesLibrary = "0.1"
 ClimaAnalysis = "0.5.4"
 ClimaAtmos = "0.27"
 ClimaCorePlots = "0.2"
-ClimaLand = "0.13"
+ClimaLand = "0.14"
 ClimaParams = "0.10"
 ClimaTimeSteppers = "0.7"
 ClimaUtilities = "0.1"

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -306,7 +306,6 @@ function get_atmos_config_dict(coupler_dict::Dict, job_id::String)
     atmos_config_repo = coupler_dict["atmos_config_repo"]
     # override default or specified configs with coupler arguments, and set the correct atmos config_file
     comms_ctx = ClimaComms.context()
-    @info atmos_config_repo
     if atmos_config_repo == "ClimaCoupler"
         @assert !isnothing(atmos_config_file) "Must specify `atmos_config_file` within ClimaCoupler."
         if ClimaComms.iamroot(comms_ctx)

experiments/ClimaEarth/components/land/climaland_bucket.jl

@@ -250,32 +250,6 @@ function Checkpointer.get_model_prog_state(sim::BucketSimulation)
     return sim.integrator.u.bucket
 end
 
-###
-### CL.jl bucket model-specific functions (not explicitly required by ClimaCoupler.jl)
-###
-
-# TODO remove this function after ClimaLand v0.8.1 update
-function CL.turbulent_fluxes(atmos::CL.CoupledAtmosphere, model::CL.Bucket.BucketModel, Y, p, t)
-    # coupler has done its thing behind the scenes already
-    model_name = CL.name(model)
-    model_cache = getproperty(p, model_name)
-    return model_cache.turbulent_fluxes
-end
-
-
-function CL.initialize_drivers(a::CL.CoupledAtmosphere{FT}, coords) where {FT}
-    keys = (:P_liq, :P_snow)
-    types = ([FT for k in keys]...,)
-    domain_names = ([:surface for k in keys]...,)
-    model_name = :drivers
-    # intialize_vars packages the variables as a Interfacer.named tuple,
-    # as part of a Interfacer.named tuple with `model_name` as the key.
-    # Here we just want the variable Interfacer.named tuple itself
-    vars = CL.initialize_vars(keys, types, domain_names, coords, model_name)
-    return vars.drivers
-end
-
-
 """
     temp_anomaly_aquaplanet(coord)