From 66b58541a228c3365978ad2d404ba76e9b1ccdf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olav=20M=C3=B8yner?= <olav.moyner@gmail.com>
Date: Sun, 1 Dec 2024 18:08:06 +0100
Subject: [PATCH] Fix to tests

---
 src/test_utils/setup_multimodel.jl | 15 +++++++++------
 test/multimodel.jl                 |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/test_utils/setup_multimodel.jl b/src/test_utils/setup_multimodel.jl
index 482b942c..cff4758e 100644
--- a/src/test_utils/setup_multimodel.jl
+++ b/src/test_utils/setup_multimodel.jl
@@ -4,6 +4,7 @@ function simulate_mini_wellcase(::Val{:compositional_2ph_3c};
         output_path = nothing,
         nstep = 12*5,
         total_time = 30.0*si_unit(:day)*nstep,
+        simple_well = true,
         kwarg...
     )
     # Some useful constants
@@ -14,9 +15,9 @@ function simulate_mini_wellcase(::Val{:compositional_2ph_3c};
     g = CartesianMesh(dims, (2000.0, 1500.0, 50.0))
     domain = reservoir_domain(g, permeability = 1e-13, porosity = 0.1)
     ## Set up a vertical well in the first corner, perforated in all layers
-    prod = setup_vertical_well(domain, nx, 1, name = :Producer);
+    prod = setup_vertical_well(domain, nx, 1, name = :Producer, simple_well = simple_well);
     ## Set up an injector in the upper left corner
-    inj = setup_vertical_well(domain, 1, 1, name = :Injector);
+    inj = setup_vertical_well(domain, 1, 1, name = :Injector, simple_well = simple_well);
 
     co2 = MolecularProperty(0.0440, 7.38e6, 304.1, 9.412e-5, 0.224)
     c1 = MolecularProperty(0.0160, 4.60e6, 190.6, 9.863e-5, 0.011)
@@ -74,6 +75,7 @@ function simulate_mini_wellcase(::Val{:immiscible_2ph};
         permeability = 0.1*9.869232667160130e-13,
         nstep = 12*5,
         total_time = 30.0*si_unit(:day)*nstep,
+        simple_well = true,
         kwarg...)
     # Some useful constants
     day = 3600*24
@@ -83,9 +85,9 @@ function simulate_mini_wellcase(::Val{:immiscible_2ph};
     g = CartesianMesh(dims, (2000.0, 1500.0, 50.0))
     domain = reservoir_domain(g, permeability = permeability, porosity = 0.1)
     ## Set up a vertical well in the first corner, perforated in all layers
-    P = setup_vertical_well(domain, 1, 1, name = :Producer);
+    P = setup_vertical_well(domain, 1, 1, name = :Producer, simple_well = simple_well);
     ## Set up an injector in the upper left corner
-    I = setup_well(domain, [(nx, ny, 1)], name = :Injector);
+    I = setup_well(domain, [(nx, ny, 1)], name = :Injector, simple_well = simple_well);
     ## Set up a two-phase immiscible system and define a density secondary variable
     phases = (LiquidPhase(), VaporPhase())
     rhoLS = 1000.0
@@ -143,6 +145,7 @@ function simulate_mini_wellcase(::Val{:bo_spe1};
         output_path = nothing,
         nstep = 12*5,
         total_time = 30.0*si_unit(:day)*nstep,
+        simple_well = true,
         kwarg...
     )
     # Some useful constants
@@ -155,9 +158,9 @@ function simulate_mini_wellcase(::Val{:bo_spe1};
     Darcy = 9.869232667160130e-13
     domain = reservoir_domain(g, permeability = 0.1*Darcy, porosity = 0.1)
     ## Set up a vertical well in the first corner, perforated in all layers
-    P = setup_vertical_well(domain, 1, 1, name = :Producer);
+    P = setup_vertical_well(domain, 1, 1, name = :Producer, simple_well = simple_well);
     ## Set up an injector in the upper left corner
-    I = setup_well(domain, [(nx, ny, 1)], name = :Injector);
+    I = setup_well(domain, [(nx, ny, 1)], name = :Injector, simple_well = simple_well);
     ## Set up a two-phase immiscible system and define a density secondary variable
     setup = JutulDarcy.blackoil_bench_pvt(:spe1)
     pvt = setup[:pvt]
diff --git a/test/multimodel.jl b/test/multimodel.jl
index d8d65c18..0e3c098b 100644
--- a/test/multimodel.jl
+++ b/test/multimodel.jl
@@ -4,7 +4,7 @@ using Test
 import JutulDarcy: simulate_mini_wellcase
 
 function test_compositional_with_wells(; kwarg...)
-    states, = simulate_mini_wellcase(Val(:compositional_2ph_3c); kwarg...)
+    states, = simulate_mini_wellcase(Val(:compositional_2ph_3c); simple_well = false, kwarg...)
     @testset "Compositional with wells" begin
         @testset "Reservoir" begin
             res = states[end][:Reservoir]
@@ -33,7 +33,7 @@ function test_compositional_with_wells(; kwarg...)
 end
 
 function test_immiscible_with_wells(; kwarg...)
-    states, = simulate_mini_wellcase(Val(:immiscible_2ph); kwarg...)
+    states, = simulate_mini_wellcase(Val(:immiscible_2ph); simple_well = false, kwarg...)
     @testset "Immiscible with wells" begin
         @testset "Reservoir" begin
             res = states[end][:Reservoir]
@@ -55,7 +55,7 @@ function test_immiscible_with_wells(; kwarg...)
 end
 
 function test_blackoil_with_wells(; kwarg...)
-    states, = simulate_mini_wellcase(Val(:bo_spe1); kwarg...)
+    states, = simulate_mini_wellcase(Val(:bo_spe1); simple_well = false, kwarg...)
     @testset "Blackoil with SPE1 PVT" begin
         @testset "Reservoir" begin
             res = states[end][:Reservoir]
@@ -86,7 +86,7 @@ function test_perforation_mask()
     g = CartesianMesh(dims, (2000.0, 1500.0, 50.0))
     Darcy = 9.869232667160130e-13
     domain = reservoir_domain(g, permeability = 0.1*Darcy, porosity = 0.1)
-    P = setup_vertical_well(domain, 1, 1, name = :Producer);
+    P = setup_vertical_well(domain, 1, 1, name = :Producer, simple_well = false);
     phases = (LiquidPhase(), VaporPhase())
     rhoLS = 1000.0
     rhoGS = 100.0