Atgeirr Flø Rasmussen
af980ed93c
Creates GridInit template class.
2015-12-14 16:07:46 +01:00
Atgeirr Flø Rasmussen
e74a36d939
Silence int vs. size_t warnings.
2015-12-14 15:55:30 +01:00
Tor Harald Sandve
dbdc42f599
Fix typo in BlackoilPropsAdFromDeck
2015-12-14 12:27:57 +01:00
Atgeirr Flø Rasmussen
bd82e5ade9
Merge pull request #554 from totto82/nnc_thpress
...
NNC and threshold pressure
2015-12-14 11:33:30 +01:00
Tor Harald Sandve
afbf5ff366
Add code to use the pinchProcessor
...
MinpvfillProps is only called if OPMFIL is true, while
the pinchProcessor is only called if OPMFIL is false.
Currently opmfil is hardcoded to true i.e.
The pinchProcessor is never called and the minpvfillProps is always
called.
2015-12-14 11:14:46 +01:00
Atgeirr Flø Rasmussen
d30147abfd
Merge pull request #555 from totto82/residualSaturations
...
Add methods for critial gas and gas in oil saturations
2015-12-11 13:08:54 +01:00
Tor Harald Sandve
4b66b0874e
Add methods for critial gas and gas in oil saturations
...
Methods that returns the scaled critical gas (SGCR) saturation and the
scaled critical gas in oil saturation (SOGCR) is added to
BlackoilPropsAdFromDeck and BlackoilPropsAdInterface
A test is added in test_boprops_ad and fluid.data is modified to make
the test non trivial.
2015-12-11 12:53:54 +01:00
Atgeirr Flø Rasmussen
73a26fb8dd
Merge pull request #558 from totto82/powerAD
...
Add power operator to AutoDiffBlock
2015-12-11 09:49:25 +01:00
Tor Harald Sanve
650fef5bc2
Add power operator to AutoDiffBlock
2015-12-10 10:30:28 +01:00
Markus Blatt
afc3ad3522
Guard access of well variable with asImpl().localWellsActive()
...
Since PR #541 the arrays cq_s, mob_perfcells, and b_perfcells are
empty if there are no wells in the domain of the process. This
caused segementation faults at various places where we compute
on the wells. With this commit we now guard this places using
asImpl().localWellsActive() and only using the array if the call
returns true.
2015-12-09 15:18:03 +01:00
Tor Harald Sanve
6883db77cf
Adapt to changes in the NNC class
2015-12-08 13:05:44 +01:00
Tor Harald Sandve
e3393c5ee9
Handle combination of threshold_pressure and nnc
...
The nncs threshold pressures are calculated and appended to the face
threshold pressures
2015-12-08 11:03:05 +01:00
Tor Harald Sandve
99ddc46318
Store the nncs in geoprops
2015-12-08 10:38:58 +01:00
Atgeirr Flø Rasmussen
ffc91bc35e
Remove unnecessary EclipseState argument from run().
2015-12-07 13:40:06 +01:00
Atgeirr Flø Rasmussen
e54f7ed2d7
Use warning suppression headers.
2015-12-07 13:40:06 +01:00
dr-robertk
bd8586b477
Merge pull request #541 from GitPaean/support_segment_well_rebased
...
Support multi-segment wells
2015-12-02 11:18:33 -07:00
Atgeirr Flø Rasmussen
241da90531
Merge pull request #547 from blattms/parallel-ilu
...
Parallel overlapping ILU0
2015-12-02 11:47:13 +01:00
Markus Blatt
cb9d566ec2
Added braces to one-line for loop.
2015-12-02 11:29:38 +01:00
Markus Blatt
99c1b988a7
Fixed typo "consistent consistent" -> consistent.
2015-12-01 15:13:22 +01:00
Markus Blatt
0da66bf45b
Removed more dead and code that was already commented out.
2015-12-01 15:11:27 +01:00
Markus Blatt
fd78f1c0b9
Moved includes to \*.cpp file.
2015-12-01 14:56:29 +01:00
Markus Blatt
4adf8487ea
Uses more speaking names for template parameter and adds more documentation.
2015-12-01 14:49:07 +01:00
Markus Blatt
e05e3fa478
Removes code that was commented out.
2015-12-01 14:48:35 +01:00
Markus Blatt
0fdd27267b
Adds empty lines around namespaces and comment about the end of a namespace.
2015-12-01 14:47:28 +01:00
Markus Blatt
dc1d7c526f
Moved ParallelOverlappingILU0 to its own file.
2015-12-01 14:41:06 +01:00
Kai Bao
5a23406d9e
naming M to Matrix for better readability in WellMultiSegment
2015-12-01 10:44:05 +01:00
Kai Bao
f7782c30b7
fixing compilation due to update of master.
2015-12-01 00:06:46 +01:00
Kai Bao
38a9dbd9ff
parallel running for flow_mutlisegment
...
SPE9 can be run in parallel now.
2015-12-01 00:06:46 +01:00
Kai Bao
4c73f3c01c
refactoring the init() of WellStateMultiSegment
...
to handle better when nw = 0
2015-12-01 00:06:46 +01:00
Kai Bao
0022bb8465
adding one missing #pragma line resulting from rebasing conflicts.
2015-12-01 00:06:46 +01:00
Kai Bao
8116424f6d
documenting the class WellMultiSegment
2015-12-01 00:06:46 +01:00
Atgeirr Flø Rasmussen
57511641e2
Remove unused data members.
2015-12-01 00:06:46 +01:00
Atgeirr Flø Rasmussen
a40d93a170
Comment out changes to residual output.
2015-12-01 00:06:46 +01:00
Atgeirr Flø Rasmussen
c825b599e5
Remove unused include.
2015-12-01 00:06:46 +01:00
Kai Bao
bcc97b44d8
refactoring the construction of WellMultiSegment
...
for better readability.
2015-12-01 00:06:46 +01:00
Kai Bao
c946749c73
addressing some old comments in WellMultiSegment
2015-12-01 00:06:46 +01:00
Kai Bao
a684c390f5
cleaning up SimulatorFullyImplicitBlackoilMultiSegment_impl
2015-12-01 00:06:46 +01:00
Kai Bao
31061c8331
cleaning up function computeWellConnectionPressures() for ms wells.
2015-12-01 00:06:46 +01:00
Kai Bao
cfa5faab4e
cleaning up comments in BlackoilMultiSegmentModel_impl
2015-12-01 00:06:46 +01:00
Kai Bao
f90b96abf6
removing the use of wops_ from the BlackoilModelBase in ms well
...
Also some cleaning up of comments in BlackoilMultiSegmentModel
2015-12-01 00:06:45 +01:00
Atgeirr Flø Rasmussen
61cccfebf8
Refactor updatState() to use numWellVars().
...
This allows us to use the base version of updateState().
2015-12-01 00:06:45 +01:00
Kai Bao
df30546841
not handling SHUT wells when generating wells_multisegment
...
it fixed the 7th time step running for Norne.
2015-12-01 00:06:45 +01:00
Kai Bao
9114b56e9b
cleaning up comments in WellMultiSegment and WellStateMultiSegment
2015-12-01 00:06:45 +01:00
Kai Bao
edf3c9b08c
optimizing the addWellControlEq() for ms wells.
2015-12-01 00:06:45 +01:00
Kai Bao
fcd31d74ac
restoring the original wellstate when solveWelleq fails.
2015-12-01 00:06:45 +01:00
Atgeirr Flø Rasmussen
233a275191
Made the solveWellEq() method return if it converged.
...
Also use this to avoid updating if not converged in the
multi-segment version.
2015-12-01 00:06:45 +01:00
Kai Bao
b6ede37ca3
WIP for fixing the solveWellEq running for ms wells.
...
refactoring needs to be done to finish it.
2015-12-01 00:06:45 +01:00
Atgeirr Flø Rasmussen
2055c94269
Implement solveWellEq() for multisegment model.
...
Note that this initial version has only been tested on regular wells!
2015-12-01 00:06:45 +01:00
Kai Bao
57d796ca68
not extracting the mob and b inside computeWellFlux() ms wells
2015-12-01 00:06:45 +01:00
Kai Bao
4b9064a0f8
optimizing the function computeSegmentPressuresDelta()
...
Further optimization is possible by introducing new variable for the
model to avoid recomputation.
2015-12-01 00:06:45 +01:00
