Skip to content

Commit

Permalink
Merge pull request #28 from daavid00/diffagas
Browse files Browse the repository at this point in the history
Use mass fraction diffusion coefficients
  • Loading branch information
daavid00 authored Feb 5, 2024
2 parents e7f25c0 + 98605e1 commit 11aa6bf
Show file tree
Hide file tree
Showing 16 changed files with 141 additions and 110 deletions.
18 changes: 9 additions & 9 deletions examples/finner_grids/spe11a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cartesian #Type of grid (cartesian, tensor, or corner-point)
120 #If cartesian, number of z cells [-]; if tensor, variable array of z-refinment; if corner-point, fix array of z-refinment (18 entries)
20 20 #Temperature bottom and top rig [C]
1.2 110000 1 #Datum [m], pressure at the datum [Pa], and multiplier for the permeability in the z direction [-]
1e-9 1.6e-5 1e-2 #Diffusion (in liquid and gas) [m^2/s] and dispersion [m] (dispersion requires a Flow version newer than 17-11-2023)
1e-9 1.6e-5 #Diffusion (in liquid and gas) [m^2/s]
0 0 #Rock specific heat and density (for spe11b/c)
0 0 0 #Added pore volume on top boundary (for spe11a [if 0, free flow bc]), pore volume on lateral boundaries, and width of buffer cell [m] (for spe11b/c)
0 0 #Elevation of the parabola [m] (for spe11c)
Expand All @@ -33,14 +33,14 @@ SWI6 0.10 SNI6 0.1 PEN6 1 PENMAX6 9.5e4 NPOINTS6 1000
SWI7 0 SNI7 0 PEN7 0 PENMAX7 9.5e4 NPOINTS7 2

"""Properties rock"""
"""K [mD], phi [-]"""
PERM1 44529.9988 PORO1 0.44
PERM2 506624.985 PORO2 0.43
PERM3 1013249.97 PORO3 0.44
PERM4 2026499.95 PORO4 0.45
PERM5 4052999.88 PORO5 0.43
PERM6 10132499.7 PORO6 0.46
PERM7 0 PORO7 0
"""K [mD], phi [-], disp [m] (dispersion requires a Flow version newer than 17-11-2023)"""
PERM1 44529.9988 PORO1 0.44 DISP1 1e-2
PERM2 506624.985 PORO2 0.43 DISP2 1e-2
PERM3 1013249.97 PORO3 0.44 DISP3 1e-2
PERM4 2026499.95 PORO4 0.45 DISP4 1e-2
PERM5 4052999.88 PORO5 0.43 DISP5 1e-2
PERM6 10132499.7 PORO6 0.46 DISP6 1e-2
PERM7 0 PORO7 0 DISP7 0

"""Wells position"""
"""radius (0 to use the SOURCE keyword instead of well keywords, this requires a Flow version newer than 23-01-2024), x, y, and z position [m] (final positions as well for spe11c)"""
Expand Down
18 changes: 9 additions & 9 deletions examples/finner_grids/spe11b.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cartesian #Type of grid (cartesian, tensor, or corner-point)
120 #If cartesian, number of z cells [-]; if tensor, variable array of z-refinment; if corner-point, fix array of z-refinment (18 entries)
70 40 #Temperature bottom and top rig [C]
300 3e7 0.1 #Datum [m], pressure at the datum [Pa], and multiplier for the permeability in the z direction [-]
1e-9 2e-8 10 #Diffusion (in liquid and gas) [m^2/s] and dispersion [m] (dispersion requires a Flow version newer than 17-11-2023)
1e-9 2e-8 #Diffusion (in liquid and gas) [m^2/s]
8.5e-1 2500 #Rock specific heat and density (for spe11b/c)
0 5e4 1 #Added pore volume on top boundary (for spe11a [if 0, free flow bc]), pore volume on lateral boundaries, and width of buffer cell [m] (for spe11b/c)
0 0 #Elevation of the parabola and back [m] (for spe11c)
Expand All @@ -33,14 +33,14 @@ SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 1000
SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2

