OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 06:52:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,475 Commits 24 Branches 102 Tags 90 MiB
3bcfc905bd
Commit Graph

3475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
696dfc23ee Account for variable change in 2.4.1 
Due to the upcomming release the name changes (j->j_, nnz->nnz_)already appear
in 2.4.1. This commit now checks for 2.4.1 and newer instead of 3.0 and newer.
 2016-02-16 19:17:27 +00:00
Robert Kloefkorn
75ffd897da AutoDiffBlock: revert changes in operator /. 
equalSparsityPattern: also include outer index in check.
 2016-02-16 17:18:04 +01:00
Robert Kloefkorn
23036e8096 Merge remote-tracking branch 'upstream/master' into PR/fast-sparse-add 2016-02-16 15:25:10 +01:00
Robert Kloefkorn
9661973387 Also check outer ptr. 2016-02-16 15:24:52 +01:00
Atgeirr Flø Rasmussen
a6c8db34e0 Merge pull request #584 from jepebe/travis 
Added Travis support
 2016-02-16 11:05:54 +01:00
Robert Kloefkorn
4df4c9147a fastSparseProduct.hpp --> fastSparseOperations.hpp 2016-02-16 10:25:57 +01:00
Robert Kloefkorn
743fad877a remove unused typedef. 2016-02-16 10:25:57 +01:00
Robert Kloefkorn
2eebf73e1a computeWellFlux: use operator -= when possible. 2016-02-16 10:25:57 +01:00
Robert Kloefkorn
98c49fd52f AutoDiffMatrix: use operator += to add matrices 2016-02-16 10:25:57 +01:00
Robert Kloefkorn
fadf5528e3 squash 2016-02-16 10:25:56 +01:00
Robert Kloefkorn
d5b6566e06 AutoDiffMatrix: use fastSparse{Add,Substract} when sparsisty patterns match. 2016-02-16 10:25:56 +01:00
Atgeirr Flø Rasmussen
704603e2b2 Merge pull request #578 from dr-robertk/PR/amg-for-interleaved 
AMG for Interleaved solver and other goodies.
 2016-02-16 10:15:55 +01:00
Jean-Paul Balabanian
5b313aff76 Added Travis support 2016-02-15 16:06:50 +01:00
Andreas Lauser
e775df6d23 fix the build 
it broke because EclipseState::get*GridProperty() now returns a
pointer to a constant object.
 2016-02-15 15:06:05 +01:00
Tor Harald Sandve
b02589316f Add support for MISC regions 
- element wise power operator impemented in AutoDiffBlock
- TL parameters are given pr cell
 2016-02-15 14:44:14 +01:00
Tor Harald Sandve
9328bd5af5 Support pvt and saturation regions in SolventPropsAdFromDeck 2016-02-15 10:07:47 +01:00
Robert Kloefkorn
530c0fe57f MatrixBlock: cleanup invert implementation to be less confusing. 2016-02-12 12:17:01 +01:00
Robert Kloefkorn
3aa8ed200f NewtonBlackoilInterleaved: increase maximal allowed iteration to 75. 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
37e49a62c8 BlackoilModelBase: use single precision for solver when dt < 20 days. 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
e3b578d685 NewtonIterationBlackoilInterleaved: single precision can be used whether UMFpack is 
there or not.
 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
4111797822 BlackoilModelBase: added parameter singlePrecision and print residual to large at right 
place.
 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
915177979c SimulatorBase: also show total time at each time step for performance comparison. 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
82d508727f MatrixBlock: added function firstmatrixelement. 
NewtonBlackoilInterleaved: some cleanup and variable naming.
 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
783f158c93 NewtonBlackoilInterleaved: anable the use of AMG preconditioner. 2016-02-12 12:14:02 +01:00
Robert Kloefkorn
31812bd2f9 NewtonBlackoilInterleaved: add solver option for single precision. 2016-02-12 12:14:02 +01:00
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
2d7b9f7663 Merge pull request #580 from atgeirr/master 
Fix minor issue with const POD requirements.
 2016-02-11 16:21:49 +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
dr-robertk
00a6a6c9be Merge pull request #565 from chflo/OPM-188-restart 
Start Flow from restart file
 2016-02-10 15:04:39 +01:00