Commit Graph

4114 Commits

Author SHA1 Message Date
Robert Kloefkorn
c8374a4b95 [cleanup] Remove Eigen from BlackoilModelEbos. 2016-10-21 13:26:48 +02:00
Andreas Lauser
2a9a803135 Merge pull request #871 from andlaus/frankenstein_merge_master_v5
Frankenstein merge master v5
2016-10-19 13:48:33 +02:00
Andreas Lauser
7cfe8322e2 Merge branch 'master' into frankenstein
* master:
  adapt to the removal of the unit system of opm-core
2016-10-19 13:30:44 +02:00
Andreas Lauser
b824c30e0c Merge pull request #870 from totto82/frankenstein_cache_reuse_fix
Frankenstein: InvalidateCache when restaring the timestep
2016-10-19 13:16:25 +02:00
Tor Harald Sandve
3600c45619 Merge pull request #865 from andlaus/frankenstein_fix_valgrind_errors
frankenstein: fix some valgrind complaints
2016-10-19 12:35:10 +02:00
Andreas Lauser
5007d99c0d flow_ebos: re-eanable the 'tempV.maxCoff()' convergence check for the well model
the 'tempV' object currently only contains garbagee but the condition
is needed and will thus be fixed in a different PR.

thanks goes to @totto82 for the clarifications.
2016-10-19 12:28:07 +02:00
Tor Harald Sandve
89fcbe3e60 InvalidateCache when restaring the timestep
Keep track of whether it is a restart or not and invalidate the
intensive quantitiesCache in ebos when restarting the timestep due to
convergence issues.
2016-10-19 12:08:49 +02:00
Atgeirr Flø Rasmussen
93ffb318cd Merge pull request #855 from andlaus/opm-parser_units
adapt to the removal of the unit system of opm-core
2016-10-18 15:25:42 +02:00
Andreas Lauser
45f11d8820 StandardWellsDense: fix some valgrind complaints
note that I don't know if these changes are semantically correct (I
doubt it), but this patch fixes the valgrind complaints I saw for
SPE9_CP and on Norne.

Also, this makes the timing of flow_ebos for SPE9 determinisic between
runs: without this, I got some random time steps fail in a given run
and in the next run a completely different set of timesteps
failed. Since this was on the same same machine, without any
recompiles and no changes to the deck or any other input parameters, I
initially attributed the behavior to cosmic rays ;)

@totto82: could you have a thorough look on this?
2016-10-17 18:56:38 +02:00
Andreas Lauser
aaf21f4eff Merge pull request #868 from andlaus/frankenstein_geo_events
flow_ebos: support for geology changes during the simulation
2016-10-17 18:40:50 +02:00
Andreas Lauser
b8e5a6e12d flow_ebos: support for geology changes during the simulation
the actual work is done in the EclProblem. Removing the stuff here is
just necessary in order not to apply the modifier deck twice...
2016-10-17 17:06:20 +02:00
Andreas Lauser
2dc69b4551 *arg* I accidentally merged some local changes with the last PR... 2016-10-17 16:32:28 +02:00
Andreas Lauser
9dc30cc0ac Merge pull request #867 from andlaus/frankenstein_merge_master_v4
Frankenstein merge master v4
2016-10-17 16:31:47 +02:00
Andreas Lauser
1c1e0c18b7 flow_ebos: fix the build
once again, the culprit was an API change in opm-output. I suppose
this means that the frankenstein branch should be merged soon after
the release in order to avoid to continue breaking the flow_ebos build
twice a week.
2016-10-17 16:24:49 +02:00
Andreas Lauser
6a093c3e24 Merge remote-tracking branch 'origin/master' into frankenstein 2016-10-17 14:33:34 +02:00
Joakim Hove
f90e608bfc Merge pull request #851 from joakim-hove/use-celldata-container
data::Solution for opm-output communication.
2016-10-17 11:46:45 +02:00
Andreas Lauser
bbe8d50804 Merge pull request #864 from andlaus/frankenstein_merge_master_v3
Frankenstein merge master v3
2016-10-14 20:20:53 +02:00
Andreas Lauser
44d3d5b536 Merge branch 'master' into frankenstein
* master: (42 commits)
  Let only one rank write to step_timing.txt
  Do not refer users to issue tracker if multiple procs log.
  Remove unused variable.
  Use vector instead of VLA, also add missing includes.
  changed: bundle eigen3 in the original tarball for debian
  update redhat6 packaging
  Bugfix parallel computation of weighted pressure etc.
  Fixed uninitialized bug, and added logging/comment
  Removed superfluous std::move
  Refactoring
  Initial version of summary data
  Do not store collective communication in the wells object.
  Make sure that updateWellControls is called on each process.
  Make WellSwitchingLogger work with DUNE 2.3
  Schedule::getGroup returns reference, not pointer
  Removed warning in WellSwitchLogger::calculateMessageSize
  Correctly initialize MPI for multisegment wells test
  Changed some names in WellSwitchingLogger
  Use speaking name for bool in getCellData
  Whitespace and other formatting changes
  ...