"""Properties rock"""
"""K [mD], phi [-], thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 THCONR2 1.25
PERM3 202.650 PORO3 0.20 THCONR3 1.25
PERM4 506.625 PORO4 0.20 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 THCONR7 2.00
"""K [mD], phi [-], disp [m] (dispersion requires a Flow version newer than 17-11-2023), thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 DISP1 10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 DISP2 10 THCONR2 1.25
PERM3 202.650 PORO3 0.20 DISP3 10 THCONR3 1.25
PERM4 506.625 PORO4 0.20 DISP4 10 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 DISP5 10 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 DISP6 10 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 DISP7 0 THCONR7 2.00

"""Wells radius and position"""
"""radius (0 to use the SOURCE keyword instead of well keywords, this requires a Flow version newer than 23-01-2024), x, y, and z position [m] (final positions as well for spe11c)"""
Expand Down
18 changes: 9 additions & 9 deletions examples/finner_grids/spe11c.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ corner-point #Type of grid (cartesian, tensor, or corner-point)
5,3,1,2,3,1,2,2,5,2,4,4,2,4,2,8,8,3 #If cartesian, number of z cells [-]; if tensor, variable array of z-refinment; if corner-point, fix array of z-refinment (18 entries)
70 36.12 #Temperature bottom and top rig [C]
300 3e7 0.1 #Datum [m], pressure at the datum [Pa], and multiplier for the permeability in the z direction [-]
1e-9 2e-8 10 #Diffusion (in liquid and gas) [m^2/s] and dispersion [m] (dispersion requires a Flow version newer than 17-11-2023)
1e-9 2e-8 #Diffusion (in liquid and gas) [m^2/s]
8.5e-1 2500 #Rock specific heat and density (for spe11b/c)
0 5e4 1 #Added pore volume on top boundary (for spe11a [if 0, free flow bc]), pore volume on lateral boundaries, and width of buffer cell [m] (for spe11b/c)
150 10 #Elevation of the parabola and back [m] (for spe11c)
Expand All @@ -33,14 +33,14 @@ SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 1000
SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2

"""Properties rock"""
"""K [mD], phi [-], thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 THCONR2 1.25
PERM3 202.650 PORO3 0.20 THCONR3 1.25
PERM4 506.625 PORO4 0.20 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 THCONR7 2.00
"""K [mD], phi [-], disp [m] (dispersion requires a Flow version newer than 17-11-2023), thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 DISP1 10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 DISP2 10 THCONR2 1.25
PERM3 202.650 PORO3 0.20 DISP3 10 THCONR3 1.25
PERM4 506.625 PORO4 0.20 DISP4 10 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 DISP5 10 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 DISP6 10 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 DISP7 0 THCONR7 2.00

"""Wells radius and position"""
"""radius (0 to use the SOURCE keyword instead of well keywords, this requires a Flow version newer than 23-01-2024), x, y, and z position [m] (final positions as well for spe11c)"""
Expand Down
18 changes: 9 additions & 9 deletions examples/hello_world/spe11a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tensor #Type of grid (cartesian, tensor, or corner-point)
5,9,13,20,13,9,5 #If cartesian, number of z cells [-]; if tensor, variable array of z-refinment; if corner-point, fix array of z-refinment (18 entries)
20 20 #Temperature bottom and top rig [C]
1.2 110000 1 #Datum [m], pressure at the datum [Pa], and multiplier for the permeability in the z direction [-]
1e-9 1.6e-5 1e-2 #Diffusion (in liquid and gas) [m^2/s] and dispersion [m] (dispersion requires a Flow version newer than 17-11-2023)
1e-9 1.6e-5 #Diffusion (in liquid and gas) [m^2/s]
0 0 #Rock specific heat and density (for spe11b/c)
0 0 0 #Added pore volume on top boundary (for spe11a [if 0, free flow bc]), pore volume on lateral boundaries, and width of buffer cell [m] (for spe11b/c)
0 0 #Elevation of the parabola [m] (for spe11c)
Expand All @@ -33,14 +33,14 @@ SWI6 0.10 SNI6 0.1 PEN6 1 PENMAX6 2500 NPOINTS6 100
SWI7 0 SNI7 0 PEN7 0 PENMAX7 2500 NPOINTS7 2

