Update docs and examples

README.md

@@ -75,7 +75,7 @@ out = @time solve(prob, Euler(), dt=120.0, saveat=6*3600.0, progress=true) |> Cr
 plot(out.T[Z(Near(zs))], color=cg[LinRange(0.0,1.0,length(zs))]', ylabel="Temperature", leg=false)
 ```
 
-Note that `SoilHeat` uses energy as the state variable by default. To use temperature as the state variable instead:
+Note that `SoilHeatColumn` uses energy as the state variable by default. To use temperature as the state variable instead:
 
 ```julia
 # :T is the variable name for temperature, :H represents enthalpy/energy.

docs/make.jl

@@ -15,7 +15,6 @@ const modules = [
        CryoGrid.Land,
        CryoGrid.Presets,
        CryoGrid.Diagnostics,
-       CryoGrid.Callbacks,
 ]
 
 makedocs(modules=modules,
@@ -39,7 +38,6 @@ makedocs(modules=modules,
                        ],
                        "Land" => "api/land.md",
                        "Diagnostics" => "api/diagnostics.md",
-                       "Callbacks" => "api/callbacks.md",
                        "Presets" => "api/presets.md",
                 ],
                 "Contributing" => "contributing.md",

docs/src/api/callbacks.md

-# Callbacks
-
-```@autodocs
-Modules = [CryoGrid.Callbacks]
-Private = false
-Order = [:type, :function, :macro]
-```
\ No newline at end of file

examples/heat_freeW_samoylov_simple.jl

@@ -4,9 +4,11 @@ using Plots
 forcings = loadforcings(CryoGrid.Presets.Forcings.Samoylov_ERA_obs_fitted_1979_2014_spinup_extended_2044, :Tair => u"°C");
 # use air temperature as upper boundary forcing;
 tair = TimeSeriesForcing(ustrip.(forcings.data.Tair), forcings.timestamps, :Tair);
+# use default profiles for samoylov
+soilprofile, tempprofile = CryoGrid.Presets.SamoylovDefault
 # "simple" heat conduction model w/ 5 cm grid spacing (defaults to free water freezing scheme)
 grid = CryoGrid.Presets.DefaultGrid_5cm
-model = CryoGrid.Presets.SoilHeatColumn(:H, TemperatureGradient(tair), CryoGrid.Presets.SamoylovDefault; grid=grid)
+model = CryoGrid.Presets.SoilHeatColumn(:H, TemperatureGradient(tair), soilprofile; grid=grid)
 # define time span
 tspan = (DateTime(2010,10,30),DateTime(2011,10,30))
 p = parameters(model)

examples/heat_vgfc_seb_samoylov_custom.jl

@@ -33,14 +33,14 @@ Lin  = TimeSeriesForcing(forcings.data.Lin, forcings.timestamps, :Lin);
 Sin  = TimeSeriesForcing(forcings.data.Sin, forcings.timestamps, :Sin);
 z = 2.;    # height [m] for which the forcing variables (Temp, humidity, wind, pressure) are provided
 tspan = (DateTime(2010,1,1), DateTime(2011,1,1))
+soilprofile, tempprofile = CryoGrid.Presets.SamoylovDefault
 strat = Stratigraphy(
     -2.0u"m" => top(SurfaceEnergyBalance(Tair,pr,q,wind,Lin,Sin,z)),
-    # Note: You can change Heat{:H} to Heat{:T} to use temperature as the prognostic state variable.
-    0.0u"m" => subsurface(:soil, Soil(soilprofile), Heat{:H}(freezecurve=SFCC(DallAmico()))),
-    1000.0u"m" => bottom(GeothermalHeatFlux(0.053u"J/s/m^2"))
+    Tuple(z => subsurface(:soil1, Soil(para=para), Heat(:H, freezecurve=SFCC(DallAmico()))) for (z,para) in soilprofile),
+    1000.0u"m" => bottom(GeothermalHeatFlux(0.053u"J/s/m^2")),
 );
 grid = Grid(gridvals);
-model = Tile(strat,grid);
+model = Tile(strat, grid);
 # define time span
 tspan = (DateTime(2010,10,30),DateTime(2011,10,30))
 p = parameters(model)