Commit Graph

4030 Commits

Author SHA1 Message Date
Andreas Lauser
6722c67534 Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v2 2016-09-29 18:38:39 +02:00
Andreas Lauser
fa626a543b make it work with the latest master branches
it broke because the Compat.hpp header was removed today.
2016-09-29 18:24:54 +02:00
Atgeirr Flø Rasmussen
4a82ac386b Merge pull request #844 from blattms/report-step-iterations-in-step_timing.txt
Correct number of (nonlineat) iterations/linearizations in step_timing.txt
2016-09-29 17:44:37 +02:00
Atgeirr Flø Rasmussen
4a6fcde45e Merge pull request #837 from totto82/output_solvent2
Output solvent saturation
2016-09-29 17:32:51 +02:00
Andreas Lauser
6aabc99814 Merge pull request #818 from andlaus/frankenstein_merge_master
Frankenstein merge master
2016-09-29 09:55:32 +02:00
Andreas Lauser
36b00ba570 Merge remote-tracking branch 'origin/master' into frankenstein_merge_master 2016-09-28 21:20:47 +02:00
Markus Blatt
0bdab6e579 Correct number of (nonlineat) iterations/linearizations in step_timing.txt
Previously, for all step zero was reported. With this commit
we set these numbers in the SimulatorReport and now they end
up correctly in step_timings.txt
2016-09-28 12:05:52 +02:00
Tor Harald Sandve
45eae4bbc8 Output solvent saturation
-- Compat.hpp is moved to opm-simulators
-- add SSOL if solvent is present
2016-09-27 08:40:04 +02:00
Atgeirr Flø Rasmussen
3e04ef89f4 Merge pull request #838 from atgeirr/avoid-pessimizing-move
Do not move when it would disable copy elision.
2016-09-26 10:25:01 +02:00
Atgeirr Flø Rasmussen
08c5e31265 Do not move when it would disable copy elision. 2016-09-26 09:33:13 +02:00
Tor Harald Sandve
7f91eade7e Move Compdat.hpp from opm-core to opm-simulators 2016-09-23 13:03:12 +02:00
Jørgen Kvalsvik
95143868a3 2 -> To 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
7448ecae09 Newlines 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
c468d9c84b Braces. 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
5f5d69da6f WellState::report() to make opm-output Well data 2016-09-23 12:59:18 +02:00
Jørgen Kvalsvik
9894f98910 utility/Compat
Introduces some helper functions to quickly enable support for the new
opm-output implementation. Conversion from simulator oriented cell- and
well representation to opm-output defined representation.
2016-09-23 12:59:18 +02:00
Atgeirr Flø Rasmussen
ec955690cd Merge pull request #834 from akva2/fix_regression_pr_833
fix output of gas phase
2016-09-21 10:54:29 +02:00
Arne Morten Kvarving
78049a174e fix output of gas phase
fixes a regression caused by 65b512e903
2016-09-21 10:46:50 +02:00
Arne Morten Kvarving
bf88ccc95a Merge pull request #821 from akva2/kristfho_moretests
Added more cases/models to ctest
2016-09-20 12:40:32 +02:00
Atgeirr Flø Rasmussen
c84abe63a5 Merge pull request #833 from ANerd/output_present_phases
Output well rates for present phases
2016-09-20 11:03:31 +02:00
Anders Matheson
65b512e903 Use PhaseUsage to determine output phases 2016-09-20 09:44:17 +02:00
Anders Matheson
0ac0c97612 Output rates for present phases 2016-09-19 16:43:41 +02:00
Atgeirr Flø Rasmussen
9d991292be Merge pull request #832 from totto82/fix_outputRSsat_solvent
BUGFIX. Store RsSat and RvSat in simulator container also in the Solvent model
2016-09-19 13:47:03 +02:00
Atgeirr Flø Rasmussen
06e41bdaca Merge pull request #819 from blattms/use-defunct-wells-from-loadbalancer-for-wellsmanager
Use names of defunct wells from loadbalancer for wellsmanager
2016-09-19 13:42:42 +02:00
Tor Harald Sandve
cb5238f5dc BUGFIX
Updated solvent model after #825
Store rsSat and rvSat in simulator container for outut.
2016-09-19 11:10:14 +02:00
Atgeirr Flø Rasmussen
51237cb960 Merge pull request #829 from blattms/parallelize-computeFluidInPlace
Correctly parallelize computeFluidInPlace
2016-09-19 09:31:05 +02:00
Atgeirr Flø Rasmussen
48f151bfca Merge pull request #806 from andlaus/implement_multregp
use the PORV 3D property from opm-parser to determine the pore volume
2016-09-16 09:46:22 +02:00
Atgeirr Flø Rasmussen
420a5b7b4f Merge pull request #827 from babrodtk/bugfix_output_writer_polymer
Added missing code for polymer model for output
2016-09-16 09:27:59 +02:00
babrodtk
5b75649a07 Simplified arguments to computeWaterShearVelocityFaces 2016-09-15 15:56:06 +02:00
Markus Blatt
2c70f05d6b Correctly parallelize computeFluidInPlace.
Its first implementation computed wrong results in parallel. With this commit
we noe have completely parallelized the computations and the results seem correct
for parallel runs with norne.
2016-09-15 15:43:08 +02:00
Markus Blatt
e15f9bfb9c Save space in computeFluidAndSpace.
Both hcpv and res will be used to save only dims elements. As dims
will most likely be much smaller than the number of cells, we only
allocate containers of size dims with this commit.
2016-09-15 15:35:27 +02:00
Andreas Lauser
6bc8080722 Merge remote-tracking branch 'totto82/frankenstein_mod' into frankenstein_merge_master
* totto82/frankenstein_mod:
  Avoid copying of matrices inside StandardWellsDense.
