Commit Graph

5319 Commits

Author SHA1 Message Date
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
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
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
Atgeirr Flø Rasmussen
3473008ad1 Merge pull request #862 from osae/cell_center_depth
Cell center depth also from zcorn average.
2015-09-11 14:00:23 +02:00
osae
1fdc4c39dc Assure 4 vertices for each face of the grid. 2015-09-11 11:47:27 +02:00
osae
565fa4278e Add some comments and limit to 3 dimensions. 2015-09-10 18:29:02 +02:00
osae
299aa77e18 Cell center depth also from zcorn average.
There is a sligth difference between the cell depth taken from the
centroid (opm) and a straightforward average of corner coordinates
(ecl). For the initialisation of Norne this causes some differences
when deciding cell center positions relative contact depths.
2015-09-10 18:29:02 +02:00
Atgeirr Flø Rasmussen
ce0c928903 Merge pull request #874 from akva2/rename_common
changed: sync with renaming to opm-common
2015-09-09 11:37:26 +02:00
Atgeirr Flø Rasmussen
99cf5299b6 Merge pull request #876 from blattms/wells-completion-might-cross-overlap
Allow a few well completions in the overlap.
2015-09-09 10:41:47 +02:00
Markus Blatt
3b4595d2d7 Allow a few well completions in the overlap.
If on one process a well completion is next to border then
it might also be stored in the neighbor process. Still not
all the completions of the well are known to the neighbor.
This breaks the previous assumption that for each well all
completions must belong to the partition of the process.

Therefore with this commit we allow wells that only have a
part of their completions assigned to the partition of the process.
This wells are deactivated under the assumption that they must
exist completely on another process due to the partitioning.
2015-09-08 20:38:02 +02:00
Atgeirr Flø Rasmussen
4448a557f0 Merge pull request #875 from totto82/change_default
Change default values
2015-09-08 17:55:28 +02:00
Arne Morten Kvarving
1f47ea7530 changed: sync with renaming to opm-common 2015-09-08 14:33:24 +02:00
Atgeirr Flø Rasmussen
56c23d1a5a Merge pull request #873 from blattms/fix-parallel-wellsmanager-for-partly-shut-wells
[bugfix] Account for shut completions when checking well in parallel
2015-09-08 11:01:44 +02:00
Tor Harald Sandve
e8d8df5b47 Change default values
- use time stepping algorithm pid instead of pid + iter
Adjusting the time-steps on the number of linear iterations does
currently not give any improvents on the time-stepping.
- Change the pid tolerance. The time-stepper will take longer time-steps
and thus reduce the simulation time significantly. The Norne and the SPE
results does not degrade
- Less aggressive reduction of time-steps after convergence problems
2015-09-08 10:56:58 +02:00
Markus Blatt
3261ec3281 Make code clearer with and if-else-if statements and spaces. 2015-09-08 10:48:55 +02:00
Markus Blatt
7b5e07f8f6 Improve code comments. 2015-09-08 10:48:14 +02:00
Markus Blatt
ef6cf0d928 Make last commit compile 2015-09-08 09:30:16 +02:00
Markus Blatt
3412d1ff1e [bugfix] Account for shut completions when checking well in a parallel run.
Previously well with just some shut completions errorneously triggered an
exception in parallel runs. This is fixed with this commit.

Due to the logic shut completions will always be marked as existing
on a process. (Initially all completions are marked as found. For
each open completion we check whether the cartesian index belongs to
the local grid. If that is not the case we mark it as not found).
Therefore we now check whether the found number of completions
is either the number of shut completions or the number of all completions.
In the former case the well is not stored on this process, and in the latter
case it is. In other cases we throw an exception.
2015-09-07 16:55:08 +02:00
Atgeirr Flø Rasmussen
de011f0bd2 Merge pull request #871 from dr-robertk/PR/remove-warnings
[BlackoilPropsFromDeck] remove sign/unsigned warnings.
2015-09-07 10:07:06 +02:00