Skip to content

Commit 9512d4e

Browse files
committed
second
1 parent aa1134c commit 9512d4e

File tree

4 files changed

+32
-107
lines changed

4 files changed

+32
-107
lines changed

src/Soil/Soil.jl

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ export soil_depth_init
22
export soil_temperature, soil_temperature_delta, soil_thermal_properties
33

44
include("Constant.jl")
5-
include("soil_texture.jl")
6-
5+
# include("soil_texture.jl")
76
include("soil_depth_init.jl")
87
include("soil_thermal_properties.jl")
98
include("soil_temperature.jl")
@@ -12,4 +11,4 @@ include("soil_temperature_delta.jl")
1211
# include("HydraulicConductivity.jl")
1312
# include("soil_moisture.jl")
1413

15-
@reexport using .USDA
14+
# @reexport using .USDA

src/Soil/soil_depth_init.jl

+24-24
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,31 @@ function soil_depth_init(dz::AbstractVector)
3737
end
3838

3939

40-
"face to center"
41-
function C2F(z::AbstractVector)
42-
n = length(z)
43-
z₊ₕ = zeros(n)
44-
d = zeros(n)
40+
# "face to center"
41+
# function C2F(z::AbstractVector)
42+
# n = length(z)
43+
# z₊ₕ = zeros(n)
44+
# d = zeros(n)
4545

46-
z₊ₕ[1] = z[1]*2
47-
d[1] = z[1]*2
46+
# z₊ₕ[1] = z[1]*2
47+
# d[1] = z[1]*2
4848

49-
@inbounds for i = 2:n
50-
d[i] = 2(z[i] - z[i-1]) - d[i-1]
51-
z₊ₕ[i] = z₊ₕ[i-1] + d[i]
52-
end
53-
z₊ₕ
54-
end
49+
# @inbounds for i = 2:n
50+
# d[i] = 2(z[i] - z[i-1]) - d[i-1]
51+
# z₊ₕ[i] = z₊ₕ[i-1] + d[i]
52+
# end
53+
# z₊ₕ
54+
# end
5555

56-
"center to face"
57-
function F2C(z₊ₕ::AbstractVector)
58-
n = length(z₊ₕ)
59-
z = zeros(n)
60-
z[1] = z₊ₕ[1]/2
61-
@inbounds for i = 2:n
62-
z[i] = 0.5 * (z₊ₕ[i] + z₊ₕ[i-1])
63-
end
64-
z
65-
end
56+
# "center to face"
57+
# function F2C(z₊ₕ::AbstractVector)
58+
# n = length(z₊ₕ)
59+
# z = zeros(n)
60+
# z[1] = z₊ₕ[1]/2
61+
# @inbounds for i = 2:n
62+
# z[i] = 0.5 * (z₊ₕ[i] + z₊ₕ[i-1])
63+
# end
64+
# z
65+
# end
6666

67-
export C2F, F2C
67+
# export C2F, F2C

src/Soil/soil_texture.jl

-74
This file was deleted.

test/test-soil_moisture.jl

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using HydroTools, Test
22

33

4-
@testset "face and center" begin
5-
dz = [2, 4, 8, 10]
6-
z, z₊ₕ, dz₊ₕ = soil_depth_init(dz)
7-
@test F2C(z₊ₕ) == z
8-
@test C2F(z) == z₊ₕ
9-
end
4+
# @testset "face and center" begin
5+
# dz = [2, 4, 8, 10]
6+
# z, z₊ₕ, dz₊ₕ = soil_depth_init(dz)
7+
# @test F2C(z₊ₕ) == z
8+
# @test C2F(z) == z₊ₕ
9+
# end
1010

1111
@testset "Cambell" begin
1212
param = (θ_sat=0.25, ψ_sat=-25.0, b=0.2, K_sat=3.4e-03)

0 commit comments

Comments
 (0)