Atgeirr Flø Rasmussen
355bfb0e70
Suppress signed/unsigned warning.
...
Also fix formatting.
2015-02-17 13:41:31 +01:00
Atgeirr Flø Rasmussen
7cdb65cff3
Suppress unused argument warnings.
2015-02-17 13:41:00 +01:00
Atgeirr Flø Rasmussen
75d98c7e3b
Remove uneeded function argument.
2015-02-17 13:40:09 +01:00
Atgeirr Flø Rasmussen
bd2f659770
Adapt to API change in WellsManager.
2015-02-17 13:22:43 +01:00
Atgeirr Flø Rasmussen
3873e5d810
Merge pull request #309 from chflo/opm-166
...
opm-166: Fix due to signature change in method thresholdPressures
2015-02-17 10:49:43 +01:00
chflo
82839f9580
opm-166: Fix due to signature change in method thresholdPressures
2015-02-17 09:53:57 +01:00
Atgeirr Flø Rasmussen
484f1e4438
Merge pull request #302 from blattms/distribute-input-props-data
...
Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel.
2015-02-16 12:48:03 +01:00
Markus Blatt
684da9aa84
Throw an excpetion if either eclipse or matlab output is activated.
2015-02-16 11:52:50 +01:00
Markus Blatt
3eb13e74dd
Adds braces to if() return;
2015-02-16 11:42:42 +01:00
Markus Blatt
f19a83bbda
Remove superluous casts.
2015-02-16 11:40:49 +01:00
Markus Blatt
3575fdce6a
Removes stackobject_to_heap.
2015-02-16 11:24:05 +01:00
Atgeirr Flø Rasmussen
3ade13d235
Implement RESV limit targets for INJECTOR wells.
2015-02-16 11:08:57 +01:00
Markus Blatt
60cdc583ae
Make right hand passed to the linear solver consistent.
...
Previously, we had to use two layers of overlap cells such the
innermost layer contains the rightvalues automatically (as it is
surrounded by internal edges). No we use communication to get
the correct values in the whole overlap region and one layer
suffices as it should.
2015-02-12 21:33:41 +01:00
Markus Blatt
01ea7bacba
Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel.
...
With this commit we add the possibility to start with a global representation
of a simulator that is read on each process and afterwards this presentation
is redistributed among the processors together with the properties and
state data needed to initialize the simulation.
There still is no parallel well handling and no parallel output. But with the
equilibrium example of @dr-robertk and deactivated output we can already
perform parallel runs.
2015-02-12 21:33:41 +01:00
Markus Blatt
fc137afcd5
Adds a constructor to BlackoilPropsAdFromDeck that allows copy the grid independant part.
...
In the parallel simulator we will have to be able adress only poperties on
some part of the global grid. To create thos properties we need to be able
to copy the grid independant data of the properties object and resize the rest.
This commit adds a construct taking a properties object for reading and a
new number of cells to accomplish this.
2015-02-12 21:33:41 +01:00
Atgeirr Flø Rasmussen
15aa7ec2ab
Merge pull request #306 from joakim-hove/stream-open-c_str
...
The stream::open() functions require c_str()
2015-02-12 17:31:44 +01:00
Joakim Hove
c021b66c18
The stream::open() functions require c_str()
2015-02-12 17:25:40 +01:00
Atgeirr Flø Rasmussen
eea8bb23a9
Merge pull request #304 from blattms/parallel-info-by-value
...
Store the boost::any of ParallelIstlInformation by value. (Alternative to #303 )
2015-02-12 14:48:46 +01:00
Markus Blatt
70fb0e7b79
Store the boost::any of ParallelIstlInformation by value.
...
During the constructor the underlying object only holds smart
pointers and an empty vector. The FullyImplicitBlackoilSolver
obtains a reference to it from the NewtInterationInterface instances.
Therefore copying boost::any and storing it by value should be cheap
and safe.
2015-02-12 14:04:53 +01:00
Atgeirr Flø Rasmussen
d2b3e52472
Merge pull request #292 from blattms/parallel-newton-convergence
...
Adds parallel solver support for sim_fibo_ad_cp
2015-02-12 11:24:15 +01:00
Markus Blatt
d1239d0a35
Adds space between parameters and stops eliding zeros.
2015-02-12 10:41:45 +01:00
Markus Blatt
be7221aa9b
Moved output parameters to the end of the list in extractParallelGridInformationToISTL
2015-02-12 10:41:44 +01:00
Markus Blatt
11848acf0c
Added braces around else statement (coding guidelines)
2015-02-12 10:41:44 +01:00
Markus Blatt
a37421d2ad
Rely on delete being null safe.
2015-02-12 10:41:44 +01:00
Markus Blatt
31da0de909
Fixes indentation in CMakeLists_files.cmake
2015-02-12 10:41:44 +01:00
Markus Blatt
bf281a74b8
Make symbol extractParallelGridInformationToISTL available if CpGrid is there.
2015-02-12 10:41:44 +01:00
Markus Blatt
dd63c2489f
Do not reimplement null_deleter from dune-common.
...
Instead we use Dune::stackobject_to_shared_ptr to create a
shared_ptr that does not delete the pointer.
2015-02-12 10:41:44 +01:00
Markus Blatt
39a6e19099
Fixes compilation issues when no MPI is available.
2015-02-12 10:41:44 +01:00
Markus Blatt
11cb82e815
Correctly compute the global number of cells and pore volume.
2015-02-12 10:41:44 +01:00
Markus Blatt
70d5d18560
Prevent copying of a matrix.
2015-02-12 10:41:44 +01:00
Markus Blatt
b73f1c86fc
Fixed typos in documentatio of deleter.
2015-02-12 10:41:44 +01:00
Markus Blatt
a7f1614f63
Adds copyright declarations and more documentation.
2015-02-12 10:41:44 +01:00
Markus Blatt
ff9b8d790d
Added a parallel version for computing the global reductions.
2015-02-12 10:41:44 +01:00
Markus Blatt
4527ce8ffd
Add access to the underlying information about the parallelization.
...
We need it serveral places and all of them seem to have access to
NewtonIterationBlackoilInterface. This makes it natural to give access
to it and prevent users from having to forward it manually at several
places in the simulator driver.
2015-02-12 10:41:43 +01:00
Markus Blatt
221565f038
Enable the use of parallel dune-istl solvers.
...
As with opm-core we use boost::any to provide additional
information about a parallel run. It is used to set a
ParallelISTLInformation object and and fill it with the
information obtained from a parallel Cpgrid.
Note that the simulator currently compiles sucessfully. Still,
we have to test the runs and do debugging.
2015-02-12 10:41:43 +01:00
Joakim Hove
02b682ea52
Merge pull request #297 from qilicun/support_minpvf
...
support MINPVF.
2015-02-12 09:34:35 +01:00
Liu Ming
3ddb930d1f
Adapt to api changes of opm-parser.
2015-02-12 16:16:07 +08:00
Atgeirr Flø Rasmussen
bed7bada40
Merge pull request #286 from dr-robertk/PR/add-support-for-restart
...
BlackoilOutputWriter: added support for backup and restore.
2015-02-11 14:05:24 +01:00
Robert K
0f20e187a6
typos and minor changes.
2015-02-11 13:26:57 +01:00
Robert K
61144a73af
Vector --> Container since we also read/write strings.
2015-02-11 13:18:07 +01:00
Robert K
2520aab0a1
added warning when restore file couldn't be opened.
2015-02-11 13:18:07 +01:00
Robert K
c6400fd30a
SimulatorFullyImplicitBlackoilOutput: warn when end of file was reached.
2015-02-11 13:18:07 +01:00
Robert K
a834e55f5a
BlackoilOutputWriter: added support for backup and restore.
...
This first implementation is mainly to support faster debugging.
2015-02-11 13:18:07 +01:00
Atgeirr Flø Rasmussen
2f632bc9c3
Merge pull request #299 from blattms/fix-dependency
...
[bugfix] Fixes dependency clause of #296
2015-02-11 12:45:00 +01:00
Markus Blatt
2be2dd5e41
[bugfix] Fixes dependency clause.
...
It caused dunecontrol to abort because of using a comma as a separator.
This commit removes the eroneous comma and adds a required version.
2015-02-11 12:35:40 +01:00
Atgeirr Flø Rasmussen
d99931ae0f
Merge pull request #298 from dr-robertk/PR/remove-warning
...
convergenceReduction: remove warning.
2015-02-10 14:44:16 +01:00
Robert K
0323624e3e
convergenceReduction: remove warning.
2015-02-10 13:08:16 +01:00
Liu Ming
6cd0c47b94
support MINPVF.
2015-02-09 11:27:10 +08:00
Atgeirr Flø Rasmussen
3b742e0093
Merge pull request #296 from blattms/require-dune-istl
...
Explicitly list dune-istl as a dependency.
2015-02-06 14:36:02 +01:00
Markus Blatt
ed36a439f8
Explicitly list dune-istl as a dependency.
...
This is in line with and closes issue #295
2015-02-06 11:28:42 +01:00
