Jørgen Kvalsvik
ade7aa658e
Removes call_petsc.c and calls the lib from C++
...
call_petsc.c was really a thin C wrapper around the call to petsc itself and
turns out was mostly unnecessary C++ emulation. This removes the file entirely
and ports its functionality into LinearSolverPetsc.cpp.
All features from the file should now be more readable as well as properly
utilising modern C++ features.
The patch uses the CHKERRXX macro from petsc to handle errors reported by
petsc, and currently does not handle this and give the control back to OPM's
error/throw system.
2014-10-14 14:43:42 +02:00
Liu Ming
28b354c625
Add HAVE_PETSC macro.
2014-07-08 10:58:39 +08:00
Liu Ming
8a118f45fe
rename the private member.
2014-05-23 11:10:22 +08:00
Liu Ming
9d985f7421
use unordered_map for "string-enum" translations.
2014-05-23 11:09:04 +08:00
Liu Ming
6f2d28d08a
Throw information for Petsc.
2014-05-16 15:02:49 +08:00
Liu Ming
ccb83a8503
Initialize Petsc from constructor.
...
Remove private members for initializing Petsc.
2014-05-16 14:53:49 +08:00
Liu Ming
4491eb7a6a
Add Petsc to OPM.
2014-05-16 14:41:51 +08:00
Atgeirr Flø Rasmussen
abd341ab7f
Supress signed-unsigned comparison warning.
2014-05-12 09:18:52 +02:00
Atgeirr Flø Rasmussen
a5ccc97a0f
Merge pull request #573 from osae/test-eps
...
Endpoint scaling - taking advantage of the new parser.
2014-05-12 08:28:48 +02:00
osae
4a3c7ff204
Removing a few bugs ...
2014-05-06 18:15:03 +02:00
osae
d91c49cffd
Proper interpretation of ENDNUM and IMBNUM fields.
...
Made consistent with grid discretization.
2014-05-06 14:41:17 +02:00
osae
d648917fcf
Initialisation of EGLNUM (analogous to e.g SATNUM)
2014-05-06 12:47:24 +02:00
osae
ca5b0eb16f
Inserted some documentation.
2014-05-05 11:27:10 +02:00
osae
bd38a577ae
Fix to make EQLNUM consistent with ACTNUM.
...
This should eventually be integrated in the parser.
2014-05-05 11:23:43 +02:00
osae
922a73442c
ENDNUM: changed default value and jtab-logic
...
Default value changed from 'no scaling' to 'use table 1'.
Range of jtab changed to [-1,#tables-1].
2014-05-05 10:33:04 +02:00
osae
48c3577277
Make use of keywords SATOPTS and EHYSTR.
2014-05-05 10:33:04 +02:00
osae
59eb5f6c20
Use ENDNUM and prepare for IMBNUM.
2014-05-05 10:33:04 +02:00
osae
a34eb162e8
Added missing line (parser conversion).
2014-05-05 10:33:04 +02:00
Andreas Lauser
0cdc32d213
adapt to the renames of the table classes in opm-parser
...
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
2014-04-28 18:47:28 +02:00
Andreas Lauser
eb656c60ec
add opm-parser variants for the incompressible property classes
2014-04-25 14:25:54 +02:00
Atgeirr Flø Rasmussen
320c3332ad
Add missing break statements in switch, add default case.
2014-04-24 15:43:54 +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
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
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
3de80989a2
Equil regions now internally indexed 0..(NTEQUL-1)
2014-03-31 16:16:45 +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
