Commit Graph
2252 Commits
Author SHA1 Message Date
Bård Skaflestad 65da8b7e11 Merge pull request #531 from blattms/parallel-RateConverter
Calculate parallel averages in RateConverter.

Closes issue #530
2015-11-13 18:26:36 +01:00
Markus Blatt 5449047682 Splits a very long line. 2015-11-13 15:52:01 +01:00
Markus Blatt 8148c37d57 Improved documentation 2015-11-13 15:46:45 +01:00
Markus Blatt 980928bfa9 Fix boolean in specialization.
The default implementation is the parallel version. Therefore the boolean
in the specialization (sequential run) needs to be false.
2015-11-13 15:46:34 +01:00
Markus Blatt f8715e31e7 Calculate parallel averages in RateConverter.
Previously, local averages were calculated and used in the
well equations. With this commit we add versions of defineState and
calcAverages that take into account the parallel domain decomposition
and calculate correct averages.

Function  calcAverages has a boolean template parameter
indicating whether this is a parallel run. Additionally we introduce
AverageIncrementCalculator with the same boolean template parameter.
In a parallel run we check whether the cell is owned by the process and
only in this case return an increment bigger than zero. In a sequential run
(no MPI or just one process -> empty boost::any parameter) no overhead is
introduced.
2015-11-13 15:46:34 +01:00
Andreas Lauser 4f23ef92e3 adapt to the threshold pressure related API changes
to be able to determine the threshold pressure from the initial
condition it needs to be able to access the initial condition, i.e.,
the initial simulator state, material properties object and gravity
constant need to be passed to the thresholdPressure() function.
2015-11-13 15:38:28 +01:00
Atgeirr Flø Rasmussen 88fbe5e9b6 Ensure non-null model in constructor. 2015-11-13 15:08:00 +01:00
Atgeirr Flø Rasmussen 2a0051655c Merge pull request #520 from totto82/surface_dens
Support for non-constant surface densities
2015-11-13 11:40:30 +01:00
Atgeirr Flø Rasmussen 87330984aa Adapt to renaming of class. 2015-11-12 17:55:13 +01:00
Atgeirr Flø Rasmussen 29a1a891d2 Make nonlinearIteration() the only interface to the model.
This means that details such as calling assemble(), solveJacobianSystem(),
updateState() etc. are now left to the model class. This will make it easier
to create new model classes with different behaviour (such as sequential models).
2015-11-12 17:47:18 +01:00
Atgeirr Flø Rasmussen 7c21a630e5 Rename NewtonSolver -> NonlinearSolver. 2015-11-12 17:42:47 +01:00
Atgeirr Flø Rasmussen 9a4bb383df Merge pull request #538 from atgeirr/silence-warning
Silence unused argument warning.
2015-11-12 17:38:49 +01:00
Atgeirr Flø Rasmussen ea8eab6e66 Silence unused argument warning. 2015-11-12 17:38:07 +01:00
Atgeirr Flø Rasmussen d3db342085 Merge pull request #529 from dr-robertk/PR/adaptive-timestepping-revision
BlackOilModelBase: revision of adaptive time stepping.
2015-11-12 17:23:15 +01:00
Bård Skaflestad 112b0b7e6e Merge pull request #537 from andlaus/update_cdash_drop_site
cdash: update dropsite
2015-11-11 19:22:09 +01:00
Andreas Lauser 0df880ce43 cdash: update dropsite 2015-11-11 16:50:25 +01:00
Robert Kloefkorn ab12d95273 relativeChange: brackets for if statement. 2015-11-10 10:07:57 -07:00
Robert Kloefkorn ebf61ed1bd added docu. 2015-11-10 10:05:06 -07:00
Robert Kloefkorn 31aa0544e7 computeTimeError --> relativeChange. 2015-11-10 10:00:04 -07:00
Robert Kloefkorn 77f9977ca8 BlackOilModelBase: revision of adaptive time stepping such that time error is computed
by model.
2015-11-10 09:53:25 -07:00
Tor Harald Sandve a47c9add9b Change interface of surfaceDensity()
Add phaseIdx as input and return array of n density values for the
phase. And adapt the usage accordingly.
2015-11-10 14:54:49 +01:00
Bård Skaflestad 308a3fd57e Merge pull request #535 from atgeirr/bug-in-scalar-autodiff
Fix bug in scalar autodiff
2015-11-10 14:02:49 +01:00
Atgeirr Flø Rasmussen a8227f977e Modify test to trigger on buggy behaviour in AutoDiff. 2015-11-10 13:37:36 +01:00
Atgeirr Flø Rasmussen 5977590e70 Bugfix for scalar AutoDiff class.
Missing chain-rule usage in Scalar/AD operator.
2015-11-10 13:37:36 +01:00
Tor Harald Sandve a46b64adcd Support for non constant surface densities
The surface density function returns one value pr cell to allow for non
constant surface densities.
2015-11-10 12:49:19 +01:00
Bård Skaflestad 91af12034c Merge pull request #533 from atgeirr/install-flow-solvent
Add flow_solvent to list of programs to be installed.
2015-11-05 14:18:24 +01:00
Atgeirr Flø Rasmussen 7c620f11fd Add flow_solvent to list of programs to be installed. 2015-11-05 08:33:14 +01:00
Bård Skaflestad a3d4224445 Merge pull request #527 from blattms/fix-sequential-redist-grid
Only specialize distributeGridAndData for CpGrid if MPI is found.
2015-10-30 19:31:26 +01:00
Markus Blatt e729c26b26 Only specialize distributeGridAndData for CpGrid if MPI is found. 2015-10-30 13:23:52 +01:00
dr-robertk c5c50391d0 Merge pull request #525 from blattms/adapt_flow_solvent-to_redistribute_interface_change
Adapts flow_solvent to change in redistribution interface.
2015-10-29 16:38:10 +01:00
Markus Blatt 113949190b Removes unused typedef 2015-10-29 16:35:58 +01:00
dr-robertk bef611ca83 Merge pull request #524 from blattms/prevent-copying-porevolume
Prevent copying the porevolume when checking for convergence.
2015-10-29 16:26:11 +01:00
Markus Blatt d29a181336 Adapts flow_solvent to change in redistribution interface. 2015-10-29 16:15:30 +01:00
Markus Blatt 1916c8d35a Prevent copying the porevolume when checking for convergence.
As it is just used to compute the tempV value there is no need to
copy it to a new vector. With commit we use a reference to
geo.poreVolume() instead to prevent the copy.
2015-10-29 16:12:54 +01:00
Atgeirr Flø Rasmussen ef41a0db02 Merge pull request #522 from dr-robertk/PR/paralleldebugoutput-wells-init
ParallelDebugOutput: initialize wells with current report step number.
2015-10-28 21:14:38 +01:00
Atgeirr Flø Rasmussen 8fe406b73c Merge pull request #523 from blattms/use-local-material-manager-by-communication
Use local material manager by communication
2015-10-28 21:14:16 +01:00
Robert Kloefkorn 9d5df94080 ParallelDebugOutput: remove warning and cleanup. 2015-10-28 19:03:37 +01:00
Robert Kloefkorn e30688fb85 ParallelDebugOutput: initialize wells with current report step number. 2015-10-28 19:03:37 +01:00
Markus Blatt f167d321aa Added some spaces around parenthesis. 2015-10-28 16:44:14 +01:00
Markus Blatt 134b47a5e2 Fixes SaturationPropsFromDeck handling during redistribution.
It needs a material law manager that works on the processes local
grid partition. Therfore copying the one from the global representation
does not work. Instead we now create an new SaturationPropsFromDeck and
initialize it with the local material law manager.
2015-10-28 16:44:14 +01:00
Markus Blatt 4526cce41b Setup a distributed material law manager and copy values.
Since the refactoring to using opm-material a material law  manager for
the global grid was used. This meant that the properties used for
elements of the local grid were wrong. With this commit we set up a
manager that is based on the local grid only.
2015-10-28 16:39:47 +01:00
Atgeirr Flø Rasmussen 8e5c9b77ea Merge pull request #518 from blattms/communicate-rock-properties
Communicate rock properties, too.
2015-10-28 16:36:38 +01:00
Atgeirr Flø Rasmussen 38bd6b1484 Merge pull request #519 from blattms/fix-parallel-equation-scaling-factor
Correctly compute the scaling factor for the equations in parallel.
2015-10-28 16:35:47 +01:00
Markus Blatt 6ee021f0c6 Fixed indentation. 2015-10-28 16:26:45 +01:00
Markus Blatt c17af8efe6 Update and improve documentation. 2015-10-28 16:23:07 +01:00
Markus Blatt f447cf648a fix compilation of flow_solvent. 2015-10-27 17:13:01 +01:00
Markus Blatt e555cd45f1 Correctly compute the scaling factor for the equations in parallel.
When running parallel one cannot use Eigen::Array::mean() for this
as the it is just a local part of the complete array. With this commit
we correctly compute the number of global cells in the grid and use this
together with a parallel reduction to compute a global mean value.
2015-10-27 01:58:16 +01:00
Markus Blatt 87e02a1059 Communicate rock properties, too.
Somehow I was mislead by the name rock properties that the data stored in
them is not associated to grid cells, but to rock regions. With this commit
we determine the porosity and permeability by communication.
2015-10-26 10:49:35 +01:00
dr-robertk fe1ba16e40 Merge pull request #511 from blattms/prevent-processing-wells-null-pointer-fixed
Cater for wells null pointer
2015-10-23 16:23:13 +02:00
dr-robertk 4490f07f9f Merge pull request #512 from blattms/remove-superfluous-wellmap
Removes superfluous wellMap_ member from WellStateFullyImplicitBlackoil
2015-10-23 15:14:56 +02:00