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

5083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
e14d01b9b4 Fix bug relating to well control manipulation. 2015-01-21 21:15:26 +01:00
Atgeirr Flø Rasmussen
94d08b3db6 Fixed size of zero vector passed as gpress. 2015-01-21 21:14:32 +01:00
Atgeirr Flø Rasmussen
2a8beb1abc Parameter trace_start now controls trace direction. 
Allowable values are Injectors or Producers.
This affects both tof and tracer, and properly switches
flux directions for Producers.
 2015-01-21 20:55:23 +01:00
Robert K
5fdfd1aca1 add cmake module for ZOLTAN 
also, link it to alugrid if it has been detected.
 2015-01-21 16:35:19 +01:00
Robert K
3421ce27d5 fix metis check for gentoo installed METIS version. 2015-01-21 16:31:31 +01:00
Andreas Lauser
53d09b1581 eWoms: silence an annoying bogous deprecation warning on Dune 2.4 2015-01-21 16:29:37 +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
79ad0c1417 Can specify injector or producer tracers. 2015-01-21 15:28:27 +01:00
Atgeirr Flø Rasmussen
da9651f409 Remove unneeded output (also to file). 2015-01-21 15:04:41 +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
0f6d2104d4 Use simplified bhp-control pattern for tof computations. 2015-01-21 10:23:45 +01:00
Atgeirr Flø Rasmussen
a0f07e4421 Use single-phase props and solvers, only support deck input. 2015-01-20 15:47:50 +01:00
Atgeirr Flø Rasmussen
8e1041326e Added IncompTpfaSinglePhase class. 2015-01-20 15:47:50 +01:00
Atgeirr Flø Rasmussen
6df973a218 Use IncompPropertiesSinglePhase in compute_tof. 
Work in progress. The rationale is that only single-phase flow solve
is required for tof and tracer computations.
 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
faa8e00f0f Merge pull request #723 from dr-robertk/PR/adaptivetimestepping-improvement 
AdaptiveTimeStepping improvements.
 2015-01-20 09:45:50 +01:00
Atgeirr Flø Rasmussen
8aa9657a11 Update MinpvProcessor test program with API changes. 2015-01-20 08:34:52 +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
541affefe3 Merge pull request #721 from joakim-hove/EQLOPTS-default-fix 
Protecting against use of unassigned deck values.
 2015-01-14 16:22:46 +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
Markus Blatt
f7622f0e71 Avoid multiple symbol definitions for MinPvProcessor. 
The non-template class MinpvProcessor contains all function
definitions inside of the header file without inlining. The
results in the symbols being in the library of opm-core and
in case of using CpGrid an addtional occurence in other
libraries (opm-autodiff?).

This commit changes this by simply inlining all these functions.

Note that another (better?) option would be to move at least
the bigger once into a cpp file.
 2015-01-12 16:35:03 +01:00
Atgeirr Flø Rasmussen
3c9add40fb Merge pull request #715 from joakim-hove/check-completion-state 
Check completion state
 2015-01-12 13:34:07 +01:00
Robert K
01fe222c2b Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps 2015-01-12 12:47:40 +01:00
Joakim Hove
f9bce38852 Wellsmanager will check completion status 
With this commit the WellsManager will check the status of completions
before adding them to the internal struct wells
datastructure. Completions can be in the four states:

  OPEN, SHUT, AUTO, POPN

Completions with state == SHUT will be ignored, wheras the wellsmanager
will throw  if the states AUTO or POPN are encountered. The WELOPEN
keyword can also have the value 'STOP'; for completions that is
translated to 'SHUT' by Schedule object.
 2015-01-12 12:43:45 +01:00
Joakim Hove
634c70a090 Pure white-space change 2015-01-12 12:43:44 +01:00
Joakim Hove
a0bcc19b28 Merge pull request #716 from joakim-hove/714-fixup 
Added missing enum rename
 2015-01-12 12:42:26 +01:00
Joakim Hove
461e53e891 Added missing enum rename 2015-01-12 12:41:56 +01:00
Robert K
0ecff82940 Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps 2015-01-12 12:23:48 +01:00