OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,335 Commits 9 Branches 35 Tags
8beccf431f4b7bf9bdaa379dd23addcb95de2ea3
Commit Graph
5335 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Liu Ming 8beccf431f remove PINCH item 2 support. 2015-10-09 10:32:57 +08:00
Liu Ming fc263590ea Merge remote branch 'remotes/opm/master' into pinchprocessor 2015-10-09 09:42:50 +08:00
Bård Skaflestad 28a793c448 Merge pull request #896 from joakim-hove/relocate-warning-headers 
Relocated warning headers.
 2015-10-06 15:56:23 +02:00
Joakim Hove c8649896f8 Relocated warning headers. 2015-10-06 11:39:14 +02:00
Joakim Hove 01258e7412 Merge pull request #895 from joakim-hove/table-container-fixup 
Fxied bug in table-container use.
 2015-10-05 15:59:52 +02:00
Joakim Hove 545aeeeb23 Fxied bug in table-container use. 2015-10-05 15:59:08 +02:00
Joakim Hove 61d5e291d6 Merge pull request #886 from joakim-hove/table-container 
Changed Table code to use TableContainer
 2015-10-05 14:46:49 +02:00
Joakim Hove 5b15bbdde2 Changed Table code to use TableContainer 2015-10-05 09:59:29 +02:00
Atgeirr Flø Rasmussen 0d802def88 Merge pull request #887 from osae/equil-water-zone 
Support for equil-initialisation for datum depth outside oil zone.
 2015-10-03 19:04:34 +02:00
Bård Skaflestad a0766ce11d Merge pull request #893 from atgeirr/data-error-workaround 
Make grid in test-deck have larger number of cells.
 2015-10-02 09:57:13 +02:00
Atgeirr Flø Rasmussen 014d6177bc Make grid in deck have larger number of cells. 
This makes some tests succeed that use this deck only
for its properties and not its grid: if the grid in the
deck has fewer cells than the grid that is used for the
test we will fail in the SATNUM mapping.
 2015-10-01 15:20:08 +02:00
Liu Ming f50885112e Add PinchProcessor.hpp to cmake file list. 2015-09-30 15:32:18 +08:00
Liu Ming 0d0abcd396 remove unused variables. 2015-09-30 14:05:09 +08:00
Liu Ming 0667203879 Use std function to get the index of value in vector. 2015-09-30 14:04:49 +08:00
Liu Ming 043dc83667 use std::numeric_limits instead of the constant big value. 2015-09-30 14:04:30 +08:00
Liu Ming 1eda852cca - rename functions and variables. 
- add comments.
- add NNC object.
 2015-09-30 14:04:00 +08:00
Liu Ming 82701040b2 Add PinchProcessor for keyword PINCH and MINPV. 2015-09-30 14:03:22 +08:00
Atgeirr Flø Rasmussen fbd6fce24f Merge pull request #888 from totto82/avoid_throw_wellManager 
WARN instead of THROW if completion is not found in the grid
 2015-09-28 10:02:06 +02:00
Joakim Hove 43d1890190 Merge pull request #889 from totto82/fixTotalRates 
Use correct units for the accumulated output
 2015-09-23 10:35:23 +02:00
Bård Skaflestad 559ce51d87 Merge pull request #890 from blattms/prevent-wellsmanager-supscripting-empty-vectors 
Prevent WellsManager from subscripting empty container.
 2015-09-23 09:38:08 +02:00
Markus Blatt 860bb6eaff Prevent WellsManager from subscripting empty container. 
While hopefully not a bug it raises an exception with gcc's
libc debugging mode. Therefore we resort to using C++11's
std::vector::data instead.

The exception was rosen when running SPE9 in parallel.
 2015-09-23 09:28:59 +02:00
Tor Harald Sandve ac32b6302e Use correct units for the accumulated output 
Avoid division on time in the total output of rates.
 2015-09-22 15:49:01 +02:00
Tor Harald Sandve 4251b27737 WARN instead of THROW if completion is not found in the grid 
Completions that are not found in the grid are ignored.
 2015-09-22 13:51:06 +02:00
osae 6267a3f3e5 Support for equil-initialisation for datum depth outside oil zone. 2015-09-21 18:22:11 +02:00
Atgeirr Flø Rasmussen 4353f9c6a6 Merge pull request #884 from dr-robertk/PR/timestepping-terminal-output 
AdaptiveTimeStepping: pass variable terminal output to avoid multiple outputs in parallel.
 2015-09-16 18:43:59 +02:00
Atgeirr Flø Rasmussen 2f15b4f32d Merge pull request #885 from akva2/fix_sibling_builds 
fixed: make sure opm-common can be (re-)found
 2015-09-16 16:27:36 +02:00
