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

2228 Commits

Author SHA1 Message Date
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
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
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
2ebc20492d Add default producer BHP control when not given in deck. 
Default limit is 1 atm.
 2015-02-04 10:30:15 +01:00
Atgeirr Flø Rasmussen
9f4da3ad03 Rename directory opm/core/tof -> opm/core/flowdiagnostics. 2015-02-03 21:44:24 +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
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
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
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
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
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
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
94d08b3db6 Fixed size of zero vector passed as gpress. 2015-01-21 21:14:32 +01:00
Markus Blatt
566aee7896 Added methods for computing global reductions. 
We need to compute quite a few global reductions in the
Newton method of opm-autodiff. This commit adds the functionality
to compute several reductions combined using only one global
communication. Compiles and test succeeds with one or more process.
 2015-01-21 16:19:35 +01:00
Atgeirr Flø Rasmussen
1e0d2ec43e Added calculation of flow diagnostics quantities. 
New functions:
 - computeFandPhi()
 - computeLorenz()
 - computeSweep()

Also a unit test has been added for the new features.
 2015-01-21 14:58:44 +01:00
Atgeirr Flø Rasmussen
8e1041326e Added IncompTpfaSinglePhase class. 2015-01-20 15:47:50 +01:00
Atgeirr Flø Rasmussen
3d73bd3c72 Add IncompPropertiesSinglePhase class. 2015-01-20 15:47:50 +01:00
Atgeirr Flø Rasmussen
605d3e0d09 Make MinpvProcessor ignore inactive cells. 2015-01-19 15:44:13 +01:00
Robert K
e6f7b2762d AdaptiveTimeStepping: make output more easy to read. 2015-01-16 16:08:59 +01:00
Robert K
a6f00b90ac AdaptiveTimeStepping: Switch suggested time step to max of the previous taken substeps. 2015-01-16 16:08:59 +01:00
Robert K
f38b76abe9 AdaptiveSimulatorTimer: initialization of first time step size follows the same rule as 
for later steps.
PIDTimeStepControl: added maxgrowth factor which indicates the maximum allow groth of
                    the time step from one to the next value.
 2015-01-16 16:08:59 +01:00
Atgeirr Flø Rasmussen
f7bd6076e6 Merge pull request #720 from blattms/add-facetag-access-2 
Adds a free function to UgGridHelpers to access the face tag.
 2015-01-15 14:19:42 +01:00
Atgeirr Flø Rasmussen
75ae3c33a2 Merge pull request #713 from dr-robertk/PR/EclipseWriter-revision-to-write-substeps 
Introduce interface for SimulatorTimers and support writing of substeps with EclipseWriter.
 2015-01-15 13:52:22 +01:00
Robert K
d97f622f91 EclipseWriter: remove leftovers of WriterTimer. 
AdaptiveSimulatorTimer: use back instead of rbegin.
 2015-01-15 11:34:59 +01:00
Markus Blatt
9cf21d87ee Skip the pointer arithmetic. 
Bard was right that the iterator_range returns the underlying
native pointers. Therefore can write the computation much more
natural.
 2015-01-14 21:58:37 +01:00
Joakim Hove
a5f00298e0 Protecting against use of unassigned deck values. 2015-01-14 11:41:41 +01:00
Markus Blatt
1b6bbb035e Fixed bogus documentation of vanished cell_index. 2015-01-14 10:09:01 +01:00
Markus Blatt
cba54977bb Adds a free function to UgGridHelpers to access the face tag. 
To identify the face tag we use the iterator over the cell faces.
This provides all the information needed both for UG and CpGrid.
 2015-01-13 20:36:33 +01:00
Atgeirr Flø Rasmussen
7f8ae2a878 Merge pull request #718 from blattms/fixes-mulisym-minpvprocessor 
Avoid multiple symbol definitions for MinPvProcessor.
 2015-01-12 16:45:18 +01:00