From 1cf96a662ce1fe539dc3f8fc1daa757f99a51b34 Mon Sep 17 00:00:00 2001 From: kmdeck Date: Mon, 24 Jun 2024 15:36:51 -0700 Subject: [PATCH] review comments [skip ci] --- experiments/benchmarks/land.jl | 7 ++++--- src/integrated/soil_canopy_model.jl | 1 - src/standalone/Soil/boundary_conditions.jl | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/experiments/benchmarks/land.jl b/experiments/benchmarks/land.jl index 6dbe2dc0fb..2354d1652b 100644 --- a/experiments/benchmarks/land.jl +++ b/experiments/benchmarks/land.jl @@ -329,9 +329,10 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15)) PAR_albedo = PAR_albedo, NIR_albedo = NIR_albedo, ) - - soil_params_mask_sfc = ClimaLand.Domains.top_center_to_surface(soil_params_mask) - + + soil_params_mask_sfc = + ClimaLand.Domains.top_center_to_surface(soil_params_mask) + # Read in f_max data and land sea mask infile_path = ClimaLand.Artifacts.topmodel_data_path() f_max = diff --git a/src/integrated/soil_canopy_model.jl b/src/integrated/soil_canopy_model.jl index 703df6b857..5c68aa3948 100644 --- a/src/integrated/soil_canopy_model.jl +++ b/src/integrated/soil_canopy_model.jl @@ -98,7 +98,6 @@ function SoilCanopyModel{FT}(; land_args.runoff, ) else #no runoff model - @info("Warning: No runoff model is being used; zero runoff generated.") top_bc = ClimaLand.Soil.AtmosDrivenFluxBC(atmos, CanopyRadiativeFluxes{FT}()) end diff --git a/src/standalone/Soil/boundary_conditions.jl b/src/standalone/Soil/boundary_conditions.jl index d220516078..155cbc2bb2 100644 --- a/src/standalone/Soil/boundary_conditions.jl +++ b/src/standalone/Soil/boundary_conditions.jl @@ -711,6 +711,9 @@ end function AtmosDrivenFluxBC(atmos, radiation; runoff = NoRunoff()) + if typeof(runoff) <: NoRunoff + @info("Warning: No runoff model was provided; zero runoff generated.") + end args = (atmos, radiation, runoff) return AtmosDrivenFluxBC{typeof.(args)...}(args...) end