Robert Kloefkorn 4881b3ab6a AdaptiveTimeStepping: also apply terminal output to solver_verbose. 2015-09-16 15:19:19 +02:00
Robert Kloefkorn d972155d64 AdaptiveTimeStepping: pass variable terminal output to avoid multiple outputs in 
parallel.
 2015-09-16 14:33:35 +02:00
Arne Morten Kvarving bad039289f fixed: make sure opm-common can be (re-)found 
see https://github.com/OPM/opm-common/issues/40#issuecomment-140720316
 2015-09-16 14:24:51 +02:00
Atgeirr Flø Rasmussen 44c3c91f7b Merge pull request #882 from dr-robertk/PR/ParallelDebugOutput 
WellState: move mapping from well name to well index to here.
 2015-09-16 12:49:49 +02:00
Robert Kloefkorn 0a6791313b WellState: move typedefs into public section and include string. 2015-09-16 12:36:05 +02:00
Robert Kloefkorn 68f8004132 WellState: add assertion on wells->name[]. 2015-09-16 09:48:43 +02:00
Robert Kloefkorn c532d149bd WellState: move mapping from well name to well index to here from autodiff's WellStateFullyImplicitBlackoil. 2015-09-16 09:48:43 +02:00
Atgeirr Flø Rasmussen 6246c24e4b Merge pull request #872 from bska/active-regions 
RegionMapping<>: Support arbitrary active regions
 2015-09-16 09:04:44 +02:00
Bård Skaflestad c010d4c3e2 RegionMapping<>: Support arbitrary region IDs 
This commit introduces a new public method, activeRegions(), that
retrieves those region IDs that contain at least one active cell.
We furthermore extend the cells() method to support lookup of
arbitrary region IDs.  Non-active region IDs produce empty cell
ranges.

Intended use case is

    for (const auto& reg : rmap.activeRegions()) {
        const auto& c = rmap.cells(reg);

        // use c
    }
 2015-09-15 15:33:22 +02:00
Bård Skaflestad a439f7bd88 convertSats(): Transpose loop nest for locality of data 2015-09-15 15:33:22 +02:00
Bård Skaflestad 234377fe72 Mark non-template functions in headers as 'inline' 2015-09-15 15:33:22 +02:00
Bård Skaflestad 228032d196 Merge pull request #883 from atgeirr/fix-null-globalcell 
Account for possible null global_cell
 2015-09-15 15:32:14 +02:00
Atgeirr Flø Rasmussen 5bd95582d2 Remove unnecessary include. 2015-09-15 14:53:46 +02:00
Atgeirr Flø Rasmussen 1ca5300f6e Move implementation to .cpp file. 2015-09-15 14:45:07 +02:00
Atgeirr Flø Rasmussen 7cfc09aa85 Use compressedToCartesian() to avoid possible null reference. 2015-09-15 14:23:10 +02:00
Atgeirr Flø Rasmussen f2c6344d04 Moved compressedToCartesian() to its own file. 2015-09-15 14:13:58 +02:00
Atgeirr Flø Rasmussen 65e6fe79cd Merge pull request #881 from totto82/fix_dz 
Use cell thickness from EclipseGrid in the well transsmissibility
 2015-09-15 13:17:18 +02:00
Tor Harald Sandve 876c8864c7 Use cell thickness from EclipseGrid in well transmissibility 
calculations

The dz calculated in WellDetails::getCubeDim is not correct in cases
where the face centroid of the horizontal faces is located above or
below the face centroid or the vertical faces. The cell thickness in
EclipseGrid, calculated using the Z-coordinates, is therefore used
instead.
 2015-09-15 10:50:56 +02:00
Bård Skaflestad f8e1526903 Merge pull request #879 from atgeirr/remove-args 
Remove arguments from BlackoilPropertiesFromDeck constructors.
 2015-09-14 17:07:37 +02:00
Atgeirr Flø Rasmussen 1cee1e038c Cleanup SaturationPropsFromDeck interface. 
Unused methods and arguments have been removed,
and we avoid including the EclMaterialLawManager
in the header. Clients IncompPropertiesFromDeck
and BlackoilPropertiesFromDeck have been updated.
 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 541e8a66f5 Remove unused implementation header. 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 355c90279a Remove unused args from constructor. 
Also from init() function. This means the methods are no longer templates,
and have been moved to the cpp file.
 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 530aef5032 Merge pull request #880 from dr-robertk/PR/simulator-state-export-numcells 
SimulatorState: export num_cells_ and num_faces_.
 2015-09-14 13:58:16 +02:00
Robert Kloefkorn 0e86a6165a SimulatorState: export num_cells_ and num_faces_ and allow to register data from any 
class. This is needed in the parallel output class. A formal interface for the state
class needs to be introduced.
 2015-09-14 12:57:36 +02:00