"""Properties rock"""
"""K [mD], phi [-]"""
PERM1 44529.9988 PORO1 0.44
PERM2 506624.985 PORO2 0.43
PERM3 1013249.97 PORO3 0.44
PERM4 2026499.95 PORO4 0.45
PERM5 4052999.88 PORO5 0.43
PERM6 10132499.7 PORO6 0.46
PERM7 0 PORO7 0
"""K [mD], phi [-], disp [m] (dispersion requires a Flow version newer than 17-11-2023)"""
PERM1 44529.9988 PORO1 0.44 DISP1 1e-2
PERM2 506624.985 PORO2 0.43 DISP2 1e-2
PERM3 1013249.97 PORO3 0.44 DISP3 1e-2
PERM4 2026499.95 PORO4 0.45 DISP4 1e-2
PERM5 4052999.88 PORO5 0.43 DISP5 1e-2
PERM6 10132499.7 PORO6 0.46 DISP6 1e-2
PERM7 0 PORO7 0 DISP7 0

"""Wells position"""
"""radius (0 to use the SOURCE keyword instead of well keywords, this requires a Flow version newer than 23-01-2024), x, y, and z position [m] (final positions as well for spe11c)"""
Expand Down
18 changes: 9 additions & 9 deletions examples/hello_world/spe11b.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ corner-point #Type of grid (cartesian, tensor, or corner-point)
2,2,1,1,2,1,3,2,6,2,3,2,2,8,4,8,8,1 #If cartesian, number of z cells [-]; if tensor, variable array of z-refinment; if corner-point, fix array of z-refinment (18 entries)
70 40 #Temperature bottom and top rig [C]
300 3e7 0.1 #Datum [m], pressure at the datum [Pa], and multiplier for the permeability in the z direction [-]
1e-9 2e-8 0 #Diffusion (in liquid and gas) [m^2/s] and dispersion [m] (dispersion requires a Flow version newer than 17-11-2023)
1e-9 2e-8 #Diffusion (in liquid and gas) [m^2/s]
8.5e-1 2500 #Rock specific heat and density (for spe11b/c)
0 5e4 1 #Added pore volume on top boundary (for spe11a [if 0, free flow bc]), pore volume on lateral boundaries, and width of buffer cell [m] (for spe11b/c)
0 0 #Elevation of the parabola and back [m] (for spe11c)
Expand All @@ -33,14 +33,14 @@ SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 100
SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2

"""Properties rock"""
"""K [mD], phi [-], thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 THCONR2 1.25
PERM3 202.650 PORO3 0.20 THCONR3 1.25
PERM4 506.625 PORO4 0.20 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 THCONR7 2.00
"""K [mD], phi [-], disp [m] (dispersion requires a Flow version newer than 17-11-2023), thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 DISP1 10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 DISP2 10 THCONR2 1.25
PERM3 202.650 PORO3 0.20 DISP3 10 THCONR3 1.25
PERM4 506.625 PORO4 0.20 DISP4 10 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 DISP5 10 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 DISP6 10 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 DISP7 0 THCONR7 2.00

