add tests

.github/workflows/ci-runtest.yml

@@ -0,0 +1,44 @@
+name: CI-JutulDarcyAD
+
+on: 
+  # Trigger the workflow on push to main or pull request
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        version:
+          - '1.7'
+
+        os:
+          - ubuntu-latest
+          - macos-latest
+        arch:
+          - x64
+
+    steps:
+      - name: Checkout JutulDarcyAD
+        uses: actions/checkout@v2
+
+      - name: Setup julia
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+
+      - name: Build
+        uses: julia-actions/julia-buildpkg@latest
+
+      - name: Run tests
+        uses: julia-actions/julia-runtest@latest

examples/inv_2D.jl

@@ -87,14 +87,23 @@ trans_z_init = reshape(x_init[(n[1]-1)*n[end]+1:end], n[1], n[end]-1)
 
 fig=figure(figsize=(20,12));
 subplot(1,3,1);
-imshow(trans_x_init', vmin=minimum(trans_x), vmax=maximum(trans_x)); colorbar(); title("initial transmissibility")
+imshow(trans_x_init', vmin=minimum(trans_x), vmax=maximum(trans_x)); colorbar(); title("initial transmissibility x")
 subplot(1,3,2);
-imshow(trans_x0', vmin=minimum(trans_x), vmax=maximum(trans_x)); colorbar(); title("inverted transmissibility")
+imshow(trans_x0', vmin=minimum(trans_x), vmax=maximum(trans_x)); colorbar(); title("inverted transmissibility x")
 subplot(1,3,3);
-imshow(trans_x', vmin=minimum(trans_x), vmax=maximum(trans_x)); colorbar(); title("true transmissibility")
-savefig("transx.png", bbox_inches="tight", dpi=300)
-state0 = S(x0, q)
+imshow(trans_x', vmin=minimum(trans_x), vmax=maximum(trans_x)); colorbar(); title("true transmissibility x")
+savefig("trans_x.png", bbox_inches="tight", dpi=300)
 
+fig=figure(figsize=(20,12));
+subplot(1,3,1);
+imshow(trans_z_init', vmin=minimum(trans_z), vmax=maximum(trans_z)); colorbar(); title("initial transmissibility z")
+subplot(1,3,2);
+imshow(trans_z0', vmin=minimum(trans_z), vmax=maximum(trans_z)); colorbar(); title("inverted transmissibility z")
+subplot(1,3,3);
+imshow(trans_z', vmin=minimum(trans_z), vmax=maximum(trans_z)); colorbar(); title("true transmissibility z")
+savefig("trans_z.png", bbox_inches="tight", dpi=300)
+
+state0 = S(x0, q)
 
 fig=figure(figsize=(20,12));
 subplot(1,3,1);
@@ -103,4 +112,13 @@ subplot(1,3,2);
 imshow(reshape(state0.states[end].Saturations, n[1], n[end])', vmin=0, vmax=1); colorbar(); title("inverted saturation")
 subplot(1,3,3);
 imshow(reshape(state.states[end].Saturations, n[1], n[end])', vmin=0, vmax=1); colorbar(); title("true saturation")
+savefig("saturation.png", bbox_inches="tight", dpi=300)
 
+fig=figure(figsize=(20,12));
+subplot(1,3,1);
+imshow(reshape(state_init.states[end].Pressure, n[1], n[end])', vmin=minimum(state.states[end].Pressure), vmax=maximum(state.states[end].Pressure)); colorbar(); title("initial pressure")
+subplot(1,3,2);
+imshow(reshape(state0.states[end].Pressure, n[1], n[end])', vmin=minimum(state.states[end].Pressure), vmax=maximum(state.states[end].Pressure)); colorbar(); title("inverted pressure")
+subplot(1,3,3);
+imshow(reshape(state.states[end].Pressure, n[1], n[end])', vmin=minimum(state.states[end].Pressure), vmax=maximum(state.states[end].Pressure)); colorbar(); title("true pressure")
+savefig("pressure.png", bbox_inches="tight", dpi=300)

src/FlowAD/Types/jutulForce.jl

@@ -17,3 +17,5 @@ function force(M::jutulModel{D, T}, f::jutulForce{D, T}; ρCO2::T=T(501.9)) wher
     src  = [SourceTerm(cell[i], f.irate[i] * ρCO2, fractional_flow = [T(f.irate[i] > 0), T(1)-T(f.irate[i] > 0)]) for i = 1:length(f.loc)]
     return setup_forces(model, sources = src)
 end
+
+==(A::jutulForce{D, T}, B::jutulForce{D, T}) where {D,T} = (A.irate == B.irate && A.loc == B.loc)

src/FlowAD/Types/jutulModel.jl

@@ -18,4 +18,6 @@ function model_(M::jutulModel{D, T}) where {D, T}
     model = SimulationModel(G, sys)
     replace_variables!(model, RelativePermeabilities = kr)
     return model
-end
+end
+
+==(A::jutulModel{D, T}, B::jutulModel{D, T}) where {D,T} = (A.n == B.n && A.d == B.d && A.ϕ == B.ϕ && A.K == B.K)

src/FlowAD/Types/jutulState.jl

@@ -127,4 +127,6 @@ for op in [:+, :-, :*, :/]
     @eval function $(op)(A::jutulAllState{T}, B::jutulAllState{T}) where T
         return A(broadcast($(op), vec(A), vec(B)))
     end
-end
+end
+
+==(A::jutulAllState{T}, B::jutulAllState{T}) where {T} = vec(A) == vec(B)

src/JutulDarcyAD.jl

@@ -12,7 +12,7 @@ module JutulDarcyAD
     using ChainRulesCore
     import Jutul: JutulGeometry, get_facepos, compute_face_trans, compute_half_face_trans, expand_perm
     import Jutul: SimulationModel
-    import Base: +, -, *, /
+    import Base: +, -, *, /, ==
     import Base: display, length, size, getindex, setindex!, IndexStyle, vec, firstindex, lastindex
     import LinearAlgebra: norm, dot
     import ChainRulesCore: rrule

test/runtest.jl

@@ -11,4 +11,7 @@ include("test_utils.jl")
 
 include("test_conversion.jl")
 include("test_jutulState.jl")
+include("test_jutulForce.jl")
+include("test_jutulModel.jl")
+
 include("test_gradient.jl")

test/test_jutulForce.jl

@@ -0,0 +1,10 @@
+@testset "Test jutulForce" begin
+
+    d = (1.0, 20.0, 3.0)
+    inj_loc = (3, 1, 9) .* d
+    prod_loc = (28, 1, 9) .* d
+    irate = rand()
+    q = jutulForce(irate, [inj_loc, prod_loc])
+    q1 = jutulForce([irate, -irate], [inj_loc, prod_loc])
+    @test q == q1
+end

test/test_jutulModel.jl

@@ -0,0 +1,17 @@
+@testset "Test jutulModel" begin
+
+    @info "set up model"
+    n = (rand(3:5), rand(3:5), rand(3:5))
+    d = 10 .* (rand(), rand(), rand())
+    K = 200 * rand() * md * ones(n)
+    ϕ = rand()
+    model = jutulModel(n, d, ϕ, K1to3(K))
+
+    @test model.n == n
+    @test model.d == d
+    @test model.ϕ == ϕ
+    @test model.K == K1to3(K)
+
+    model1 = jutulModel(n, d, ϕ, K1to3(K))
+    @test model1 == model
+end

test/test_jutulState.jl

@@ -11,4 +11,11 @@ model, init_state = setup_model_state()
     init_state[rdm_idx] = rdm_num
     @test init_state[rdm_idx] == rdm_num
     @test vec(init_state) == init_state[1:end]
+
+    @info "test =="
+    init_state1 = deepcopy(init_state)
+    init_state1[1] = 0.2
+    @test init_state1 != init_state
+    init_state[1] = 0.2
+    @test init_state1 == init_state
 end