OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,119 Commits 24 Branches 102 Tags 90 MiB
37dc877074
Commit Graph

1367 Commits

Author SHA1 Message Date
Robert Kloefkorn
37dc877074 CPRPreconditioner: extract creation of AMG into a function. 2016-02-12 12:14:02 +01:00
Atgeirr Flø Rasmussen
eb228835c2 Merge pull request #577 from totto82/solventMiscible 
Add miscible effects to the solvent model
 2016-02-12 11:21:56 +01:00
Tor Harald Sandve
0a30d912e8 Some more cleanup adressing PR comments. 2016-02-12 11:02:03 +01:00
Tor Harald Sandve
dee96db6b2 Cleaning and adding comments 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
c85f10046c Density and viscosity as inputs instead of computed in computeMassFlux 
Density and viscosity are given as input instead of calculated inside
computeMassFlux. This allow for modifying the properties prior to
calling computeMassFlux which avoids code duplication in the solvent
implementation.
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
0745be3eba Various bugfixes in computing effective ToddLongstaff parameters 
The most significant bug was in the computation of effective saturation
fraction for the gas phase. The current implementation differs from the
manual.
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
cf29eb9aa4 Adapt to changes in the TableContainer 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
a38964c641 Some cleaning 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
13117153a9 Use effective properties in the computation of well segment densities 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
beafccc038 Refactor the ToddLongstaffModel in separate function 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
b8e20917cc Add Todd and Longstaff model 
Add method to calculateEffectiveProperties (viscosity and density)
using the Todd and Longstaff model.

The effective properties are stored in mu_eff_ and b_eff_ in the
BlackoilSolventModel and accessed using fluidReciprocFVF and
fluidViscosity
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
17554b4921 Add support for TLMIXPAR 
Add support for Todd-Longstaff mixing paramters
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
38c8cd981e BUGFIX. Fix surfaceDensity calculations 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
1e64409f28 Scaling of relative permeability endpoints by the miscibility function 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
bcb0abd9c9 Fix well input and prepare for critical saturations 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
e448548d5a Some refactoring to avoid code duplication 
computeMassFlux in BlackoilSolventModel_impl.hpp is refactored to avoid
code duplication
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
238e7c19f3 Add support for miscibilty in the relperms 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
bbee43ef7a Refactor computeMassFlux in the SolventModel 
The computeMassFlux in the solventModel is refactored to allow for
modification of relperms for all phases.
 2016-02-12 10:42:26 +01:00
Tor Harald Sandve
3d2b7f23c0 Read MSFN and SOF2 and create accociated function 
- makeAD() is added to avoid copying
 2016-02-12 10:42:26 +01:00
Atgeirr Flø Rasmussen
3b294beb51 Merge pull request #575 from dr-robertk/PR/make-compile-with-current-master 
DuneMatrix: adjust to changes in dune 3.0
 2016-02-12 10:23:40 +01:00
Atgeirr Flø Rasmussen
885e3aa561 Merge pull request #576 from andlaus/opm-material_PVT 
use the blackoil PVT classes from opm-material instead of the opm-core ones
 2016-02-11 22:39:38 +01:00
Andreas Lauser
13d2f35493 BlackoilPropsAdFromDeck: fix a few typos 
these definitively do not change the results.
 2016-02-11 17:07:24 +01:00
Atgeirr Flø Rasmussen
a356a100f7 Fix minor issue with const POD requirements. 
A user-defined default constructor is required in this situation
unless explicitly using the empty-brace-init syntax.

See discussion here:
http://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
 2016-02-11 16:17:17 +01:00
chflo
399b4f11c4 restart flow 2016-02-10 14:47:55 +01:00
Andreas Lauser
64c94aebc7 use the blackoil PVT classes from opm-material instead of the opm-core ones 2016-01-29 12:56:19 +01:00
Robert Kloefkorn
a000c5a0b1 DuneMatrix: adjust to changes in dune 3.0 2016-01-28 13:50:25 -07:00
Jørgen Kvalsvik
850f0884f1 Improve includes from opm-parser 
Adopting to opm-parser PR#661, add previously missing includes.

OPM/opm-parser#661
 2016-01-26 13:32:34 +01:00
Jørgen Kvalsvik
087710df7d Fixes includes wrt opm-parser PR-656 
Several files stopped compiling due to relying on opm-parser headers doing
includes. From opm-parser PR-656 https://github.com/OPM/opm-parser/pull/656
this assumption is no longer valid.
 2016-01-20 15:11:30 +01:00
Joakim Hove
b41f70cad0 Merge pull request #567 from joakim-hove/table-column 
Table column
 2016-01-08 15:29:21 +01:00
Atgeirr Flø Rasmussen
7e1af01ad7 Fix change in signature of extractPvtTableIndex() in solvent props. 2016-01-08 14:47:41 +01:00
Joakim Hove
24601480e3 Using new Table api. 2016-01-08 13:57:38 +01:00
Joakim Hove
833f5d053f Avoid using Deck. 
Removed incorrect use of Deck for polymer and solvent properties.
 2016-01-08 13:57:37 +01:00
chflo
41b928a190 OPM-163: Changed signature for method extractPvtTableIndex 2016-01-07 16:43:38 +01:00
Atgeirr Flø Rasmussen
2505183887 Improve threshold pressure mismatch error message. 2015-12-28 09:22:53 +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
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