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

2251 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
060a2fea0f Merge pull request #702 from jorgekva/linsolver_petsc 
PETSc support in OPM
 2014-12-19 11:25:58 +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
Jørgen Kvalsvik
c6f42a63bd Fixes performance bug in matrix construction. 
At the same time changes the construction to be value-oriented, not
constructing it in OEM_DATA, but rather in to_petsc_mat
 2014-12-10 18:05:04 +01:00
Joakim Hove
2b9b09865c Revert signature of writeECLData() 2014-12-08 15:21:56 +01:00
chflo
29dd303eaa OPM-139: Minor changes after review 2014-12-08 12:04:07 +01:00
chflo
0f97f947e6 OPM-139: Cleaned out compiler warnings 2014-12-08 12:04:07 +01:00
chflo
950ec4a67e OPM-139: Changes due to signature change in ert library 2014-12-08 12:04:06 +01:00
chflo
d6d5d8db71 OPM-139: Extended EclipseWriter to write wellinfo to eclipse restart files 2014-12-08 12:04:06 +01:00
Robert K
488c9ca7ff remove unused restrictToActive method and rewrite the other one to cover both, restrict 
and reorder.
 2014-12-08 11:24:57 +01:00
Robert K
d504007030 EclipseWriter: fix docu of convertToEclipseOrder function. 2014-12-08 10:40:52 +01:00
Robert K
207f4bfd30 EclipseWriter: support reordering of compressed cells, e.g. space filling curves. 2014-12-05 15:44:39 +01:00
Atgeirr Flø Rasmussen
98cf664b3f Silence unused argument warning. 2014-12-02 09:17:11 +01:00
Atgeirr Flø Rasmussen
fdad6860cb Merge pull request #688 from andlaus/temperature_dependent_PVT 
PVT properties: allow them to be temperature dependent
 2014-12-02 08:48:57 +01:00
Andreas Lauser
e530ce03d8 PVT properties: allow them to be temperature dependent 
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
 2014-12-01 20:06:31 +01:00
Atgeirr Flø Rasmussen
48439d6420 Use proper way to access pi() from boost::math. 2014-12-01 14:55:06 +01:00
Atgeirr Flø Rasmussen
8af3b17c68 Simplify formula with atan2(). 2014-12-01 14:38:08 +01:00
Atgeirr Flø Rasmussen
35a8bd4791 Fix more whitespace tab->space issues. 2014-12-01 14:21:16 +01:00
Atgeirr Flø Rasmussen
9e26afaaba Fix comment referencing renamed function. 2014-12-01 13:43:34 +01:00
Atgeirr Flø Rasmussen
6bc74bd746 Replace M_PI with boost usage. 2014-12-01 12:11:27 +01:00
Atgeirr Flø Rasmussen
3eb3000248 Rename vertexNeighbours() -> cellNeighboursAcrossVertices(). 2014-12-01 11:37:49 +01:00
Atgeirr Flø Rasmussen
e7bdb72ce3 Whitespace: tabs to spaces. 2014-12-01 11:28:28 +01:00
Atgeirr Flø Rasmussen
e807834a3c Use GridHelpers in implementation of vertexNeighbours(). 2014-12-01 11:27:39 +01:00
Atgeirr Flø Rasmussen
700d49ac91 Minor fixes for FaceCellsProxy::operator(). 
Fixes are:
 - Made the method const.
 - Corrected argument name cell_index -> face_index.
 2014-12-01 11:22:33 +01:00
Atgeirr Flø Rasmussen
b26bfc51f6 Add orderCounterClockwise() and test. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen
578f467b59 Add free function vertexNeighbours() and test. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen
b352e7ca3a Suppress unused argument warning in release mode. 2014-11-24 10:54:51 +01:00
Atgeirr Flø Rasmussen
91baeea8d3 Rename variable to avoid shadowing. 2014-11-24 10:54:30 +01:00
Markus Blatt
e22795e920 [cleanup] Removes a superfluous if-check of the well state. 
There were to identical if statements and the second one was followed
by an else branch. While in this case (if statement just throws) it is not
a bug, this commit cleans up one of the if statements.
 2014-11-20 14:47:21 +01:00
Markus Blatt
06a83e76f5 Fixes missing return value in non-void function of WellsManager. 
gcc warned about the following

/home/mblatt/src/dune/opm/opm-core/opm/core/wells/WellsManager.cpp: In function ‘std::array<long unsigned int, 3ul> WellsManagerDetail::directionIndices(Opm::CompletionDirection::DirectionEnum)’:
/home/mblatt/src/dune/opm/opm-core/opm/core/wells/WellsManager.cpp:191: warning: control reaches end of non-void function

To calm it I introduced a throw clause after the switch statements. Thus adding a new
enum value will raise a warning on smart compilers, hopefully.
 2014-11-20 11:53:23 +01:00
Jørgen Kvalsvik
114b335ce6 Moved KSPCreate to the Data constructor 
This is where it was always intended to be called, so this fixes a mistake in
earlier development.
 2014-11-12 20:41:21 +01:00
Tor Harald Sandve
75749c3dab Do not include shut wells in the well name to index map 
The name to index map is used to make sure the correct wellstate values
are associated with the corresponding well. Shut wells should be
excluded from this mapping as no date is for shut wells are found in the
wellstates, instead 0 is outputed for the shut wells.
 2014-11-07 12:22:19 +01:00
osae
b3b15188d9 Made hysteresis variant of gwseg consistent ... 
... with the base gwseg behaviour.  Added test.
 2014-11-05 17:00:11 +01:00
osae
2b865a992e Consistency between scaled and unscaled gwseg. 
Modified the endpoint scaled version of SatFuncGwseg and updated
the tests accordingly.
 2014-11-05 16:10:05 +01:00
osae
92ee3cd86b Rename eclState to eclipseState. 2014-11-05 16:10:05 +01:00
osae
8f8450f018 Base initialisation of SWL etc on EclipseState ... 
Thus allowing an unmodified Norne deck.
 2014-11-05 16:10:05 +01:00
osae
ba6de11151 Bugfix: Actually use column index ... 2014-11-05 16:10:05 +01:00
osae
877b501659 Cleaning up and preparation for eclipseState. 2014-11-05 16:10:05 +01:00
Atgeirr Flø Rasmussen
e2fdf14ee3 Suppress unused argument warning. 2014-11-05 07:51:21 +01:00
Tor Harald Sandve
401b193854 BUGFIX. Do not increase well index for shut wells. 
Shut wells are not added to the well list and the well index should
therefore not be increased when well control is set. This is similar to
whats is done for shut wells in createWellsFromSpecs.
 2014-10-27 07:20:03 +01:00
Atgeirr Flø Rasmussen
b7a6680ef4 Merge pull request #672 from dr-robertk/PR/remove-unused-typedef-warning 
remove unused typedef to avoid compiler warning and keep code clean.
 2014-10-24 14:28:55 +02:00
Robert K
81d3281999 remove unused typedef to avoid compiler warning and keep code clean. 2014-10-24 12:51:57 +02:00
Robert K
12891f668b fix problem with solver reastart, variable was not reset. 
Also, the time step does only grow moderately after a solver restart.
 2014-10-24 12:32:00 +02:00