From fd243319177f4f83379d92caa0f2a7c6dd38a393 Mon Sep 17 00:00:00 2001 From: akshaysridhar Date: Mon, 15 Jul 2024 13:18:16 -0700 Subject: [PATCH] Update to fix compat with breaking ClimaLand release modified: Project.toml modified: components/land/climaland_bucket.jl + Fix unnecessary info statement and config arg typo modified: config/longrun_configs/amip_target_topo.yml modified: experiments/ClimaEarth/components/atmosphere/climaatmos.jl --- config/longrun_configs/amip_target_topo.yml | 1 - experiments/ClimaEarth/Project.toml | 2 +- .../components/atmosphere/climaatmos.jl | 1 - .../components/land/climaland_bucket.jl | 26 ------------------- 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/config/longrun_configs/amip_target_topo.yml b/config/longrun_configs/amip_target_topo.yml index 7361018d4e..38344661c9 100644 --- a/config/longrun_configs/amip_target_topo.yml +++ b/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" diff --git a/experiments/ClimaEarth/Project.toml b/experiments/ClimaEarth/Project.toml index 65c8981771..e7b8544f0a 100644 --- a/experiments/ClimaEarth/Project.toml +++ b/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" diff --git a/experiments/ClimaEarth/components/atmosphere/climaatmos.jl b/experiments/ClimaEarth/components/atmosphere/climaatmos.jl index 25f9c253bd..f8542ad64b 100644 --- a/experiments/ClimaEarth/components/atmosphere/climaatmos.jl +++ b/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) diff --git a/experiments/ClimaEarth/components/land/climaland_bucket.jl b/experiments/ClimaEarth/components/land/climaland_bucket.jl index 9e476b9335..237e4a603a 100644 --- a/experiments/ClimaEarth/components/land/climaland_bucket.jl +++ b/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)