"""Wells radius and position"""
"""radius (0 to use the SOURCE keyword instead of well keywords, this requires a Flow version newer than 23-01-2024), x, y, and z position [m] (final positions as well for spe11c)"""
Expand Down
18 changes: 9 additions & 9 deletions examples/hello_world/spe11c.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cartesian #Type of grid (cartesian, tensor, or corner-point)
12 #If cartesian, number of z cells [-]; if tensor, variable array of z-refinment; if corner-point, fix array of z-refinment (18 entries)
70 36.12 #Temperature bottom and top rig [C]
300 3e7 0.1 #Datum [m], pressure at the datum [Pa], and multiplier for the permeability in the z direction [-]
1e-9 2e-8 0 #Diffusion (in liquid and gas) [m^2/s] and dispersion [m] (dispersion requires a Flow version newer than 17-11-2023)
1e-9 2e-8 #Diffusion (in liquid and gas) [m^2/s]
8.5e-1 2500 #Rock specific heat and density (for spe11b/c)
0 5e4 1 #Added pore volume on top boundary (for spe11a [if 0, free flow bc]), pore volume on lateral boundaries, and width of buffer cell [m] (for spe11b/c)
150 10 #Elevation of the parabola and back [m] (for spe11c)
Expand All @@ -33,14 +33,14 @@ SWI6 0.10 SNI6 0.1 PEN6 2560.18 PENMAX6 3e7 NPOINTS6 100
SWI7 0 SNI7 0 PEN7 0 PENMAX7 3e7 NPOINTS7 2

