Bård Skaflestad
97d1a36686
Merge pull request #581 from joakim-hove/GridManager-EclipseGrid-constructor
...
Grid manager eclipse grid constructor
2014-04-24 16:52:55 +02:00
Atgeirr Flø Rasmussen
320c3332ad
Add missing break statements in switch, add default case.
2014-04-24 15:43:54 +02:00
Joakim Hove
feeaeb1d2e
Changed the data files used for testing:
...
1) Added RUNSPEC section
2) Replaces DEPTHZ keyword with TOPS keyword.
2014-04-24 15:26:39 +02:00
Bård Skaflestad
29ae3ab836
Merge pull request #572 from andlaus/add_tabdims_to_some_decks
...
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
2014-04-16 13:48:56 +02:00
Andreas Lauser
305e9d1448
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
...
these are required for the new parser. (without them, these files
would be invalid AFAICT, but I'm not an Eclipse file format expert...)
2014-04-16 11:16:58 +02:00
Atgeirr Flø Rasmussen
be5af2378a
Change option name and generated header names.
2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen
883e955176
Merge branch 'suppress-warnings' into suppress-external-warnings
2014-04-15 19:49:19 +02:00
Atgeirr Flø Rasmussen
ba26696d22
Fix access to keywords, while still silencing warning.
...
Previous fix was wrong because it called getKeyword() outside the
hasKeyword() check. Current version (like original code) uses the
short-circuiting behaviour of && to ensure this.
2014-04-15 14:52:21 +02:00
Atgeirr Flø Rasmussen
bd4eef5a86
Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings
2014-04-15 14:35:01 +02:00
Atgeirr Flø Rasmussen
b225970686
Add (all-zero) initialisation of new EquilRecord fields.
2014-04-15 13:41:10 +02:00
Atgeirr Flø Rasmussen
cd0d48abbd
Avoid signed/unsigned warning.
2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen
645ff76a0b
Comment out unused function argument.
2014-04-15 13:40:15 +02:00
Atgeirr Flø Rasmussen
798ef0d070
Comment or add (void) usage of unused arguments.
2014-04-15 13:39:03 +02:00
Bård Skaflestad
d6d58d4045
Declare initBlackoilStateFromDeck(DeckConstPtr)
...
This was missing in commit 4c2120c and produced some build failures
that were hard to analyse. I'm not convinced that the underlying
problem is solved, but this does at least restore the build.
2014-04-10 00:51:28 +02:00
Markus Blatt
20faca397a
Added missing variant of initBlackoilStateFromDeck with new parser and without UG.
2014-04-09 14:34:04 +02:00
Markus Blatt
07ef14f181
Removed superfluous parameter cartdims from initStateFromDeck.
...
The parameter was unused and would cause trouble in initBlackoilStateFromDeck.
2014-04-09 14:33:35 +02:00
Markus Blatt
ab5e011f34
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts in:
opm/core/io/eclipse/EclipseWriter.cpp
opm/core/io/eclipse/EclipseWriter.hpp
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-04-08 21:50:00 +02:00
Atgeirr Flø Rasmussen
bbe5a0f776
Merge pull request #563 from osae/testEPS
...
New parser; proper handling of ENPTVD/ENKRVD.
2014-04-08 13:51:43 +02:00
Bård Skaflestad
333e110d4f
Merge pull request #538 from blattms/parallel-solver-support
...
Added support for parallel dune-istl solvers
2014-04-08 00:17:35 +02:00
Bård Skaflestad
99d7f61822
Don't reference OwnerOverlap* unless MPI is available
...
The class OwnerOverlapCopyCommunication is not defined unless MPI is
avilable. Therefore, we cannot reference the type unless we know
that MPI is available in the current translation unit.
2014-04-07 20:01:18 +02:00
Atgeirr Flø Rasmussen
28abf88520
Changed documentation of Wells::comp_frac to match reality.
2014-04-06 23:45:08 +02:00
Atgeirr Flø Rasmussen
db88058b34
Use preferred phase of producer well to set comp_fraction.
...
This replaces the previous hack, that set comp_fraction to (0,1,0) always.
2014-04-06 23:33:43 +02:00
osae
32230f70c8
New parser; proper handling of ENPTVD/ENKRVD.
2014-04-05 10:56:30 +02:00
Atgeirr Flø Rasmussen
94d45c4c3d
Merge remote-tracking branch 'totto82/add_compi_producers' into add_compi_producers
2014-04-05 00:18:38 +02:00
Atgeirr Flø Rasmussen
cb9c36df65
Merge pull request #544 from osae/equil-init
...
Equil init
2014-04-04 22:39:37 +02:00
Markus Blatt
472844e454
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Removed conflicts in
opm/core/wells/WellsManager.cpp
that were due to the change
```diff
- pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getDiameter());
+ pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getSkinFactor());
```
in WellsManager::createWellsFromSpecs which moved from WellsManager.cpp to WellsManager_impl.hpp file in a previous commit.
2014-04-04 21:21:22 +02:00
Markus Blatt
f67ed5d334
Fix matrix size and symmetry for parallel runs.
2014-04-04 21:01:32 +02:00
Markus Blatt
7fd5b65691
Merge remote-tracking branch 'upstream/master' into parallel-solver-support
...
Removed conflicts in:
opm/core/linalg/LinearSolverIstl.cpp
2014-04-04 20:38:52 +02:00
Bård Skaflestad
cb32cea7d7
Merge pull request #535 from blattms/add-scalar-product
...
Explicitly construct the ScalarProduct, and SequentialInformation.
2014-04-04 18:41:56 +02:00
Tor Harald Sandve
d90717877b
Hack to set compi for producer.
...
compi is set to [0 1 0] for all producers
2014-04-04 12:15:49 +02:00
osae
a43ae52c18
Some additional tests: live gas, RSVD and RVVD
2014-04-03 09:07:00 +02:00
osae
3de80989a2
Equil regions now internally indexed 0..(NTEQUL-1)
2014-03-31 16:16:45 +02:00
osae
054e7b42b8
Update tests and provide some eclipse output.
2014-03-31 15:32:06 +02:00
Atgeirr Flø Rasmussen
eb19031c17
Bugfix: skin factor, not diameter.
2014-03-31 14:47:16 +02:00
Markus Blatt
7aa8728be9
Removed last artefact of checkCellExistence (in constructor taking wells)
...
Somehow this slipped one of the merges. With the last
patch this module failed to compile as we use the new
definition without the bool parameters.
2014-03-29 10:35:12 +01:00
Markus Blatt
0c96066a79
Readd definition of WellsManager constructor from wells.
...
As @bska pointed in my issue #518 this definition was
accidentally removed in commit 20468d1 during a merge of
upstream changes. Therefore I readd it with this patch.
2014-03-29 10:12:40 +01:00
osae
b86fa0af86
New parser included.
2014-03-28 17:35:43 +01:00
osae
b485d03711
Default equil region should be one not zero ...
...
Otherwise problems when kw EQLNUM is used.
2014-03-28 17:18:50 +01:00
Markus Blatt
c282949400
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Manually resolved conflicts:
opm/core/io/eclipse/EclipseWriter.cpp
opm/core/io/eclipse/EclipseWriter.hpp
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/simulator/initState_impl.hpp
opm/core/wells/WellsManager.cpp
opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +01:00
Markus Blatt
8653ffe327
[bugfix] Use the size of the vector for the copying.
...
The last patch did not compile as there was no size member
in scope. Therefore this patch resorts to using the size of
the vector.
2014-03-27 11:53:13 +01:00
Markus Blatt
23f19584cb
Throw an error when using a sequential solver in parallel
2014-03-27 11:49:41 +01:00
osae
e1d2fa2088
Some adjustments to equil initialisation.
...
- Saturations, phase pressures, and standard initialsation of RS and RV
now agree to baseline.
- Tables of RS and RV versus vertical depth (kw RSVD RVVD) have been
hardcoded for testing (need new parser) and the calculations agree to
baseline in the gas and oil zones. In the water zone there is some
differences: Our code computes saturated RS and RV using the final
phase pressures (these are modified to be consistent with saturations
and capillary pressures) while the baseline uses unmodified phase pressures.
2014-03-26 14:53:47 +01:00
osae
5d028d4eca
Merge branch 'master' of git://github.com/OPM/opm-core
...
Conflicts:
CMakeLists_files.cmake
2014-03-26 14:51:06 +01:00
Markus Blatt
7495bfa6c4
[bugfix] Use the size of the vector for the copying.
...
The last patch did not compile as there was no size member
in scope. Therefore this patch resorts to using the size of
the vector.
2014-03-26 10:23:11 +01:00
Joakim Hove
f0126b2501
Removed WellsManager constructor which takes an ole Eclipsegridparser instance.
2014-03-25 18:57:58 +01:00
Markus Blatt
3115b7868f
Moved ISTL right and left hand side construction for ISTL to solveSystem
...
cherry-picked from add-scalarproduct and ported.
2014-03-25 09:58:07 +01:00
Markus Blatt
909d3c9019
Moved ISTL right and left hand side construction for ISTL to solveSystem
2014-03-25 09:37:41 +01:00
Atgeirr Flø Rasmussen
5a9786aa32
Merge pull request #540 from joakim-hove/wellsmanager-well-properties
...
Changed the access method to well rates/properties
2014-03-21 08:58:07 +01:00
Joakim Hove
2eab8aeb38
Changed the access to Parser/EclipseState/Schedule to use new well injection and production properties. To be aligned with opm-parser:e75970a28b96374409a55e3e6cea2198b6a0ea23
2014-03-21 00:35:15 +01:00
Markus Blatt
b8959c45dd
Increase verbosity such that we see the actual solve
2014-03-20 22:24:33 +01:00