OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,000 Commits 9 Branches 35 Tags
9755eb4887f6954bd22693283b74724fefaba6cc
Commit Graph
5000 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 9755eb4887 Merge pull request #764 from blattms/uggridhelpers-completion 
Moves all functions that do not depend on Eigen to Opm::UgGridHelpers.  [1/3]
 2015-03-02 18:49:49 +01:00
Markus Blatt 71056f45d6 Renames ADCellVolumesTraits to CellVolumeIteratorTraits. 2015-03-02 11:15:08 +01:00
Markus Blatt adc499b036 Moves all functions that do not depend on Eigen to Opm::UgGridHelpers. 2015-03-02 11:15:08 +01:00
Atgeirr Flø Rasmussen 0b2cd4efa9 Merge pull request #763 from atgeirr/fix-warning 
Fix unneeded-internal-declaration warning.
 2015-03-02 10:34:33 +01:00
Atgeirr Flø Rasmussen 18fc452ef0 Fix unneeded-internal-declaration warning. 
Again related to anonymous namespace function only being used
in template functions.
 2015-03-02 10:28:55 +01:00
Atgeirr Flø Rasmussen e1f6e396a8 Merge pull request #762 from atgeirr/fix-minor-doc-issue 
Doc fix: face -> cell.
 2015-02-20 14:52:21 +01:00
Atgeirr Flø Rasmussen 60ae384ba8 Doc fix: face -> cell. 2015-02-20 14:51:03 +01:00
Atgeirr Flø Rasmussen bac806d5a3 Merge pull request #761 from blattms/generic_eqil 
Ported initStateEquil to using the GridHelpers.
 2015-02-20 14:44:59 +01:00
Markus Blatt 3cc072b320 Put spaces around operators. 2015-02-20 14:30:06 +01:00
Markus Blatt 55d26b358c Rely on auto instead of querying the explicit type 
via e.g. typename UgGridHelpers::Face2VerticesTraits<Grid>::Type
 2015-02-20 14:29:05 +01:00
Markus Blatt ec2b0e180e Ported initStateEquil to using the GridHelpers. 
Currently the keyword EQUIL is not supported by the fully
implicit blackoil simulator when using CpGrid. This
commit is a first step towards this as it makes the
implementation of initStateEquil generic.
 2015-02-20 09:39:50 +01:00
Markus Blatt 7cebb3905b Adds funcionality to access the vertices of the faces and their coordinates. 
This is needed for a grid agnostic implementation of EQUIL.
 2015-02-20 09:35:29 +01:00
Atgeirr Flø Rasmussen 735c4a7819 Merge pull request #760 from blattms/unsigned-signed-comp-parallel-istl 
Prevents unsigned-signed-comparison warnings for container with signed size
 2015-02-19 09:26:24 +01:00
Markus Blatt d5180c793a Prevents unsigned-signed-comparison warnings for container with signed size. 
Well, you never know. There are containers that use a signed integer
for storing its size. This results in a warning about comparing signed with
unsigned integers. This commit prevents this by explicitly casting the size
to std::size_t.
 2015-02-19 09:13:39 +01:00
Atgeirr Flø Rasmussen 1fef49c2e1 Merge pull request #758 from atgeirr/fix-warnings 
Fix warnings (and small API change)
 2015-02-18 13:16:01 +01:00
Atgeirr Flø Rasmussen 37bba7e3ae Merge pull request #759 from totto82/fix_horizontalscaling 
BUG: use the scaled water saturation
 2015-02-18 13:15:17 +01:00
Tor Harald Sandve 09a15c6e58 BUG: use the scaled water saturation 2015-02-18 08:13:49 +01:00
Atgeirr Flø Rasmussen 1ff48cb87a Complete function argument cleanup. 2015-02-17 13:56:02 +01:00
Atgeirr Flø Rasmussen eb82269900 Remove unused argument from several functions. 2015-02-17 10:28:11 +01:00
Atgeirr Flø Rasmussen 4a1a14d1da Suppress unused argument warning. 2015-02-17 10:27:44 +01:00
Atgeirr Flø Rasmussen 13df6b91b7 Suppress unused argument warning. 2015-02-17 10:27:19 +01:00
Atgeirr Flø Rasmussen dcc9fe5f41 Use C++ explicit default initialization. 
Avoids warning from -Wmissing-field-initializers.
 2015-02-17 10:24:03 +01:00
Atgeirr Flø Rasmussen 0895eb37e6 Merge pull request #756 from chflo/opm-166 
OPM-166: Use SimulationConfig instead of Deck to get threshold pressure
 2015-02-16 12:49:53 +01:00
Atgeirr Flø Rasmussen 8e4a5dfb3f Merge pull request #755 from blattms/istl-consistent-rhs 
Makes right hand side passed to linear solver consistent.
 2015-02-16 12:48:28 +01:00
