Atgeirr Flø Rasmussen
dc4274f4a2
Include nncs in threshold pressures.
...
This was left out when rebasing (it had been introduced in the flow etc. mains).
This also fixes a bug: the nnc thresholds should be inserted at the end of the
vector to be consistent with the operators, not at the beginning.
2015-12-21 11:12:55 +01:00
Atgeirr Flø Rasmussen
78dbb79ea4
Fix compile error for in-class member init.
...
Reported by Kai Bao.
2015-12-21 11:12:01 +01:00
Atgeirr Flø Rasmussen
bfcbd09488
Create and use FlowMainPolymer class.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
b156ce0b55
Create and use FlowMainSolvent class.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
39900761a8
Transform FlowMain to use CRTP.
...
Main content is now in FlowMainBase, which takes Implementation as
a template parameter. FlowMain inherits from FlowMainBase with itself
as Implementation template parameter. Only the createSimulator() method
is implemented in FlowMain (as opposed to in FlowMainBase). All subclasses
must implement createSimulator().
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
bb49ddbfc4
Improve comments.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
4d31a99f5b
Moved content of warnIfUnusedParams() into runSimulator().
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
4711fd3dfe
Complete refactoring of FlowMain.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
7a536570dc
Split out readDeckInput() method.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
4fae28f3d3
Split out setupOutput() method.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
64eef0609a
Split out setupParameters() method.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
966ace2c53
Split out printStartupMessage() method.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
c1bd7670c6
Refine OpenMP number-of-threads output.
...
Now each MPI rank will report, making it easier to see how
MPI and OpenMP interacts w.r.t. processes and threads.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
f7c96b4fc5
Split out function setupParallelism().
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
e3ceac44a6
Renamed flowMain.hpp -> FlowMain.hpp.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
abf5443f33
Replace flowMain() function with FlowMain class.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
b10b028aa1
Documented flowMain().
2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen
29d18261c6
Make multisegment flow variants use flowMain().
2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen
f02fd71404
Use Simulator::ReservoirState in flowMain().
2015-12-14 16:11:06 +01:00
Atgeirr Flø Rasmussen
51a03e6212
Extract content of flow main() to separate template function.
...
The function is templated on grid and simulator class, so this allows
flow and flow_mpi to be implemented without any macro tricks, instead
simply including and using different grid types.
2015-12-14 16:07:47 +01:00
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
