From 15845a1dcf3ec20f2a0e589ed3860ab88ca672b5 Mon Sep 17 00:00:00 2001 From: Brian Groenke Date: Tue, 29 Aug 2023 18:48:56 +0200 Subject: [PATCH] Remove lingering debug code from example --- examples/06_heat_freeW_seb_snow_bucketW_samoylov.jl | 6 +----- src/Physics/Heat/heat_types.jl | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/examples/06_heat_freeW_seb_snow_bucketW_samoylov.jl b/examples/06_heat_freeW_seb_snow_bucketW_samoylov.jl index e84fd815..ffb7a5db 100644 --- a/examples/06_heat_freeW_seb_snow_bucketW_samoylov.jl +++ b/examples/06_heat_freeW_seb_snow_bucketW_samoylov.jl @@ -25,7 +25,7 @@ z = 2.0u"m"; # height [m] for which the forcing variables (Temp, humidity, wind, seb = SurfaceEnergyBalance(forcings.Tair, forcings.pressure, forcings.q, forcings.wind, forcings.Lin, forcings.Sin, z) swb = SurfaceWaterBalance(rainfall=forcings.rainfall, snowfall=forcings.snowfall) upperbc = WaterHeatBC(swb, seb) -heat = HeatBalance(:H, freezecurve=PainterKarra()) +heat = HeatBalance(:H) water = WaterBalance(BucketScheme(), DampedET()) ## build stratigraphy strat = @Stratigraphy( @@ -63,10 +63,6 @@ integrator = init(prob, Euler(), dt=60.0) end out = CryoGridOutput(integrator.sol) -while convert_t(integrator.t) < DateTime(2011,6,1) - step!(integrator) -end - # Plot it! import Plots zs = [1,5,10,15,20,25,30,40,50,100,150,200,500,1000]u"cm" diff --git a/src/Physics/Heat/heat_types.jl b/src/Physics/Heat/heat_types.jl index 85014388..0dc87f33 100644 --- a/src/Physics/Heat/heat_types.jl +++ b/src/Physics/Heat/heat_types.jl @@ -43,7 +43,7 @@ Base.@kwdef struct HeatBalance{Tfc<:FreezeCurve,THeatOp<:HeatOperator,Tdt,Tprop} end # convenience constructors for HeatBalance HeatBalance(var::Symbol; kwargs...) = HeatBalance(Val{var}(); kwargs...) -HeatBalance(::Val{:H}; freezecurve::FreezeCurve=FreeWater, fcsolver=default_fcsolver(freezecurve), kwargs...) = HeatBalance(; op=EnthalpyForm(fcsolver), freezecurve, kwargs...) +HeatBalance(::Val{:H}; freezecurve::FreezeCurve=FreeWater(), fcsolver=default_fcsolver(freezecurve), kwargs...) = HeatBalance(; op=EnthalpyForm(fcsolver), freezecurve, kwargs...) HeatBalance(::Val{:T}; freezecurve::FreezeCurve, kwargs...) = HeatBalance(; op=TemperatureForm(), freezecurve, kwargs...) HeatBalance(op::HeatOperator; kwargs...) = HeatBalance(; op, kwargs...) # validation of HeatBalance freezecurve/operator configuration