2016-09-15 11:48:24 +02:00
babrodtk
537c5d71b8 Added missing code for polymer model for output 2016-09-15 11:40:36 +02:00
Atgeirr Flø Rasmussen
bbd2575e00 Merge pull request #825 from babrodtk/bugfix_output_writer
Bugfix for output writer
2016-09-15 09:57:27 +02:00
Tor Harald Sandve
a84adf05a5 Merge pull request #2 from dr-robertk/frankenstein_mod
Avoid copying of matrices inside StandardWellsDense.
2016-09-14 16:03:19 +02:00
babrodtk
f7e3185546 Fixed bug where rsSat/rvSat were never set 2016-09-14 15:41:47 +02:00
Andreas Lauser
5278b88e2e Merge remote-tracking branch 'remotes/totto82/frankenstein_mod' into frankenstein_merge_master
* remotes/totto82/frankenstein_mod:
  Fix seg-fault for cases without wells
  Some micro performance improvments and cleaning
  Add THP support in the denseAD well model
  Only solve the linear system when it is not converged.
  Revert changes to NewtonIterationBlackoilInterleaved.cpp
  add and use class wellModelMatrixAdapter
  Remove unused code and remove Eigen vectors
  New updateState
  Some cleaning and small changes
2016-09-14 15:03:17 +02:00
Markus Blatt
8c18bfcc50 Added missing include for unordered_set.
This is what the travis build
https://travis-ci.org/OPM/opm-simulators/builds/159576974 complained about.
2016-09-14 14:41:27 +02:00
Kristian Hole-Drabløs
af2a59d1b8 Added more cases/models to ctest 2016-09-14 13:12:58 +02:00
Andreas Lauser
4ecd6ca64a fix some serious screw-ups
almost all of them were caused by recent changes in the master
branch:

- there were methods added which depend on the types `V` and
`DataBlock`. these do not make much sense in the context of the
frankenstein simulator. Also, these types are defined globally for the
whole Opm namespace in `BlackoilModelBase_impl.hpp` (which should be
prosecuted as a fellony IMO)! Besides this, their names are useless;
'V' is the letter which comes after `U` in the alphabet and when it
comes to computers basically everything can be seen as a chunk of data
(i.e., a `DataBlock`).
- it seems like the new and shiny dense-AD based well model was never
compiled with assertations enabled, at least some asserts referenced
non-existing variables.
- the recent output-related API changes were pretty unfortunate
because they had the effect of tying the (sub-optimal, IMO) internal
structure of the model even closer to the output code: as far as I can
see, `rq` does only make sense if the model works *exactly* like
BlackoilModelBase and friends. (for flow_ebos, this could be
replicated, but first it would be another unnecessary conversion step
and second, most of the quantities in `rq` are of type `ADB` and much
of the "frankenstein" excercise is devoted to getting rid of these.) I
thus reverted back to an old version of the output code and created a
`frankenstein` branch in my personal `opm-output` github fork.
2016-09-13 23:58:59 +02:00
Robert Kloefkorn
a9663447c2 Avoid copying of matrices inside StandardWellsDense. 2016-09-13 23:07:38 +02:00
Markus Blatt
63d785d7ba Work around explicit empty constructor of unordered_set in C++11
With GCC version (Debian 4.9.2-10) 4.9.2 we get the following error
when compiling with -std=c++11 (default for dune 2.4):

converting to ‘const std::unordered_set<std::basic_string<char> >’ from initializer list would use explicit constructor
2016-09-13 10:58:26 +02:00
Markus Blatt
33edf62a78 Use set of names of defunct wells from load balancer for parallel WellManager.
Instead of the WellsManager guessing which wells are handled by other
processes we now use tha ouput of the load balancer to compute wells
that are handled by other processes.

With the previous approach it was not possible to calculate this information
correctly. Wells with only one completion next to the border of the
processes' partition were represented on multiple processes. In additition
wells that the eclipse schedule section defined with completions on non-active
cells in sequential runs were not at all calculated in parallel runs.

With the new approach the CpGrid::loaBalance routine returns the set names of
wells that are not handled by this process when setting up the simulation. This
information is then used throughout the simulation.
2016-09-13 10:58:26 +02:00
Andreas Lauser
62de30d9b2 Merge remote-tracking branch 'origin/master' into frankenstein 2016-09-12 23:18:02 +02:00
Tor Harald Sandve
cd749b3452 Fix seg-fault for cases without wells 2016-09-09 15:17:34 +02:00
Tor Harald Sandve
49f3306abe Some micro performance improvments and cleaning
-- The jacobian and residual in the reservoir is updated directly
-- The sparsity pattern are provided to the well matrices.
-- Some cleaning in updateWellState()
2016-09-09 14:58:54 +02:00
Tor Harald Sandve
3d86cc3668 Add THP support in the denseAD well model
Tested on a set of modified SPE1DECK with VFP for injectors and
producers
2016-09-09 11:33:34 +02:00
Bård Skaflestad
fbc47cc186 Merge pull request #815 from bska/omit-empty-kr
phase-KR: Don't emit empty property arrays

This is a self-merge.
2016-09-08 19:32:36 +02:00
Bård Skaflestad
dccf75d806 Initialise fields in declaration order 2016-09-08 16:28:43 +02:00
Bård Skaflestad
964c0142cc phase-KR: Don't emit empty property arrays
Check that we actually have data values for relative permeability
properties {WAT,OIL,GAS}KR before attempting to output the arrays.

While here, also correct an apparent misprint in the criterion for
whether or not to activate relperm output.  We should check
'liquid_active' and 'vapour_active', not 'aqua_active', when
considering OILKR and GASKR properties respectively.
2016-09-08 16:28:43 +02:00