diff --git a/docs/make.jl b/docs/make.jl index bfe244190fa126154a11cc75223a8fd3bf06a8b4..9c081d498155a641de79f143228abfb390b5629c 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -10,7 +10,7 @@ const modules = [ CryoGrid.Physics, CryoGrid.Boundaries, CryoGrid.HeatConduction, - CryoGrid.WaterBalance, + CryoGrid.Hydrology, CryoGrid.Soils, CryoGrid.SEB, CryoGrid.Strat, @@ -35,7 +35,7 @@ makedocs(modules=modules, "Utilities" => "api/utils.md", "Physics" => [ "Heat Conduction" => "api/heat_conduction.md", - "Water Balance" => "api/water_balance.md", + "Hydrology" => "api/hydrology.md", "Soils" => "api/soils.md", "Surface Energy Balance" => "api/seb.md", ], diff --git a/docs/src/api/water_balance.md b/docs/src/api/hydrology.md similarity index 62% rename from docs/src/api/water_balance.md rename to docs/src/api/hydrology.md index b4d5bef886a59ee25cc48a81acd1d5f75c42ac42..a98e1a8acaea9deaecf6d0493113c4fbe786bf27 100644 --- a/docs/src/api/water_balance.md +++ b/docs/src/api/hydrology.md @@ -1,7 +1,7 @@ -# Water balance +# Hydrology ```@autodocs -Modules = [WaterBalance] +Modules = [Hydrology] Private = false Order = [:type, :function, :macro] ``` \ No newline at end of file diff --git a/src/Physics/WaterBalance/WaterBalance.jl b/src/Physics/Hydrology/Hydrology.jl similarity index 93% rename from src/Physics/WaterBalance/WaterBalance.jl rename to src/Physics/Hydrology/Hydrology.jl index 83ffb2d73c29ab3c0576f73789a9b175b4cb975c..e80cdd8b75e0a61eb9edaa79d264a2e00d74a222 100644 --- a/src/Physics/WaterBalance/WaterBalance.jl +++ b/src/Physics/Hydrology/Hydrology.jl @@ -1,4 +1,4 @@ -module WaterBalance +module Hydrology import CryoGrid: BoundaryStyle, diagnosticstep!, prognosticstep!, interact!, initialcondition!, variables diff --git a/src/Physics/WaterBalance/swrc.jl b/src/Physics/Hydrology/swrc.jl similarity index 100% rename from src/Physics/WaterBalance/swrc.jl rename to src/Physics/Hydrology/swrc.jl diff --git a/src/Physics/Physics.jl b/src/Physics/Physics.jl index 4e0f2e1e31cb070ec1c4966f9dac437b21a2f0ba..8fe7c30933889e03b670addd24e0744c31a1671d 100644 --- a/src/Physics/Physics.jl +++ b/src/Physics/Physics.jl @@ -16,7 +16,7 @@ include("common.jl") include("coupled.jl") include("Boundaries/Boundaries.jl") include("HeatConduction/HeatConduction.jl") -include("WaterBalance/WaterBalance.jl") +include("Hydrology/Hydrology.jl") include("Snow/Snow.jl") include("Soils/Soils.jl") include("SEB/SEB.jl") @@ -24,7 +24,7 @@ include("Sources/Sources.jl") @reexport using .Boundaries @reexport using .HeatConduction -@reexport using .WaterBalance +@reexport using .Hydrology @reexport using .Snow @reexport using .Soils @reexport using .SEB diff --git a/src/Physics/Soils/Soils.jl b/src/Physics/Soils/Soils.jl index e36bd0f55aa5b02bab9171a20b970e08006a275e..98e99643c16ace7e7853aa1a770cebc945fc782c 100644 --- a/src/Physics/Soils/Soils.jl +++ b/src/Physics/Soils/Soils.jl @@ -4,7 +4,7 @@ using CryoGrid: SubSurface, Parameterization using CryoGrid.Numerics using CryoGrid.Numerics: heaviside using CryoGrid.Physics.HeatConduction -using CryoGrid.Physics.WaterBalance +using CryoGrid.Physics.Hydrology using CryoGrid.Utils using Base: @propagate_inbounds, @kwdef