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

1982 Commits

Author SHA1 Message Date
Joakim Hove
1f94abcf14 Removed cpos = ~cpos constructions for closing a well; using well_controls_shut_well explicitly instead. 2014-03-12 17:41:40 +01:00
Kari B. Skjerve
c34d7a40fc Added support of SWCR and SOWCR in CornerpointChopper 2014-03-11 14:51:23 +01:00
Atgeirr Flø Rasmussen
f1377d9729 Bugfix: || -> && 2014-03-11 12:54:04 +01:00
Atgeirr Flø Rasmussen
c46ad990c1 Assert to avoid future surprises. 
Well types must be either INJECTOR or PRODUCER for now, if
we change this in the future, we should check this part of
the code as well.
 2014-03-11 12:51:49 +01:00
Atgeirr Flø Rasmussen
dbd0635fda Commented choices in initialisation of well rates. 2014-03-11 12:50:58 +01:00
Atgeirr Flø Rasmussen
e510dde102 Initialize well rates better. 
Instead of making well rates zero for wells that are not controlled by
surface volume, we initialize them to a small value with the correct
sign (positive for injectors, negative for producers).
 2014-03-10 13:30:43 +01:00
Bård Skaflestad
e2d5aafb56 Merge pull request #506 from atgeirr/suppress-warnings 
Suppress warnings
 2014-03-06 11:37:17 +01:00
Atgeirr Flø Rasmussen
9edbe36b58 Remove extra semicolon. 2014-03-06 08:24:00 +01:00
Arne Morten Kvarving
50b2c9e56a add option to quell dune(-istl) warnings 2014-03-05 09:27:47 +01:00
Atgeirr Flø Rasmussen
ec22c9b491 Remove warning pragmas. 
They are only available on gcc 4.6 and newer, and clang.
 2014-03-05 08:41:53 +01:00
Joakim Hove
ae4738f5e7 Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status 2014-03-04 20:23:19 +01:00
Atgeirr Flø Rasmussen
f35c193b38 Suppress unused argument warnings. 2014-03-04 11:32:32 +01:00
Atgeirr Flø Rasmussen
97328b5a17 Suppress warnings from included istl code. 
This is done using #pragma GCC and works also in clang.
 2014-03-04 11:31:16 +01:00
Atgeirr Flø Rasmussen
73926a1b21 Merge pull request #495 from osae/endscale 
Endpoint scaling and hysteresis for gwseg.
 2014-03-04 10:29:50 +01:00
Atgeirr Flø Rasmussen
0eb32276fb Allow direct interpolation of props with new parser. 
After transitioning to use the new parser, the SinglePvtDead class was never
used even when the 'samples' argument used to control usage was zero or negative.
The resulting construction of SinglePvtDeadSpline objects was then failing.

This change adds a new constructor to SinglePvtDead, and restores the ability
to control spline usage with the samples argument.
 2014-03-03 09:17:11 +01:00
Atgeirr Flø Rasmussen
75a7c5cee8 Bugfix in RsSatAtContact: use min(), not max(). 
Also modified test to match output.
 2014-02-27 14:57:38 +01:00
Atgeirr Flø Rasmussen
3e9b82e083 Fix bug in RS initialisation. 
Also throw if default init is specified and datum != goc depth.
 2014-02-27 14:48:14 +01:00
Atgeirr Flø Rasmussen
1a238de759 Remove debugging output. 2014-02-27 13:27:07 +01:00
Atgeirr Flø Rasmussen
3f5cf72c01 Add computeRs() function and use from InitialStateComputer. 2014-02-27 13:14:48 +01:00
Andreas Lauser
20e21b7892 SimulatorTimer: make it possible to base it on opm-parser's TimeMap 
Since SimulatorTimer is a fairly shallow shim if using the TimeMap, it
can also be removed relatively easily. Having said this, that would
trigger _many_ changes in _a lot_ of places and I'm not motivated at
all to fight that battle as long as the old parser needs to be
supported. I thus decided that the best way is to add a "wrapper mode"
to SimulationTimer...
 2014-02-27 12:56:23 +01:00
Markus Blatt
baa0261132 [bugfix] Take normalized face normals into account when calculating tpfa. 
At least for Cpgrid the face normal is normalized which has to be taken into
account in tpfa_htrans_compute.
We therefore multiply the facenormal with the face area in cases (read Cpgrid)
where this needed.
 2014-02-27 12:28:22 +01:00
Atgeirr Flø Rasmussen
6a61b90524 Add initStateEquil() function. 
It is not quite complete yet for the following reasons:
  - it does not compute state.surfacevol(),
  - the InitialStateComputer class does not compute Rs or Rv,
  - it has not been verified.
 2014-02-27 10:40:14 +01:00
