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
Joakim Hove
8302db443b
Try to find opm-data and run flow on SPE1 case.
2015-10-21 18:43:08 +02:00
Joakim Hove
a879e9cd41
Removed cmake setting : NON_PUBLIC_TEST
2015-10-21 16:56:10 +02:00
Atgeirr Flø Rasmussen
f15be17d14
Merge pull request #508 from joakim-hove/cpr-config
...
Changes to solver approach configuration:
2015-10-21 13:04:58 +02:00
Joakim Hove
0a7c778c36
Changes to solver approach configuration:
...
1. Added new parameter group string: "solver_approach" which can take
the values {direct, cpr, interleaved}.
2. Hierarchy:
i If a value is set in the parameter group that takes absolute
presedence.
ii If the Eclipse input deck asks for CPR - you get CPR.
iii You get the flow default - currently interleaved.
2015-10-21 13:01:44 +02:00
Atgeirr Flø Rasmussen
1028af6aff
Merge pull request #507 from akva2/update_redhat_packaging
...
update redhat packaging
2015-10-20 18:34:10 +02:00
Arne Morten Kvarving
b04d7f81c7
update redhat packaging
2015-10-20 15:55:39 +02:00
Atgeirr Flø Rasmussen
a106ef0636
Merge pull request #504 from akva2/update_debian_packaging
...
update debian packaging
2015-10-20 10:20:02 +02:00
Arne Morten Kvarving
a35c78bfc9
update debian packaging
2015-10-20 09:47:26 +02:00
Atgeirr Flø Rasmussen
9cbae76d06
Merge pull request #503 from babrodtk/openpm_experiment
...
Added/fixed comments
2015-10-20 09:32:30 +02:00
André R. Brodtkorb
d43b88af76
Added/fixed comments
2015-10-20 09:30:06 +02:00
Atgeirr Flø Rasmussen
98a3d1675a
Merge pull request #454 from babrodtk/openpm_experiment
...
Parallel assembly (partial)
2015-10-19 15:32:50 +02:00
André R. Brodtkorb
a208f793d5
Set OpenMP default to off
2015-10-19 15:21:08 +02:00
Atgeirr Flø Rasmussen
2bf42e1eb2
Merge pull request #494 from totto82/crossflow
...
Add support for banning cross-flow in a well
2015-10-19 14:41:17 +02:00
André R. Brodtkorb
40d2262f8e
Fixed typo
2015-10-19 14:25:45 +02:00
Tor Harald Sandve
f02a02320d
Small fixes for readabilty
2015-10-19 08:34:16 +02:00
Tor Harald Sandve
16140c54fc
Update comment
...
Cases with wells with no flow where crossflow is banned is handled in
the parser by shutting these wells. They will never be seen by the
simulator.
2015-10-19 08:17:52 +02:00
Tor Harald Sandve
0a5364a1d8
Modifications to handle additional argument in add_well()
2015-10-19 08:17:52 +02:00
Tor Harald Sandve
1772a8c257
Handle allowCrossFlow flags from the input deck
2015-10-19 08:15:21 +02:00
Tor Harald Sandve
3f089b10d8
Add support for banning crossflow in the well equations
2015-10-19 08:15:21 +02:00
Atgeirr Flø Rasmussen
0f40727fa2
Merge pull request #502 from atgeirr/new-arg-add-well
...
Add "allow crossflow" argument to add_well() calls.
2015-10-15 10:04:09 +02:00
Atgeirr Flø Rasmussen
67f1def789
Add "allow crossflow" argument to add_well() calls.
2015-10-15 09:54:53 +02:00
Atgeirr Flø Rasmussen
df668cc5e7
Merge pull request #497 from andlaus/error_macros_to_opm_common
...
Error macros to opm common
2015-10-12 13:31:54 +02:00
Atgeirr Flø Rasmussen
57dfce29be
Merge pull request #499 from blattms/remove-source-file-for-flow_cp-and-rename-to-flow_parallel
...
Renamed flow_cp to flow_mpi
2015-10-12 11:18:14 +02:00
Markus Blatt
82a73d969e
Renamed flow_cp to flow_mpi
2015-10-12 10:59:01 +02:00
dr-robertk
3b0ebf92c0
Merge pull request #498 from atgeirr/minor-fixes-interleaved
...
Fix compile warning and error message.
2015-10-09 13:51:50 +02:00
Atgeirr Flø Rasmussen
6170542e2f
Fix compile warning and error message.
2015-10-09 13:49:00 +02:00
Atgeirr Flø Rasmussen
46afd22860
Merge pull request #496 from dr-robertk/PR/variable-np-in-newton
...
NewtonBlackølInterationInterleaved: allow np to be variable.
2015-10-09 13:43:39 +02:00
Robert Kloefkorn
4d121dccf4
NewtonIterationBlackoilInterleavedImpl: cleanup.
2015-10-09 13:39:02 +02:00
Robert Kloefkorn
476a09e0d6
NewtonIterationBlackoilInterleaved: print "...to cover np = 0"
2015-10-09 12:12:50 +02:00