Commit Graph

108 Commits

Author SHA1 Message Date
babrodtk
ba2973dbbe Fixed apparent bug in outputting PDPB 2017-02-27 10:28:31 +01:00
Atgeirr Flø Rasmussen
980a6191b2 Bugfix: make viscosity output conditional. 2017-02-24 10:56:44 +01:00
Atgeirr Flø Rasmussen
296b0c61d6 Merge pull request #1068 from babrodtk/initial_restart
Added writing initial timestep data to restart
2017-02-24 09:17:30 +01:00
Atgeirr Flø Rasmussen
10f6c64502 Merge pull request #1072 from atgeirr/fix-wellstate
Towards fixing restart for flow_ebos
2017-02-24 09:11:25 +01:00
Atgeirr Flø Rasmussen
2e8ff72e9e Rename template variable for clarity. 2017-02-23 10:21:45 +01:00
babrodtk
3e44bb1e4e Updated so that VOIL/VGAS/VWAT are supported keywords 2017-02-22 11:18:24 +01:00
babrodtk
1e5df1b720 Added writing initial timestep data to restart 2017-02-22 10:12:47 +01:00
babrodtk
d21443ae60 Updated auxillary=>auxiliary in new code 2017-02-17 10:44:52 +01:00
babrodtk
4a46451d95 Added output of dew and bubble point pressures 2017-02-17 10:40:43 +01:00
babrodtk
edffbcd3f8 Renamed auxillary to auxiliary 2017-02-15 14:47:24 +01:00
Atgeirr Flø Rasmussen
41fb8eb933 Remove pessimizing move and silence warnings. 2017-02-14 10:50:31 +01:00
Robert Kloefkorn
4c118c6455 Merge remote-tracking branch 'upstream/master' into PR/cleanup-output-writers 2017-02-13 21:28:54 +01:00
Atgeirr Flø Rasmussen
27c0430932 Change include paths for moved headers. 2017-02-10 16:07:25 +01:00
Robert Kloefkorn
82658c92d0 Removal of SimulatorFullyImplicitBlackoilOutputEbos.{h,c}pp.
All simulators now use SimulationDataContainer to store intermediate data that
is passed to the output Solution container. This is in cases not the most
efficient way, but it's unified to avoid errors from code duplication.
2017-02-09 16:57:45 +01:00
Arne Morten Kvarving
a14f5392ee fixed: pass the fipnum data into the adaptive timer stepper
summary substep reports requires FIP data
2017-02-09 09:35:40 +01:00
Andreas Lauser
42ec0ca3c3 do not explicitly pass the permeability to the well model anymore
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
detail (ordering of the permeability matrices) of the simulator on the
well model. If this needs to be done for performance reasons, IMO it
would be smarter to pass an array of matrices instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.
2017-01-27 13:06:09 +01:00
Joakim Hove
270e5f9c0e Passing keys to the restart load function.
- Renamed EclipseWriter -> EclipseIO.
 - Loading from restart file is a method on the EclipseIO class.
2017-01-25 23:16:08 +01:00
Arne Morten Kvarving
f813d829e4 fixed: [WAT|OIL|GAS)KR are ratios and thus dimensionless 2016-11-24 17:43:06 +01:00
Markus Blatt
88e118d76a Consistently use WellStateFullyImplicitBlackoil in output
Otherwise we cannot write out all the data in a parallel run.
2016-11-21 21:19:51 +01:00
Atgeirr Flø Rasmussen
cf84626da0 Merge pull request #929 from blattms/flexible-parallel-ouput
Allow output for user requested data in parallel runs.
2016-11-17 11:40:09 +01:00
Bård Skaflestad
8cc64402be Merge pull request #927 from GitPaean/warning_fixing
a few warning fixing.
2016-11-16 18:48:51 +01:00
Markus Blatt
00440ab344 Use data::Solution to gather cell data including user requested data.
Previously only the cell data registered with SimulationDataContainer
war gathered during parallel output. User requested data was neglected
and a warning was issued. With this commit we intialize the local view
of data::Solution on all processes with the data registered in
SimulationDataContainer and add cell data requested by the user. This is
then gathered on the IO process, and used for the output layer. To
rudimentarily support matlab we also create a global view of
SimulationDataContainer for it.
2016-11-16 17:11:24 +01:00
Markus Blatt
5ad813b4bd Warn about broken parallel matlab output.
If this is a parallel run and matlab output is requested then
we issue a warning that it is broken because of wrong velocities.
2016-11-16 17:09:53 +01:00
Kai Bao
1c34af4dea a few warning fixing. 2016-11-16 13:17:35 +01:00
Markus Blatt
b91f747a3e Removed second implementation of matlab output.
There is already a generic one with the Grid implementation
being the template parameter in the header file. The other
implementation using UnstructuredGrid does exactly the same.
Therefore we remove it with this commit.
2016-11-16 12:16:40 +01:00
Markus Blatt
55362ecdc2 Fix spelling in warning about unhandled parallel ouput. 2016-11-15 12:08:58 +01:00
Markus Blatt
8632c71cef Do not populate cellData but issue a warning in parallel.
This will lead to some data missing in the parallel runs
but will allow successful runs.
2016-11-10 17:46:49 +01:00
Markus Blatt
747c93e898 Removed ternary operator in inline initialization.
This made the code rather hard to read. Now we do the initialization
in the constructor body if needed.
2016-11-10 13:28:21 +01:00
Markus Blatt
3eba3353d0 Correctly mark transfer of ownership for ouptut writer 2016-11-10 13:04:30 +01:00
Markus Blatt
077dc02481 Fix using local active cells for writing eclipse files in parallel.
Previously, the eclipseGrid used by EclipseWriter was constructed from
the one in the EclipseState with the current CpGrid. Unfortunately the
latter was the distributed version resembling only the local part that
the processor works on. Therefore the information about the active cells
was wrong when writing results (which raised an exception in the writer).

With this commit we construct the EclipseWriter before distributing the grid
and use this writer later on in the OutputWriter.
2016-11-07 19:35:53 +01:00
Atgeirr Flø Rasmussen
1fe610ef5a Bugfix: properly handle two-phase cases.
Errors were found in FIP handling and output.
2016-10-27 11:02:04 +02:00
Atgeirr Flø Rasmussen
77abb6de1c Merge pull request #840 from jokva/output-data-wells-sans-vectors
WIP: Output data wells sans vectors
2016-10-21 15:00:39 +02:00
Atgeirr Flø Rasmussen
9e1ba49554 Bugfix: missing return. 2016-10-20 22:40:24 +02:00
Jørgen Kvalsvik
1c6a4b34da Update to shared_ptr-less parser interface. 2016-10-20 14:08:04 +02:00
Jørgen Kvalsvik
6ba21fd4c0 Update to interface change in opm-output 2016-10-19 12:06:43 +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
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
Joakim Hove
39be053aef Using data::Solution for transfer of 3D data. 2016-10-10 10:52:51 +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
Markus Blatt
80fb5b66d7 Use speaking name for bool in getCellData 2016-10-05 11:45:59 +02:00
Markus Blatt
12b3456f3b Fixup 46e22f515 2016-10-05 10:33:15 +02:00
Markus Blatt
6d0d063413 Omit "Unhandled keyword" messages on non-root processes 2016-10-05 10:33:14 +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
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
babrodtk
f7e3185546 Fixed bug where rsSat/rvSat were never set 2016-09-14 15:41:47 +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
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
ff333b4112 Updated OutputWriter signature. 2016-09-08 10:18:52 +02:00