Commit Graph
3960 Commits
Author SHA1 Message Date
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 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
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
babrodtk f7e3185546 Fixed bug where rsSat/rvSat were never set 2016-09-14 15:41:47 +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
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
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
Joakim Hove 67db2a5e5b Merge pull request #814 from joakim-hove/create-eclipse-grid
Updated OutputWriter signature.
2016-09-08 16:26:20 +02:00
Joakim Hove ff333b4112 Updated OutputWriter signature. 2016-09-08 10:18:52 +02:00
Atgeirr Flø Rasmussen 6962eb070c Merge pull request #813 from qilicun/fix-segfault-in-fip
Remove SolutionState dependency in FIP calculation.
2016-09-08 10:15:08 +02:00
Atgeirr Flø Rasmussen ef3926da9d Merge pull request #805 from babrodtk/output_writer_celldata
Output writer cell data
2016-09-08 09:55:09 +02:00
Liu Ming e0fad32695 remove SolutionState dependency in FIP calculation. 2016-09-08 09:41:02 +08:00
Andreas Lauser e21327dced use the PORV 3D property from opm-parser to determine the pore volume
this simplifies handling the pore volume by centralising the code,
i.e., moving it into opm-parser. (in particular, it makes the MINPV
handling consistent with the active cells which get removed by the
grid.) If eclipse turns out to be inconsistent here, we need to deal
with atrocities like the MULTREGP keyword on a case-by-case basis,
i.e., it would considerably uglify the code and be an additional
maintainance burden.

note that besides supporting of MULTREGP, the code should now also
handle explicitly setting the pore volume via the PORV keyword
correctly....
2016-09-07 15:04:30 +02:00
babrodtk f54db0f7f6 Removed need for extra constructor in CellData 2016-09-07 14:59:16 +02:00
babrodtk 17d171fae6 Fixed erroneous unit for b 2016-09-07 14:59:16 +02:00
babrodtk 332d1bb318 Removed special case handling of ALLPROPS keyword 2016-09-07 14:59:16 +02:00
babrodtk 0b24dffe05 Fixed unit for bw/bo/bg in output 2016-09-07 14:59:16 +02:00
babrodtk eb56ecab12 Refactored the logic of writing without cell properties 2016-09-07 14:59:16 +02:00
babrodtk 739976535f Added rs and rv output capabilities 2016-09-07 14:55:53 +02:00
babrodtk 40b2b95d87 Extended the support for keywords for restart file output 2016-09-07 14:55:53 +02:00
babrodtk 35bed24465 Initial version for outputting cell data 2016-09-07 14:55:53 +02:00
Atgeirr Flø Rasmussen 4d2d004c43 Merge pull request #769 from blattms/fix-step-used-by-parallel-io
Fix step number used by parallel io and OutputWriter::writeTimeStep
2016-09-07 14:09:56 +02:00
Atgeirr Flø Rasmussen ff09dbef71 Merge pull request #811 from atgeirr/remove-unneeded-include
Remove unused include.
2016-09-07 13:54:23 +02:00
Atgeirr Flø Rasmussen be8f8b479f Merge pull request #773 from blattms/honor-unordered_map-in-simulationdatacontainer-when-gathering-data
Do not assume ordering in an unordered_map when gathering data.
2016-09-07 13:52:08 +02:00
Atgeirr Flø Rasmussen 68a0d3796b Remove unused include. 2016-09-07 12:53:19 +02:00
Atgeirr Flø Rasmussen 98ec930a25 Merge pull request #770 from blattms/call-writeInit-before-distributing-grid
Call writeInit with global grid and properties.
2016-09-07 11:29:19 +02:00
Joakim Hove d7e054cbfa Merge pull request #804 from joakim-hove/remove-shared-ptr
shared_ptr<EclipseGrid> -> const EclipseGrid&
2016-09-07 11:12:29 +02:00
Atgeirr Flø Rasmussen f78155fe23 Merge pull request #808 from qilicun/fix-pav
Correct the formulation for PAV calculations.
2016-09-07 08:52:18 +02:00
Liu Ming 4b88d4edd1 use PV weighted pressure when HCPV is zero. 2016-09-07 14:00:30 +08:00
Liu Ming d5b4194a0e format fIP output for field units and check the phase is present or not. 2016-09-06 09:33:41 +08:00
Liu Ming 170607e60c check if the phase is present. 2016-09-05 16:14:27 +08:00
Liu Ming 1943978dbd update PAV formulation. 2016-09-05 10:38:57 +08:00
Atgeirr Flø Rasmussen 983c7d9957 Merge pull request #787 from totto82/fix_minpv_actnum
BUGFIX. Correctly handle ACTNUM in minPvFillProps_()
2016-09-02 15:17:28 +02:00
Markus Blatt 4a6be3d33b Fix step number used to create global well state in parallel output.
When running in parallel a well state object with the well information
of the whole grid needs to constructed to gather the information from all
processes. Previously, this was done with the report step exported by the
timer. This was wrong for the following reason:
The output occurs after solving the time step and the timer is already
incremented. This means that we constructed the well state for gathering the
data for the next report step, already. Unfortunately, at that step some
wells that we have computed results for might have been shut. In that case
an exception with message "global state does not contain well ..." was thrown.

This problem occured for Model number 2 and might have been due to shut wells
because of banned cross flow.

With this commit we use the last report step if this is not an initial write
and not a substep.
2016-09-02 14:41:47 +02:00
Markus Blatt 5ecead8e6f OutputWriter::writeTimeStep needs the report step and not the sub step.
At least that is what is documented.
2016-09-02 14:41:47 +02:00
Liu Ming c5a490c75a fix typo. 2016-09-02 16:58:42 +08:00