OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 12:36:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,179 Commits 24 Branches 102 Tags 84 MiB
96938548c1
Commit Graph

3179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
d14de856fe Merge pull request #564 from atgeirr/improve-errmsg 
Improve threshold pressure mismatch error message.
 2016-01-04 10:54:41 +01:00
Atgeirr Flø Rasmussen
2505183887 Improve threshold pressure mismatch error message. 2015-12-28 09:22:53 +01:00
Atgeirr Flø Rasmussen
5315a0dfba Merge pull request #561 from atgeirr/refactor-extended-mains 
Refactor main functions of all Flow variants.
 2015-12-22 15:20:59 +01:00
Atgeirr Flø Rasmussen
6839b811f2 Make polymer solver use direct solver only. 
The interleaved solver should work for this case, but does not currently.
 2015-12-21 15:05:32 +01:00
Atgeirr Flø Rasmussen
8507427d83 Use correct syntax for logical not. 2015-12-21 14:55:33 +01:00
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
b420cccfc3 Add warning about simulating without WPOLYMER. 
Warning was in the main() of flow_polymer.cpp,
but will disappear from there after refactoring.
 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
8e2cb4161a Merge pull request #553 from atgeirr/refactor-flow-main 
Minor refactoring in flow.cpp
 2015-12-18 13:47:24 +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
460f0cb451 Use the new flowMain() function. 
Also add it to the CMake file list.
 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
be9b6a3cd2 Unconditionally instantiate the (possibly fake) MPI helper. 
This reduces the difference between flow and flow_mpi. For builds
without MPI, the fake helper from Dune is instantiated, which has
the same interface.
 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen
7c5256031c Use GridInit in flow.cpp. 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
dc3a290327 Merge pull request #560 from atgeirr/silence-warning 
Silence int vs. size_t warnings.
 2015-12-14 15:56:21 +01:00
Atgeirr Flø Rasmussen
e74a36d939 Silence int vs. size_t warnings. 2015-12-14 15:55:30 +01:00
Bård Skaflestad
05bd5def58 Merge pull request #559 from totto82/fix_critialSat 
Fix typo in BlackoilPropsAdFromDeck
 2015-12-14 12:41:47 +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
Atgeirr Flø Rasmussen
630454691e Merge pull request #557 from blattms/fix-pr541-for-parallel 
Guard access of well variable with asImpl().localWellsActive()
 2015-12-11 09:40:47 +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
Bård Skaflestad
cb3ed9aa4f Merge pull request #551 from atgeirr/silence-warnings 
Remove unneeded function parameter for SimulatorBase::run(), fix warnings.
 2015-12-07 16:13:25 +01:00
Atgeirr Flø Rasmussen
ef07b8daef Update run() calls in polymer fully implicit sims. 2015-12-07 13:45:07 +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