2016-10-14 19:31:56 +02:00
Atgeirr Flø Rasmussen
79de15e21d Merge pull request #861 from blattms/fix-parallel-step_timings.txt-writing
Let only one rank write to step_timing.txt
2016-10-14 13:42:33 +02:00
Atgeirr Flø Rasmussen
d007cd8e6e Merge pull request #859 from atgeirr/compile-fixes
Compile fixes
2016-10-14 13:31:12 +02:00
Atgeirr Flø Rasmussen
262d2e1172 Merge pull request #860 from blattms/skip-hint-to-issue-tracker
Do not refer users to issue tracker if multiple procs log.
2016-10-14 13:30:00 +02:00
Markus Blatt
a7cc4962e2 Let only one rank write to step_timing.txt
All ranks were still writing to step_timing.txt at the same time.
This made it unusable for parallel runs. With this commit only
one processes writes to this file.
2016-10-14 11:14:54 +02:00
Markus Blatt
a424516639 Do not refer users to issue tracker if multiple procs log.
This is currently still happening due to the implementation of
OPM_THROW whenever the linear solver does not converge. This
happens quite often and we might not want to get overwhelmed by
the issue tracker.
2016-10-14 10:47:16 +02:00
Atgeirr Flø Rasmussen
580e76cf05 Remove unused variable. 2016-10-13 17:09:43 +02:00
Atgeirr Flø Rasmussen
654a24b625 Use vector instead of VLA, also add missing includes. 2016-10-13 17:08:52 +02:00
Arne Morten Kvarving
cdf7f3cc0d Merge pull request #857 from akva2/update_packaging_devtoolset
update redhat6 packaging
2016-10-12 15:53:03 +02:00
Arne Morten Kvarving
e9a3f59492 Merge pull request #856 from akva2/update_packaging_eigen
changed: bundle eigen3 in the original tarball for debian
2016-10-12 15:52:44 +02:00
Arne Morten Kvarving
44879c94c4 changed: bundle eigen3 in the original tarball for debian
brings back packages on ubuntu xenial
2016-10-12 15:48:13 +02:00
Arne Morten Kvarving
e173306403 update redhat6 packaging
build using devtoolset-3
2016-10-12 14:18:19 +02:00
Andreas Lauser
d76bf11902 adapt to the removal of the unit system of opm-core
the one which is in opm-parser is now a drop-in replacement.
2016-10-10 17:00:09 +02:00
Joakim Hove
39be053aef Using data::Solution for transfer of 3D data. 2016-10-10 10:52:51 +02:00
Atgeirr Flø Rasmussen
7e0cb99bad Merge pull request #839 from babrodtk/summary_data
Summary data output
2016-10-10 10:00:17 +02:00
Tor Harald Sandve
0458d9357c Merge pull request #854 from andlaus/frankenstein_must_solve
flow_ebos: only invalidate the intensive quantities after an iteration if necessary
2016-10-10 08:26:13 +02:00
babrodtk
68f1cff930 Bugfix parallel computation of weighted pressure etc. 2016-10-07 15:11:59 +02:00
babrodtk
8ff349253c Fixed uninitialized bug, and added logging/comment 2016-10-07 15:11:59 +02:00
babrodtk
4f696809b3 Removed superfluous std::move 2016-10-07 15:11:59 +02:00
babrodtk
2d8e612d01 Refactoring 2016-10-07 15:11:59 +02:00
babrodtk
b774982878 Initial version of summary data 2016-10-07 15:06:53 +02:00
Atgeirr Flø Rasmussen
f3ac93a8c8 Merge pull request #853 from blattms/fix-PR-842
Make WellSwitchingLogger work with DUNE 2.3
2016-10-07 14:50:18 +02:00
Andreas Lauser
43601b98af flow_ebos: only invalidate the intensive quantities after an iteration if necessary
"if necessary" means that the solution has changed (which is the case
iff the linear solver needs to do some work...
2016-10-07 11:46:08 +02:00
Markus Blatt
828f118801 Do not store collective communication in the wells object.
Instead of this we rely on the default constructor of
WellSwitchingLogger. This finally fixes the compile
issues with DUNE 2.3.
2016-10-07 10:46:54 +02:00
Pål Grønås Drange
955ffbd80e Merge pull request #852 from jokva/remove-shared-ptrs-from-schedule
Schedule::getGroup returns reference, not pointer
2016-10-06 13:01:23 +02:00
Markus Blatt
3e6b1949ea Make sure that updateWellControls is called on each process.
The new WellSwitchingLogger within updateWellControls uses
collective communication with all processes. Therefore all
of them need to enter the function as other flow_mpi will deadlock.
Therefore this commit calls the method even with non local wells
active.
2016-10-05 23:53:43 +02:00
Markus Blatt
2a1388d124 Make WellSwitchingLogger work with DUNE 2.3
That version does not provide a default constructor for
CollectiveCommunication, Therefore we now use
MPIHelper::getCollectiveCommunication() for the default
constructor argument.
2016-10-05 16:13:11 +02:00
Jørgen Kvalsvik
13a4364d55 Schedule::getGroup returns reference, not pointer 2016-10-05 15:32:24 +02:00
Atgeirr Flø Rasmussen
f598906e09 Merge pull request #842 from blattms/fix-parallel-output
Fix parallel output
2016-10-05 15:16:28 +02:00
Markus Blatt
14eeb7c39a Removed warning in WellSwitchLogger::calculateMessageSize 2016-10-05 13:51:08 +02:00
Markus Blatt
3dbc6f5500 Correctly initialize MPI for multisegment wells test 2016-10-05 12:29:56 +02:00
Markus Blatt
99bf74c705 Changed some names in WellSwitchingLogger 2016-10-05 11:45:59 +02:00
Markus Blatt
80fb5b66d7 Use speaking name for bool in getCellData 2016-10-05 11:45:59 +02:00