chflo c7cbb4ea12 opm-166: Changes after review 2015-02-16 11:59:16 +01:00
chflo 0e2f786480 OPM-166: Use SimulationConfig instead of Deck to get threshold pressure 2015-02-16 08:43:47 +01:00
Atgeirr Flø Rasmussen 1315be7be6 Merge pull request #752 from atgeirr/compute-well-pairs 
Improvements for flow diagnostic tools
 2015-02-15 12:49:29 +01:00
Markus Blatt a1e5b55c3b [fixup] Use the correct function. 
This should have been in the las commit and should be added there before
merging.
 2015-02-13 11:00:28 +01:00
Markus Blatt a31fae4507 Makes right hand side passed to linear solver consistent. 
Due to the size of the overlap layer and the discretization scheme
the rhs might not contain correct values for overlap cells. This
commit makes sure they are correct by an additional communication step.
 2015-02-12 21:00:32 +01:00
Atgeirr Flø Rasmussen 8b96b18c6c Merge pull request #753 from joakim-hove/install-fixup 
Install ParallelIstlInformation.hpp
 2015-02-12 12:52:48 +01:00
Joakim Hove a959c578e1 Install ParallelIstlInformation.hpp 2015-02-12 12:21:30 +01:00
Atgeirr Flø Rasmussen c56d69cb8a Fix treatment of source terms for backwards tracing. 2015-02-12 11:13:29 +01:00
Atgeirr Flø Rasmussen 0de85da487 Compute and output well pairs. 
Only if already computing tracer information.
 2015-02-12 10:13:33 +01:00
Joakim Hove d6bf9d3a36 Merge pull request #750 from qilicun/support_minpvf 
Support minpvf.
 2015-02-12 09:34:28 +01:00
Liu Ming ea98e431bc adapt to api changes of opm-parser. 2015-02-12 16:04:41 +08:00
Atgeirr Flø Rasmussen fbdc0ab9bb Compute both directions always in compute_tof. 2015-02-11 16:00:24 +01:00
Atgeirr Flø Rasmussen 37fa48cfbe Added computeWellPairs() function. 2015-02-11 14:03:47 +01:00
Atgeirr Flø Rasmussen 4639aa0be2 Merge pull request #751 from dr-robertk/PR/adaptive-timestepping-use-average 
AdaptiveTimeStepping: improvements.
 2015-02-10 14:44:04 +01:00
Robert K c52f2cc621 AdaptiveTimeStepping: remove initial_fraction (use restart factor instead) and use 
average of previously used time steps to suggest next time step.
 2015-02-10 13:10:39 +01:00
Liu Ming 4d7309b1bf Support minpvf. 2015-02-09 11:25:09 +08:00
Atgeirr Flø Rasmussen b1ab170219 Merge pull request #746 from dr-robertk/PR/adaptive-timestepping-bugfixes 
Adaptive timestepping improvements.
 2015-02-06 14:27:44 +01:00
Robert K fbaa790e70 AdaptiveSimulatorTimer: -improvement in time step adjustment near end of time interval 
-max time step parameter

PIDTimeStepControl --> TimeStepControl:
- added simple iteration count time step control
- bug fix in PIDAndIterationCountTimeStepControl

AdaptiveTimeStepping: apply the above changes.
 2015-02-06 13:59:50 +01:00
Atgeirr Flø Rasmussen e7ac697e17 Merge pull request #747 from blattms/copyable-properties 
Makes BlackoilPropertiesFromDeck copyable.
 2015-02-06 13:38:34 +01:00
Markus Blatt cb4bb025f7 Improve the documentation a bit. 2015-02-05 15:43:48 +01:00
Markus Blatt 37f9d5d14e Use correct name for the method parameter. 2015-02-05 15:43:22 +01:00
Markus Blatt d6f63f7d0c Makes BlackoilPropertiesFromDeck copyable. 
We need this for the parallel sim_fibo_ad_cp, where we will need
to point to the same parts in two copies without duplicating data.
 2015-02-05 15:41:02 +01:00
Atgeirr Flø Rasmussen e7ead1aceb Merge pull request #745 from atgeirr/add-default-bhp-control 
Add default producer BHP control when not given in deck.
 2015-02-05 13:31:20 +01:00
Atgeirr Flø Rasmussen 2ebc20492d Add default producer BHP control when not given in deck. 
Default limit is 1 atm.
 2015-02-04 10:30:15 +01:00
Bård Skaflestad ef2f4257bf Merge pull request #744 from atgeirr/rename-tof-flowdiagnostics 
Rename directory opm/core/tof -> opm/core/flowdiagnostics.
 2015-02-03 20:37:05 -06:00
Atgeirr Flø Rasmussen 9f4da3ad03 Rename directory opm/core/tof -> opm/core/flowdiagnostics. 2015-02-03 21:44:24 +01:00