Merge pull request #219 from pmgbergen/dfn_transport

Dfn transport
pmgbergen · Feb 21, 2019 · 38a9a8d · 38a9a8d
2 parents 669972c + 6ea62d6
commit 38a9a8d
Show file tree

Hide file tree

Showing 63 changed files with 4,500 additions and 366 deletions.
diff --git a/examples/example4/test_dual_varying_k.py b/examples/example4/test_dual_varying_k.py
@@ -101,8 +101,8 @@ def main(N):
 
     up = sps.linalg.spsolve(A_flow + A_source, b_flow + b_source)
 
-    u = solver_flow.extract_flux(g, up)
-    p = solver_flow.extract_pressure(g, up)
+    u = solver_flow.extract_flux(g, up, data)
+    p = solver_flow.extract_pressure(g, up, data)
     #    P0u = solver_flow.project_flux(g, u, data, keyword="flow")
 
     diam = np.amax(g.cell_diameters())

diff --git a/examples/example4/test_dual_varying_k_surface.py b/examples/example4/test_dual_varying_k_surface.py
@@ -104,8 +104,8 @@ def main(N):
 
     up = sps.linalg.spsolve(A_flow + A_source, b_flow + b_source)
 
-    u = solver_flow.extract_flux(g, up)
-    p = solver_flow.extract_pressure(g, up)
+    u = solver_flow.extract_flux(g, up, data)
+    p = solver_flow.extract_pressure(g, up, data)
     #    P0u = solver_flow.project_flux(g, u, data)
 
     diam = np.amax(g.cell_diameters())

diff --git a/examples/example4/test_dual_varying_k_surface_1.py b/examples/example4/test_dual_varying_k_surface_1.py
@@ -93,8 +93,8 @@ def main(N):
 
     up = sps.linalg.spsolve(A_flow + A_source, b_flow + b_source)
 
-    u = solver_flow.extract_flux(g, up)
-    p = solver_flow.extract_pressure(g, up)
+    u = solver_flow.extract_flux(g, up, data)
+    p = solver_flow.extract_pressure(g, up, data)
     P0u = solver_flow.project_flux(g, u, data)
 
     diam = np.amax(g.cell_diameters())

diff --git a/examples/example4/test_mpfa_varying_k.py b/examples/example4/test_mpfa_varying_k.py
@@ -94,7 +94,7 @@ def main(N):
     # Choose and define the solvers
     solver = pp.Mpfa("flow")
     A, b_flux = solver.assemble_matrix_rhs(g, data)
-    _, b_source = pp.Integral("flow").assemble_matrix_rhs(g, data)
+    _, b_source = pp.ScalarSource("flow").assemble_matrix_rhs(g, data)
     p = sps.linalg.spsolve(A, b_flux + b_source)
 
     diam = np.amax(g.cell_diameters())

diff --git a/examples/example4/test_mpfa_varying_k_surface.py b/examples/example4/test_mpfa_varying_k_surface.py
@@ -100,7 +100,7 @@ def main(N):
     # Choose and define the solvers
     solver = pp.Mpfa("flow")
     A, b_flux = solver.assemble_matrix_rhs(g, data)
-    _, b_source = pp.Integral("flow").assemble_matrix_rhs(g, data)
+    _, b_source = pp.ScalarSource("flow").assemble_matrix_rhs(g, data)
     p = sps.linalg.spsolve(A, b_flux + b_source)
 
     diam = np.amax(g.cell_diameters())

diff --git a/examples/example4/test_mpfa_varying_k_surface_1.py b/examples/example4/test_mpfa_varying_k_surface_1.py
@@ -87,7 +87,7 @@ def main(N):
     # Choose and define the solvers
     solver = pp.Mpfa("flow")
     A, b_flux = solver.assemble_matrix_rhs(g, data)
-    _, b_source = pp.Integral("flow").assemble_matrix_rhs(g, data)
+    _, b_source = pp.ScalarSource("flow").assemble_matrix_rhs(g, data)
     p = sps.linalg.spsolve(A, b_flux + b_source)
 
     diam = np.amax(g.cell_diameters())

diff --git a/examples/example5/test_upwind_examples.py b/examples/example5/test_upwind_examples.py
@@ -175,7 +175,7 @@ def funp_ex(pt):
 
         up = sps.linalg.spsolve(D_flow + D_source, b_flow + b_source)
 
-        p, u = solver.extract_pressure(g, up), solver.extract_flux(g, up)
+        p, u = solver.extract_pressure(g, up, data), solver.extract_flux(g, up, data)
         P0u = solver.project_flux(g, u, data)
 
         save = pp.Exporter(g, "darcy", folder)