Commit Graph

4896 Commits

Author SHA1 Message Date
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
Joakim Hove
326e192926 Merge pull request #714 from joakim-hove/check-completion-state
Added WellCompletion namespace
2015-01-12 12:12:03 +01:00
Joakim Hove
5d0a76e728 Added WellCompletion namespace 2015-01-12 12:10:51 +01:00
Robert K
65a314db92 cleanup: reportStepIdx --> writeStepIdx.
startDate     --> startDateTime
         removal of debug output.
2015-01-09 16:22:03 +01:00
Robert K
6eeecbb02b - adjust OutputWriter to SimulatorTimerInterface
- remove WriterTimer from EclipseWriter and use SimulatorTimerInterface
- adjust to the above in AdaptiveTimeStepping.
2015-01-09 16:22:03 +01:00
Robert K
4d1a2ad918 Introduce an interface for SimulatorTimer and AdaptiveSimulatorTimer.
currentDateTime and currentPosixTime are default implementations.
2015-01-09 16:21:20 +01:00
Robert K
10cffa770b EclipseWriter: allow for writing of substeps in addition to report steps. 2015-01-09 16:21:03 +01:00
Atgeirr Flø Rasmussen
1a430f76db Merge pull request #709 from totto82/fix_stoppedwells2
Add support for stopped wells
2015-01-09 13:16:05 +01:00
Tor Harald Sandve
ed0854bc88 Fix comments. 2015-01-09 09:10:10 +01:00
Tor Harald Sandve
a3f658f3b1 Add warning to c solvers when stopped wells occur
Stopped wells are treated as shut wells in the c solvers in opm-core.
I.e they are completly isolated from the domain.
2015-01-09 09:10:10 +01:00
Tor Harald Sandve
cf142969c8 Renaming well is shut to well is stopped.
Rename the the meaning for shut as whats used in Eclipse.
STOP: Well stopped off above the formation. I.e. allow for flow in the
well.
SHUT: Well completely isolated from the formation. The well is removed
from the well list.
2015-01-09 09:10:10 +01:00
Tor Harald Sandve
57fb32de68 Modify the well manager test as we now support stopped wells.
We no longer expect an exception when we meet stopped wells.
2015-01-09 09:10:10 +01:00
Tor Harald Sandve
9f64449aa8 Support stopped wells
The given control is applied to the stopped well, and the status is set
to not open. (i.e closed, but currently named shut)
2015-01-09 09:10:10 +01:00
Tor Harald Sandve
183d18e78e Add test case for stopped wells
The test check that the rates are set to zero for stopped wells.
2015-01-09 09:10:10 +01:00
Bård Skaflestad
0820cab627 Merge pull request #711 from atgeirr/eikonal-solver
Solver for the anisotropic Eikonal equation using fast marching method
2015-01-07 11:00:51 +01:00
Atgeirr Flø Rasmussen
14bc0aa7ee Use dummy test if anisotropic eikonal solver unavailable. 2015-01-07 10:20:49 +01:00
Atgeirr Flø Rasmussen
ab567ba4e9 Put reformatted error message in anonymous namespace. 2015-01-07 10:16:13 +01:00
Atgeirr Flø Rasmussen
7ed65b8ae0 Make compilation of class depend on Boost.Heap availablility.
If boost version is too old, the API is still the same and the
class will build, but throws upon construction.
2015-01-07 09:49:47 +01:00
Atgeirr Flø Rasmussen
27e88a54f2 Fix anisotropy closeness test.
The old test was simply wrong: it computed the M-distance and compared
to the grid radius, which becomes dependent on the scaling of the
metric M. The corrected test in isClose() depends on the anisotropy
ratio of M and the grid radius.
2015-01-02 15:22:02 +01:00
Atgeirr Flø Rasmussen
ad4de2af0f Make isClose() use actual grid and metric data.
Note that current implementation is somewhat ad-hoc, and not
in line with the algorithm of the paper.
2014-12-29 12:28:30 +01:00
Atgeirr Flø Rasmussen
7d4f44b2d7 Add a utility for actually running the eikonal solver. 2014-12-29 12:28:30 +01:00
Atgeirr Flø Rasmussen
06b83d6864 Modify test to succeed.
No longer test for (unattainable) exact values. Use actual
computed value instead. This makes the test a regression
test rather than a truth test.
2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
2e2ad711e5 Whitespace fix. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
8cc68a231c Add computeValueUpdate() to avoid recomputing. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
16ad2d0396 Uncomment second test.
Test fails, it requires exact match which is too strict.
2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
1415384146 Change order of steps in algorithm to avoid rework. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
eeae67c647 Follow renaming of function. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
696d51deb7 Fix bug in test.
Also add (inactive) second test.
2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
c10e28478f Fix bug in distance derivative function. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
86655f1962 Work in progress. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
1ddb0abc89 Initial versions of compute functions done.
Still has bugs.
2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
89b4ecb193 Solver logic finished.
Methods isClose(), computeFromTri() and computeFromLine() are still dummies.
2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
c0fbb8ea03 Work in progress on AnisotropicEikonal. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen
3997d1c462 Added simple test, work in progress. 2014-12-29 12:28:29 +01:00