Zeeuw
73445a3055
solves merging conflicts
2019-01-03 13:18:01 +01:00
WesselDeZeeuw
214c963177
correction to update_reference_data.sh file
2019-01-03 13:04:10 +01:00
WesselDeZeeuw
b3deeed165
Changed the compare and test files, to extend with a test case for the fetkovich aquifer
2019-01-03 13:04:10 +01:00
WesselZ
d6f1f1bd3d
Implementation of Fetkovich Aquifers. Makes changes to the files for BlackOilAquiferModel(_impl) and AquiferFetkovich file.
2019-01-03 13:04:10 +01:00
Kai Bao
bfc915849a
BHP limit is taken care of from parser side
...
WellsManager does not need to provide default bhp limit anymore.
2019-01-03 09:48:02 +01:00
Kai Bao
ecdb299671
handling the RESV well distr calculation correctly
...
more work has been done in the parser side, and the simulator side is
also updated accoridingly.
2019-01-03 09:48:02 +01:00
Kai Bao
9a6f390f38
Merge pull request #1691 from atgeirr/fix-missing-grat
...
Fix missing GRAT in switch.
2019-01-02 21:22:41 +01:00
Atgeirr Flø Rasmussen
9ba0184da4
Merge pull request #1676 from GitPaean/fixing_grid_indices
...
fixing grid_index for AquiferCarterTracy
2019-01-02 15:32:28 +01:00
Atgeirr Flø Rasmussen
10c77257ad
Fix missing GRAT in switch.
2019-01-02 15:29:22 +01:00
Kai Bao
b3f29de675
using compressed cell index for cellToConnectionIdx_ in AquiferCarterTracy
2019-01-02 14:59:12 +01:00
Kai Bao
dcf036e757
removing some white spaces.
2019-01-02 13:39:00 +01:00
Atgeirr Flø Rasmussen
7771725e4c
Merge pull request #1683 from GitPaean/using_msw_test_msw_model_1
...
adding --use-multisegment-well=true to msw-model-1 test
2019-01-02 12:51:03 +01:00
Tor Harald Sandve
625a4cd303
Merge pull request #433 from andlaus/conditional_temperature
...
ebos: only write out temperature in thermal runs
2018-12-21 12:48:54 +01:00
Andreas Lauser
af0d02b03d
use enableEnergy
consistently
...
thanks to [at]totto82 for noticing.
2018-12-21 10:07:58 +01:00
Andreas Lauser
0a1fa8de81
make it possible to explicitly compute the storage term of the previous time step
...
some weird hacks (hello, DR[SV]DT) cause a change of the storage term
in the first Newton-Raphson iteration compared to the solution of the
previous time level. In order to use the correct values, one thus must
explicitly recompute the storage term for the previous time step
instead of just reusing the result of the first Newton-Raphson
iteration of the current time step.
2018-12-20 15:52:06 +01:00
Tor Harald Sandve
4e65234acb
Add support for the Multz option ALL in PINCH
2018-12-20 12:56:10 +01:00
Bård Skaflestad
1f3a9cc84a
Fixed potential derefernce of end operator when applying EDITNNC.
2018-12-20 11:44:46 +01:00
Andreas Lauser
868f447f20
use the common API opm-material for functions
...
the way to get the result of an evaluation is by return value, i.e.,
z = fn.eval(x, y);
not by passing a separate argument to the eval() function like
fn.eval(x, y, z);
the `XYTabulated2DFunction` used the latter approach causing an API
inconsistency with all other tabulation classes in
opm-material. OPM/opm-material#319 fixes that but requires this mop-up
as a consequence.
2018-12-20 10:46:22 +01:00
Kai Bao
f5648b13a1
adding --use-multisegment-well=true to msw-model-1 test
2018-12-19 16:36:56 +01:00
Atgeirr Flø Rasmussen
483d6c50e1
Merge pull request #1681 from atgeirr/fix-shutting-new-well
...
Avoid opening well that was shut on same time step.
2018-12-17 11:47:31 +01:00
Andreas Lauser
6a29318adf
ebos: only write out temperature in thermal runs
2018-12-17 11:37:47 +01:00
Atgeirr Flø Rasmussen
a48fbac322
Merge pull request #1680 from GitPaean/flow_polymw_remake
...
adding the simulator for flow injectivity study
2018-12-17 10:26:41 +01:00
Kai Bao
3a55e4aac2
fixing grid_index for AquiferCarterTracy
...
adding the mapping from cartisian indices to the actual grid indices.
2018-12-14 15:36:49 +01:00
Kai Bao
0c42a179d5
makig StandardWellV can handle producer
...
now StandardWellV should be able to be used as the general Standard
Well.
2018-12-14 10:24:08 +01:00
Atgeirr Flø Rasmussen
b1c16e536b
Avoid opening well that was shut on same time step.
2018-12-14 10:04:59 +01:00
Kai Bao
76edcc0d91
addressing the second part of comments form PR#1680
2018-12-13 21:31:36 +01:00
Kai Bao
c4254240e2
addressing the first part of comments form PR#1680
...
there should be no functional change.
2018-12-13 13:29:59 +01:00
Tor Harald Sandve
af45c893cf
Merge pull request #445 from totto82/remove_nnc
...
Remove only nnc trans
2018-12-13 12:27:10 +01:00
Atgeirr Flø Rasmussen
51d85d25d1
Merge pull request #1678 from atgeirr/fix-throw-before-storing-report
...
Move throw-if-nan to after storing convergence report.
2018-12-13 11:15:03 +01:00
Tor Harald Sandve
a5499ce576
remove only small nnc trans
2018-12-13 11:00:27 +01:00
Kai Bao
1ddcfcb679
adding test for polymer_injectivity
2018-12-12 16:24:24 +01:00
Kai Bao
5535406b67
cleaning StandardWell and StandardWellV
...
to make them more comparable, so that we can do refactoring easier
later.
2018-12-12 15:58:15 +01:00
Kai Bao
c9d9023039
addressing reviewing comments from PR #444
2018-12-12 14:50:22 +01:00
Kai Bao
932e4d1bf1
cleaning up of the code
...
there should be no functionality change
2018-12-11 21:55:20 +01:00
Kai Bao
31c18bd70e
adding the functionality to track the polymer molecular weight
...
it is used to evaluate the water-polymer mixture viscosities
2018-12-11 21:55:20 +01:00
Kai Bao
167306169b
including the injectivity program to flow
2018-12-11 21:41:44 +01:00
Kai Bao
525caad508
finishing the function addWellContributions for StandardWellV
2018-12-11 21:40:47 +01:00
Kai Bao
612ac74b89
finish the injecivity functionality
...
the result looks okay
2018-12-11 21:40:47 +01:00
Kai Bao
391d31e1d6
adding the polymer molecular related to the well model
2018-12-11 21:40:47 +01:00
Kai Bao
7923628f83
adding the few injectivity related functions to StandardWellV
2018-12-11 21:40:47 +01:00
Kai Bao
a08216efd5
creating StandardWellV as the new well model
...
to employ dynamic-size Evalution, vectors and matrices.
2018-12-11 21:40:47 +01:00
Kai Bao
b079c0a1e5
adding flow_injecitivity executable target
2018-12-11 21:40:47 +01:00
Kai Bao
e1ede3c9d5
adding polymer molecular weight to BlackoilPhases and phaseUsageFromDeck
2018-12-11 21:31:47 +01:00
Kai Bao
93fb5a2c52
add a few fields related to injectivity to WellStateFullyImplicitBlackoil
...
to account for the water throughput, skin pressure and water velocity
for each perforation.
2018-12-11 21:31:47 +01:00
Atgeirr Flø Rasmussen
56cc37f255
Move throw-if-nan to after storing convergence report.
2018-12-11 13:10:22 +01:00
Atgeirr Flø Rasmussen
c26aed1d42
Merge pull request #436 from totto82/remove_small_trans
...
remove transmissibilities less then 1e-6 in the given unit system
2018-12-11 11:26:35 +01:00
Atgeirr Flø Rasmussen
39571de366
Merge pull request #443 from totto82/disableTracer
...
Add parameter for (dis)enable the tracer model
2018-12-10 11:40:48 +01:00
Tor Harald Sandve
704fbb7b60
Add parameter for (dis)enable the tracer model
...
The tracer model slows down the simulation time and is disabled by
default, until the performance is improved.
2018-12-10 11:13:35 +01:00
Atgeirr Flø Rasmussen
eeb17b460f
Merge pull request #1677 from joakim-hove/version
...
Add special case handling of commandline argument "--version"
2018-12-10 10:07:05 +01:00
Joakim Hove
7c6831f8b9
Add cmake test for the --version switch
2018-12-09 21:41:28 +01:00