Commit Graph
4879 Commits
Author SHA1 Message Date
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
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
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
Atgeirr Flø Rasmussen 1f79502f10 Add skeleton of AnisotropicEikonal class and test. 2014-12-29 12:28:29 +01:00
Atgeirr Flø Rasmussen a14b2fd434 Merge pull request #710 from andlaus/remove_m4_directory
remove the obsolete 'm4' subdirectory
2014-12-23 09:51:51 +01:00
Andreas Lauser 07848a1870 remove the obsolete 'm4' subdirectory
as far as I can see, it provided M4 macros for autotools based
projects which wanted to use OPM. I have severe doubts that this was
used by anyone because it most likely does not even work. (e.g. the M4
macros does not seem to specify the ERT and opm-parser prerequisites.)

Note that I'm not 100% sure of the above, so if I'm wrong, state so
loudly and I'll close the PR...
2014-12-19 15:21:26 +01:00
Atgeirr Flø Rasmussen 060a2fea0f Merge pull request #702 from jorgekva/linsolver_petsc
PETSc support in OPM
2014-12-19 11:25:58 +01:00
Joakim Hove 0fc5e7a3bc Merge pull request #706 from joakim-hove/move-log
Renamed ParserLog -> OpmLog
2014-12-16 13:23:10 +01:00
Bård Skaflestad 18cc1c8cb5 Merge pull request #707 from andlaus/enable_experimental_grid_extensions
Finddune-grid.cmake: always enable the experimental grid extensions
2014-12-16 12:50:19 +01:00
Andreas Lauser 0d27bd4bff Finddune-grid.cmake: always enable the experimental grid extensions
this is now done by a config.h macro. The reason is that quite a bit
of code depends on boundary IDs which are only available as an
"experimental" grid extension in recent Dune releases...
2014-12-16 12:41:31 +01:00
Joakim Hove 6f2fe0457c ERT-747: Renamed ParserLog -> Logger 2014-12-15 12:22:34 +01:00
Bård Skaflestad e9eb1b8b61 Merge pull request #703 from andlaus/remove_strict_parsing
adapt to the removal of the "strict parsing" concept
2014-12-11 13:39:26 +01:00
Andreas Lauser be9f181a94 adapt to the removal of the "strict parsing" concept 2014-12-11 13:11:33 +01:00
Jørgen Kvalsvik 510074e858 Removed installation of file call_petsc.h 2014-12-10 18:35:49 +01:00
Jørgen Kvalsvik 31fbb2f58d Sets initial guess to zero.
Setting it to nonzero means starting to approximate from memory garbage values.
2014-12-10 18:15:33 +01:00
Jørgen Kvalsvik ed18b283f1 Adds missing VecCreate. 2014-12-10 18:15:13 +01:00
Jørgen Kvalsvik e2e6299ee6 Adds missing preconditoner destruction. 2014-12-10 18:09:13 +01:00
Jørgen Kvalsvik 33c7b48d06 Renamed variables to match Ax = b 2014-12-10 18:09:01 +01:00
Jørgen Kvalsvik ef59c5afdb Vector construction is now value oriented.
No longer initialised and constructed in two places.
2014-12-10 18:07:45 +01:00
Jørgen Kvalsvik 2db194aca6 Removes unecessary whitespace. 2014-12-10 18:06:28 +01:00