Atgeirr Flø Rasmussen
e1feaf9345 Added Rv field to InitialStateComputer. 
It is currently not computed, as for Rs.
 2014-02-27 10:39:18 +01:00
Atgeirr Flø Rasmussen
818d79adc7 Moved implementation of phaseSaturations() to _impl file. 2014-02-27 09:37:48 +01:00
Atgeirr Flø Rasmussen
c9c34f63a3 Refactor copying of region to global data. 2014-02-27 09:31:48 +01:00
Atgeirr Flø Rasmussen
036ab95da2 Rename PhasePressureSaturationComputer -> InitialStateComputer. 
Also add (unused so far) rs_ field to class.
 2014-02-27 09:08:39 +01:00
Atgeirr Flø Rasmussen
283dc96776 Added size() method to CellRange inner class. 2014-02-27 08:58:38 +01:00
Atgeirr Flø Rasmussen
5a00d85467 Enable live oil in initialisation. 2014-02-27 08:31:03 +01:00
Joakim Hove
77bf601d6b Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:16:10 +01:00
Markus Blatt
45edfc8848 [bugfix] Fixed imcrementing the cell centroid. 
Imcrementation should be done at the end of the loop body as otherwise
the first cell is skipped and we are out of bounds for the last iteration.
This patch move the increment to the correct location.
 2014-02-26 16:01:32 +01:00
Markus Blatt
9cd515cb91 [bugfix] Fixed error in initialization of cartdims during non-UG constructor. 2014-02-26 16:00:58 +01:00
Atgeirr Flø Rasmussen
db06c2eb80 Removed redundant calcPressII() method. 
Pressure is also calculated in the calcPressSat() method.
 2014-02-26 14:49:06 +01:00
Atgeirr Flø Rasmussen
8ef54b7c64 Made phase mixing functors a class hierarchy. 
In summary:
 - added RsFunction (base class),
 - made NoMixing, RsVD, RsSatAtContact inherit RsFunction,
 - RS and RV are no longer template arguments for EquilReg class,
 - EquilReg constructor now takes two shared_ptr<Miscibility::RsFunction>,
 - use of constructor updated, mostly using make_shared.
 2014-02-26 14:47:24 +01:00
Atgeirr Flø Rasmussen
75ca41805e Made NoMixing a class. 
For uniformity with its sibling classes.
 2014-02-26 14:16:51 +01:00
Markus Blatt
fa5060c6c8 Refactored EclipseWriter to make it possible to support CpGrid. 2014-02-26 10:53:31 +01:00
Markus Blatt
7e57971140 Refactored WellsManager to partial use without UnstructuredGrid. 2014-02-25 17:52:51 +01:00
Markus Blatt
38ab6e7f78 Remove ambiguous functions increment and getCoordinate from unnamed namespace in favor to those from namespace UgGridHelpers 2014-02-25 15:45:50 +01:00
Markus Blatt
921c452e5c Added suport for grid apart from UG for BlackoilPropertiesFromDeck 2014-02-25 15:45:15 +01:00
Markus Blatt
c82ed437ce Added support for computePoreVolume for grids apart from UnstructuredGrid. 2014-02-25 15:12:16 +01:00
Markus Blatt
3d4cc78e72 Added missing namespace qualifiers. 2014-02-25 15:10:46 +01:00
Markus Blatt
9d6e424eb5 Fixed unused parameter warning in initBlackoilStateFromDeck. 2014-02-25 15:10:18 +01:00
Markus Blatt
02847f06c1 Made trans_tpfa usable with grids apart from UnstructuredGrid. 2014-02-25 15:05:30 +01:00
Markus Blatt
aafe9147eb Added documentation for FaceCellTraits 2014-02-25 15:03:01 +01:00
Markus Blatt
b0ac1572e1 Added traits classes for the type of cell and face centroids. 2014-02-25 15:01:22 +01:00
Markus Blatt
a0253e8e0f Added method to access face normals. 2014-02-25 14:59:53 +01:00
Atgeirr Flø Rasmussen
c80ffbefbb Prune includes. 2014-02-24 16:11:50 +01:00
Atgeirr Flø Rasmussen
4a8c0dd955 Moved equilibration utilities to separate file. 2014-02-24 16:09:04 +01:00
Atgeirr Flø Rasmussen
14276f9175 Capitalize nested namespace names. 
equil -> Equil
miscibility -> Miscibility
 2014-02-24 15:55:14 +01:00
Kristian Flikka
7e29a9ea45 Add handling of WGRUPCON to new-parser friendly WellsManager constructor 2014-02-24 15:24:33 +01:00
Atgeirr Flø Rasmussen
34595ae225 Move RegionMapping class to its own header, add test. 
Class now resides in opm/core/utility/RegionMapping.hpp.
 2014-02-24 15:19:04 +01:00