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
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
dr-robertk
4e1521692f
Merge pull request #514 from atgeirr/bump-version
...
Bump version and unify format of dune.module.
2015-10-23 15:13:13 +02:00
Atgeirr Flø Rasmussen
235570410d
Bump version and unify format of dune.module.
2015-10-23 13:18:47 +02:00
Atgeirr Flø Rasmussen
0ffcaeb9f0
Merge pull request #513 from atgeirr/add-moduleversion
...
Add moduleVersion() utility and update dune.version.
2015-10-23 13:10:38 +02:00
Atgeirr Flø Rasmussen
bb7530edc3
Add and use moduleVersion() utility.
2015-10-23 11:25:06 +02:00
Atgeirr Flø Rasmussen
6636d8e566
Update dune.module with correct deps and version.
2015-10-23 11:12:39 +02:00
Markus Blatt
975ac0dc37
Removes superfluous wellMap_ member from WellStateFullyImplicitBlackoil.hpp
...
There is a using `BaseType::wellMap` directive that redirects all the
well map accesses to the base class. In consequence the local wellMap_
is alway empty and just makes debugging harder. Therefore it is
removed in this commit.
2015-10-23 10:47:14 +02:00
Markus Blatt
ba9f227a5b
Cater for wells null pointer
...
In the rare occasion that there are no wells int the model the wells_ pointer in
BlackoilModelBase class is a null pointer. Therefore we need to test whether it is
null and only process well information if it is not.
This problem was reintroduced with PR #460 and gets fixed by this
one. No we can run the equilibrium examples without wells again.
Sorry for the inconvenience.
2015-10-22 16:28:18 +02:00
Bård Skaflestad
cfc1350717
Merge pull request #500 from blattms/removed-superfluous-ptr-during-redistribution
...
Remove unnecessary shared_ptr for geology and black oil properties during redistribution.
2015-10-22 15:27:40 +02:00
Markus Blatt
f5e34e01ca
Remove unnecessary shared_ptr for geology and black oil properties.
2015-10-22 15:24:25 +02:00
Atgeirr Flø Rasmussen
a362f2cf09
Merge pull request #509 from joakim-hove/use-opm-data
...
Use opm data
2015-10-21 21:57:45 +02:00
