OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,967 Commits 9 Branches 35 Tags 15 MiB
a1e5b55c3b
Commit Graph

4967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Atgeirr Flø Rasmussen
55b2320ded Merge pull request #743 from andlaus/add_forgotten_initializers 
PvtConstCompr: initialize the temperature vs viscosity table pointers in all constructors
 2015-02-03 17:47:27 +01:00
Andreas Lauser
8dce4982fc PvtConstCompr: initialize the temperature vs viscosity table pointers in all constructors 
this fixes opm-autodiff's "boprops_ad" unit test. thanks to
[at]atgeirr for pointing this out.
 2015-02-03 15:44:25 +01:00
Atgeirr Flø Rasmussen
23e00bd643 Merge pull request #740 from andlaus/temperature_dependent_viscosity 
PVT classes: implement temperature dependent viscosity
 2015-02-03 14:34:02 +01:00
Atgeirr Flø Rasmussen
18dbee8444 Merge pull request #742 from joakim-hove/connection-factor-value 
Use Value<double> for Connection Factor
 2015-02-03 13:45:16 +01:00
Joakim Hove
e435545eee Use Value<double> for Connection Factor 2015-02-03 13:10:38 +01:00
Andreas Lauser
c4ca344026 PVT classes: implement temperature dependent viscosity 
this is implemented such that if the simulation is unchanged,
viscosities are assumed to be not temperature dependent. (only if
pvtObject->set{Oil,Wat}visctTables() is called, temperature dependence
is considered.)
 2015-02-03 12:27:41 +01:00
Atgeirr Flø Rasmussen
034961c8ba Merge pull request #741 from joakim-hove/well-write-bug 
Fixed writing well information to the restart file
 2015-02-03 09:12:31 +01:00
Joakim Hove
67a218e61a Fixed writing well information to the restart file 
The original version of the code wrote 14 items per connection to the
ICON array, however when loading restart information the ERT well loader
currently expects to find segment information in item 15. Will now write
an additional segment id item for each connection.

In addition the code has been refactored to use operator[] to set
elements instead of push_back() which was used previously.
 2015-02-02 08:07:33 +01:00
Atgeirr Flø Rasmussen
e6b9158181 Merge pull request #738 from blattms/constify-parallelinformatio-workaround-eigen 
Constify parallelinformation and workaround Eigen's weirdness
 2015-01-30 20:35:33 +01:00
Markus Blatt
086c405e9d Do not rely on begin()/end() of the containers to compute reductions. 
One would think that such an assumption is safe in any case,
wouldn't one? But foen Eigen'S container this does not hold.
They do not provide STL compliant iterators, and access to them.
With this patch make the even stricter assumption that the containers
are random access and use operator[] instead of iterators.
 2015-01-30 16:10:41 +01:00
Atgeirr Flø Rasmussen
c9d3344adc Merge pull request #739 from dr-robertk/PR/bugfix-blackoilstate-equal 
BlackoilState: added forgotten rv variable to equal method.
 2015-01-30 11:36:06 +01:00
Robert K
e4ddabd9ad BlackoilState: added forgotten rv to equal method. 2015-01-29 11:07:24 +01:00
Markus Blatt
f544ccf308 Constified the compute reduction functions. 
These should and have to be used with a const object.
 2015-01-28 21:55:35 +01:00
Atgeirr Flø Rasmussen
0aebabf41e Merge pull request #737 from dr-robertk/PR/method-advance-for-timers 
Method advance for SimulatorTimers.
 2015-01-28 16:01:51 +01:00
Robert K
ef80032743 make documentation equal for all three classes. 2015-01-28 15:46:11 +01:00
Robert K
99e291d0ca SimulatorTimer...: added method advance which is the new interface for previously used 
operator++.
 2015-01-28 15:25:11 +01:00
Joakim Hove
dc544abe37 Merge pull request #735 from joakim-hove/wells-refdepth 
Using Parser to calculate well reference depth.
 2015-01-26 13:43:41 +01:00
Joakim Hove
82402eee00 Using Parser to calculate well reference depth. 2015-01-26 12:03:11 +01:00
Atgeirr Flø Rasmussen
f0f6706970 Merge pull request #732 from blattms/fixes-global-reductions 
Fixes global reductions
 2015-01-26 10:10:06 +01:00
Atgeirr Flø Rasmussen
29d4f8de0b Merge pull request #733 from blattms/fix-unused-variable 
Fixes some unused variable warnings.
 2015-01-26 10:06:21 +01:00
Markus Blatt
fefd52a8be Fixes some unused variable warnings. 2015-01-23 20:58:37 +01:00
Markus Blatt
8810c3e7fe Correctly compute the minimum and maximum values. 
As there are no functors for computing the minimum and maximum,
we convert the std::max and std::min function pointers to
functors (which is not really nice.) Previously we were somehow
tricked into using std::greater and std::less, which of course do
return true or false and not what we need. Additionally, do more
excessive testing with different ranges.
 2015-01-23 20:48:53 +01:00
Markus Blatt
2f211f5469 Do recurse in the recursive funtion computeGlobalReduction! 
Somehow this was missed and only the first entry in the tuple
was computed globally.
 2015-01-23 20:46:46 +01:00
Bård Skaflestad
6c25e04c9f Merge pull request #728 from blattms/global-reductions 
Added methods for computing global reductions.
 2015-01-23 17:28:12 +01:00
Markus Blatt
0fb801dadc Add missing return statements. 2015-01-23 16:38:08 +01:00
Markus Blatt
420586d40c Calm warnings about excessive semi-colons, unused variables, and missing declarations. 2015-01-23 16:36:48 +01:00
Markus Blatt
d5ea991847 Fixes formatting according to Atgeirr's coding style. 2015-01-23 14:56:15 +01:00
Bård Skaflestad
8f0b4714a5 Merge pull request #725 from atgeirr/minpv-use-actnum 
Make MinpvProcessor ignore inactive cells.
 2015-01-23 11:27:13 +01:00
Bård Skaflestad
114b64f23d Merge pull request #730 from atgeirr/compute-tof 
More features for flow diagnostics
 2015-01-23 10:40:43 +01:00
Atgeirr Flø Rasmussen
39ab778967 Reformat header for readability. 2015-01-23 09:13:43 +01:00
Atgeirr Flø Rasmussen
d910e9a9c5 Fix whitespace issues. 2015-01-23 09:12:15 +01:00
Atgeirr Flø Rasmussen
ab26c115a9 Add missing #include <algorithm>. 2015-01-22 13:02:16 +01:00
Atgeirr Flø Rasmussen
4394a15f5e Merge pull request #729 from andlaus/build_system_update 
Build system update
 2015-01-22 09:09:03 +01:00