"""Properties rock"""
"""K [mD], phi [-], thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 THCONR2 1.25
PERM3 202.650 PORO3 0.20 THCONR3 1.25
PERM4 506.625 PORO4 0.20 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 THCONR7 2.00
"""K [mD], phi [-], disp [m] (dispersion requires a Flow version newer than 17-11-2023), thconr [W m-1 K-1]"""
PERM1 0.10132 PORO1 0.10 DISP1 10 THCONR1 1.90
PERM2 101.324 PORO2 0.20 DISP2 10 THCONR2 1.25
PERM3 202.650 PORO3 0.20 DISP3 10 THCONR3 1.25
PERM4 506.625 PORO4 0.20 DISP4 10 THCONR4 1.25
PERM5 1013.25 PORO5 0.25 DISP5 10 THCONR5 0.92
PERM6 2026.50 PORO6 0.35 DISP6 10 THCONR6 0.26
PERM7 1e-5 PORO7 1e-6 DISP7 0 THCONR7 2.00

"""Wells radius and position"""
"""radius (0 to use the SOURCE keyword instead of well keywords, this requires a Flow version newer than 23-01-2024), x, y, and z position [m] (final positions as well for spe11c)"""
Expand Down
10 changes: 5 additions & 5 deletions src/pyopmspe11/templates/co2/spe11a.mako
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ BCCON
/
% endif

% if dic["version"] == "master" and dic["dispersion"] > 0 and dic["flow_version"] != "2023.10":
DISPERC
${dic['noCells'][0]*dic['noCells'][1]*dic['noCells'][2]}*${dic["dispersion"]} /
% if dic["version"] == "master" and sum(dic["dispersion"]) > 0 and dic["flow_version"] != "2023.10":
INCLUDE
'DISPERC.INC' /
% endif

% if dic["spe11aBC"] > 0:
Expand All @@ -113,10 +113,10 @@ INCLUDE

% if dic['model'] == 'complete' and (dic["diffusion"][0] + dic["diffusion"][1]) > 0:
% if dic["co2store"] == "gaswater":
DIFFCWAT
DIFFAWAT
${dic["diffusion"][0]} ${dic["diffusion"][0]} /

DIFFCGAS
DIFFAGAS
${dic["diffusion"][1]} ${dic["diffusion"][1]} /
% else:
DIFFC
Expand Down
10 changes: 5 additions & 5 deletions src/pyopmspe11/templates/co2/spe11b.mako
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ BCCON
/
% endif

% if dic["version"] == "master" and dic["dispersion"] > 0 and dic["flow_version"] != "2023.10":
DISPERC
${dic['noCells'][0]*dic['noCells'][1]*dic['noCells'][2]}*${dic["dispersion"]} /
% if dic["version"] == "master" and sum(dic["dispersion"]) > 0 and dic["flow_version"] != "2023.10":
INCLUDE
'DISPERC.INC' /
% endif
----------------------------------------------------------------------------
PROPS
Expand All @@ -117,10 +117,10 @@ INCLUDE
% if dic['model'] == 'complete':
% if dic["co2store"] == "gaswater":
% if dic["flow_version"] != "2023.10" and (dic["diffusion"][0] + dic["diffusion"][1]) > 0:
DIFFCWAT
DIFFAWAT
${dic["diffusion"][0]} ${dic["diffusion"][0]} /

DIFFCGAS
DIFFAGAS
${dic["diffusion"][1]} ${dic["diffusion"][1]} /
% endif
% else:
Expand Down
10 changes: 5 additions & 5 deletions src/pyopmspe11/templates/co2/spe11c.mako
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ BCCON
/
% endif

% if dic["version"] == "master" and dic["dispersion"] > 0 and dic["flow_version"] != "2023.10":
DISPERC
${dic['noCells'][0]*dic['noCells'][1]*dic['noCells'][2]}*${dic["dispersion"]} /
% if dic["version"] == "master" and sum(dic["dispersion"]) > 0 and dic["flow_version"] != "2023.10":
INCLUDE
'DISPERC.INC' /
% endif
----------------------------------------------------------------------------
PROPS
Expand All @@ -98,10 +98,10 @@ INCLUDE
% if dic['model'] == 'complete':
% if dic["co2store"] == "gaswater":
% if dic["flow_version"] != "2023.10" and (dic["diffusion"][0] + dic["diffusion"][1]) > 0:
DIFFCWAT
DIFFAWAT
${dic["diffusion"][0]} ${dic["diffusion"][0]} /

DIFFCGAS
DIFFAGAS
${dic["diffusion"][1]} ${dic["diffusion"][1]} /
% endif
% else:
Expand Down
18 changes: 13 additions & 5 deletions src/pyopmspe11/utils/inputvalues.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""

import csv
import sys
from io import StringIO
from subprocess import PIPE, Popen
import numpy as np
Expand Down Expand Up @@ -104,7 +105,14 @@ def readthefirstpart(lol, dic):
row = list((lol[13][0].strip()).split())
# Diffusion (in liquid and gas) [m^2/s] to [m^2/day]
dic["diffusion"] = [float(row[0]) * 86400, float(row[1]) * 86400]
dic["dispersion"] = float(row[2]) # Dispersion [m]
if len(row) > 2:
print(
"Dispersion is now set per facie (Lines 37 to 43 in the configuration "
+ "file), not anymore in Line 14, e.g., see https://github.com/OPM/pyopm"
+ "spe11/blob/main/examples/finner_grids/spe11b.txt. Please update the "
+ "configuration file and try again to run pyopmspe11."
)
sys.exit()
row = list((lol[14][0].strip()).split())
# Rock specific heat and density (for spe11b/c)
dic["rockExtra"] = [float(row[0]), float(row[1])]
Expand Down Expand Up @@ -142,7 +150,7 @@ def readthesecondpart(lol, dic):
lol[dic["index"] + 3][0]
) # Capillary pressure saturation function [Pa]
dic["index"] += 7
for name in ["rock", "safu", "rockCond"]:
for name in ["rock", "safu", "dispersion", "rockCond"]:
dic[name] = []
dic["tabdims"] = 1
for i in range(dic["noSands"]): # Saturation function values
Expand All @@ -166,13 +174,13 @@ def readthesecondpart(lol, dic):
row[3],
]
)
dic["dispersion"].append(float(row[5]))
if dic["spe11"] != "spe11a":
dic["rockCond"].append(
[
float(row[5]) * 86400.0 / 1e3,
float(row[7]) * 86400.0 / 1e3,
]
)

dic["index"] += 3 + dic["noSands"]
column = []
columnf = []
Expand Down Expand Up @@ -233,7 +241,7 @@ def check_deck(dic):
+ "deck.\nEither select the co2store gasoil implementation or build "
+ "flow from the master GitHub branches.\n"
)
if dic["dispersion"] > 0:
if sum(dic["dispersion"]) > 0:
print(
"\nDispersion is not supported in flow 2023.10.\nThen dispersion is "
+ "not included in the generated deck.\nBuild flow from the master "
Expand Down
14 changes: 11 additions & 3 deletions src/pyopmspe11/utils/mapproperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ def structured_handling_spe11a(dic):
)
dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0])
dic["poro"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][1])
dic["disperc"].append(
f"{dic['dispersion'][int(dic['ids_gmsh'][fgl][0])-1]}"
)
centers.append(
str([dic["xmx_center"][i], dic["ymy_center"][0], dic["zmz_center"][k]])[
1:-1
Expand Down Expand Up @@ -160,6 +163,9 @@ def structured_handling_spe11bc(dic):
dic["thconr"].append(
f"{dic['rockCond'][int(dic['ids_gmsh'][fgl][0])-1][0]}"
)
dic["disperc"].append(
f"{dic['dispersion'][int(dic['ids_gmsh'][fgl][0])-1]}"
)
if i == 0 and (
int(dic["ids_gmsh"][fgl][0]) != 1 and int(dic["ids_gmsh"][fgl][0]) != 7
):
Expand All @@ -172,7 +178,7 @@ def structured_handling_spe11bc(dic):
dic["poro"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][1])
centers.append(str([dic["xmx_center"][i], dic["ymy_center"][0], z_c])[1:-1])
for j in range(dic["noCells"][1] - 1):
for names in ["satnum", "poro", "permx", "thconr"]:
for names in ["satnum", "poro", "permx", "disperc", "thconr"]:
dic[f"{names}"].extend(dic[f"{names}"][-dic["noCells"][0] :])
for i_i in range(dic["noCells"][0]):
sensor1.append(
Expand Down Expand Up @@ -253,6 +259,7 @@ def corner_point_handling_spe11a(dic):
dic = boxes(dic, dic["xyz"][0], dic["xyz"][2], dic["ijk"][0], dic["satnum"][-1])
dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0])
dic["poro"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][1])
dic["disperc"].append(f"{dic['dispersion'][int(dic['ids_gmsh'][fgl][0])-1]}")
centers.append(str([dic["xyz"][0], dic["ymy_center"][0], dic["xyz"][2]])[1:-1])
dic["pop1"] = pd.Series(sensor1).argmin()
dic["pop2"] = pd.Series(sensor2).argmin()
Expand Down Expand Up @@ -355,6 +362,7 @@ def corner_point_handling_spe11bc(dic):
dic["satnum"].append(dic["ids_gmsh"][fgl][0])
dic = boxes(dic, dic["xyz"][0], z_c, dic["ijk"][0], dic["satnum"][-1])
dic["permx"].append(dic["rock"][int(dic["ids_gmsh"][fgl][0]) - 1][0])
dic["disperc"].append(f"{dic['dispersion'][int(dic['ids_gmsh'][fgl][0])-1]}")
dic["thconr"].append(f"{dic['rockCond'][int(dic['ids_gmsh'][fgl][0])-1][0]}")
if dic["ijk"][0] == 0 and (
int(dic["ids_gmsh"][fgl][0]) != 1 and int(dic["ids_gmsh"][fgl][0]) != 7
Expand All @@ -369,7 +377,7 @@ def corner_point_handling_spe11bc(dic):
centers.append(str([dic["xyz"][0], dic["ymy_center"][0], z_c])[1:-1])
if dic["ijk"][0] > 0 and dic["ijk"][0] == dic["noCells"][0] - 1:
for j in range(dic["noCells"][1] - 1):
for names in ["satnum", "poro", "permx", "thconr"]:
for names in ["satnum", "poro", "permx", "disperc", "thconr"]:
dic[f"{names}"].extend(dic[f"{names}"][-dic["noCells"][0] :])
for i_i in range(dic["noCells"][0]):
z_c = ztemp[i_i]
Expand Down Expand Up @@ -514,7 +522,7 @@ def positions(dic):
"""
dic["sensorijk"] = [[] for _ in range(len(dic["sensors"]))]
dic = getfacies(dic)
for names in ["satnum", "poro", "permx", "thconr", "fipnum"]:
for names in ["satnum", "poro", "permx", "thconr", "fipnum", "disperc"]:
dic[f"{names}"] = []
if dic["grid"] == "corner-point":
if dic["use"] == "opm":
Expand Down
Loading

0 comments on commit 11aa6bf

Please sign in to comment.