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

4436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Kaufmann
ac61cde15f Depend on Boost::iostreams 
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
 2014-02-28 18:22:33 +01:00
Roland Kaufmann
54fbd6b190 Provide dependency information for opm-benchmarks 2014-02-28 18:21:33 +01:00
Atgeirr Flø Rasmussen
0f852aadc8 Add test data file for compute_initial_state.cpp. 2014-02-27 15:55:08 +01:00
Atgeirr Flø Rasmussen
384e76bc10 Merge pull request #502 from OPM/opm-parser-integrate 
Integrate new parser
 2014-02-27 15:30:59 +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
Joakim Hove
167767e5aa Merge pull request #498 from andlaus/use_timemap_in_simulatortimer 
SimulatorTimer: make it possible to base it on opm-parser's TimeMap
 2014-02-27 14:35:16 +01:00
Atgeirr Flø Rasmussen
a58faea9ab Added simple program example for initialisation. 2014-02-27 13:55:15 +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
7cc0802f3e Add test for live oil initialisation. 
The test is not finished or verified yet.
 2014-02-27 08:31:51 +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
Joakim Hove
5a6883c71b Merge pull request #500 from flikka/add-WGRUPCON 
Add handling of WGRUPCON to new-parser friendly WellsManager constructor
 2014-02-26 12:28:41 +01:00
Markus Blatt
fa5060c6c8 Refactored EclipseWriter to make it possible to support CpGrid. 2014-02-26 10:53:31 +01:00
Markus Blatt
5199f784d7 Added new implementation header to list of header files. 2014-02-25 17:54:21 +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
Atgeirr Flø Rasmussen
2caf790c29 Added class RsSatAtContact (not tested). 2014-02-24 13:47:03 +01:00
Atgeirr Flø Rasmussen
2b8deb20fd Add test case with overlapping transitions. 
Capillary pressure functions and contact depths
have been modified to ensure a large overlap.
 2014-02-21 14:50:45 +01:00
Atgeirr Flø Rasmussen
f9195b8243 Fix bug in saturation initialisation. 
We shall only use gas-water capillary to initialise when we would get
unphysical saturations otherwise.
 2014-02-21 14:47:14 +01:00
Markus Blatt
842667eab2 Added free method to get the sum of the the faces that are attached to every cell. 2014-02-21 11:50:36 +01:00
Bård Skaflestad
2a2d6264ed Merge pull request #497 from atgeirr/no-spline-default 
Make linear interpolation default for saturation and some pvt properties.
 2014-02-21 11:16:29 +01:00
Atgeirr Flø Rasmussen
2fefe256a4 Merge branch 'no-spline-default' into initialisation. 
Necessary since test case behaviour depends on changes in
BlackoilPropertiesFromDeck class.
 2014-02-21 11:01:44 +01:00