Commit Graph
67 Commits
Author SHA1 Message Date
Jørgen Kvalsvik 3c6fc0288a Update to shared_ptr-less parser interface. 2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik 8b30078339 Remove Equil + EquilWrapper, replace with upstream
Upstream (opm-parser) now provides a better Equil + EquilRecord, and
simultaneously deprecated EquilWrapper. This patch fixes the resulting
breakage.

One important note: The new Equil does not expose integers for live
oil/wet gas initialization procedure methods, but rather booleans
through constRs/constRv methods. This is how the variable behaves
according to the Eclipse reference manual (EQUIL keyword section).

Code has been updated to reflect this.
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik 0b797bd972 Add missing opm-parser headers
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik 916a0868cb Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2018-01-02 14:28:06 +01:00
Jørgen Kvalsvik bbb30de74e Don't rely on Deck for checkTable and checkPhase
Prefer using EclipseState over Deck.
2016-12-20 14:08:58 +01:00
Jørgen Kvalsvik d2b5327a72 RockCompressibility takes only EclipseState 2016-12-20 12:39:34 +01:00
Jørgen Kvalsvik 6e92374d34 Read ROCK from EclipseState, not Deck 2016-12-20 12:24:27 +01:00
Jørgen Kvalsvik 98a3a6a3f8 Read ROCK from EclipseState, not Deck 2016-12-20 12:24:27 +01:00
jokva c240f044d2 Merge pull request #1123 from jokva/read-pressure-swat-sgas-from-es
Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState
2016-12-20 10:01:13 +01:00
Jørgen Kvalsvik 3bdd674aac Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState
Prefer reading these values from EclipseState rather than the Deck type.
2016-12-19 14:26:27 +01:00
Jørgen Kvalsvik 5278a1f193 Use Density from EclipseState 2016-12-15 16:06:46 +01:00
jokva efc2a79540 Merge pull request #898 from joakim-hove/remove-stale-output
Removed all calls to writeECLData.
2016-12-06 16:06:15 +01:00
Jørgen Kvalsvik f8b1bef974 Read PVTW from EclipseState
Read the PVTW table entries from EclipseState rather than manually
through the Deck object.
2016-12-06 14:53:41 +01:00
Jørgen Kvalsvik 28c36ef949 Mini deck is reference, not pointer 2016-12-01 16:18:04 +01:00
Jørgen Kvalsvik 3088068e37 Mini deck is reference, not pointer 2016-12-01 16:17:52 +01:00
Jørgen Kvalsvik ccd38c0cf7 Ask for reference depth at timestep. 2016-11-22 14:22:09 +01:00
Jørgen Kvalsvik ffc3de0f6e Rename to EclipseWriter.writeInitial 2016-11-22 09:52:41 +01:00
Jørgen Kvalsvik 478ac16a1b GroupTree interface changed upstream
Updates to the slightly modified GroupTree interface from opm-parser.
2016-11-09 13:04:33 +01:00
jokva cb16d1391f Merge pull request #903 from jokva/remove-sdc-pointer
Remove Solution.sdc assignment
2016-11-09 11:50:36 +01:00
Jørgen Kvalsvik 2bdc46c557 Remove Solution.sdc assignment 2016-11-09 10:46:26 +01:00
Jørgen Kvalsvik afde06c39f Use new DeckItem constructor interface. 2016-11-07 15:07:04 +01:00
Jørgen Kvalsvik 6488cfcfe5 Remove weak enum Opm::Phase
This weak enum is really just an alias for four other constants which in
turn alias another enum. Since they're mostly used for indexing they're
relaxed to constexpr ints.
2016-11-01 12:59:26 +01:00
Jørgen Kvalsvik 3bde655e12 Read phase information from EclipseState.runspec 2016-11-01 11:37:27 +01:00
jokva 1697212b98 Merge pull request #863 from jokva/remove-shared-ptr
The great shared_ptr purge
2016-10-20 19:18:50 +02:00
Jørgen Kvalsvik df9f59dd03 Update to shared_ptr-less parser interface. 2016-10-20 17:59:43 +02:00
Jørgen Kvalsvik 486223f958 Restore from data::Wells without vector dumps
opm-output's data::Wells interface changed to no longer just accept a
dump of opm-core's WellState object. Update WellState to restore itself
from this new interface rather than reading the dumped vectors as-is.
2016-10-20 16:36:47 +02:00
Jørgen Kvalsvik 1c6a4b34da Update to shared_ptr-less parser interface. 2016-10-20 14:08:04 +02:00
Jørgen Kvalsvik a52724ae97 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Jørgen Kvalsvik ad6b77cc15 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Jørgen Kvalsvik 26f1a69903 wellToState reads new opm-output data exchange 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik 545f55bd3b Write control to data::Wells. Missing ability to restore. 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik df4e163796 Avoid using buggy wellstate api 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik dfb7f8ff63 Stop report early if there are no wells 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik 6ba21fd4c0 Update to interface change in opm-output 2016-10-19 12:06:43 +02:00
Jørgen Kvalsvik 13a4364d55 Schedule::getGroup returns reference, not pointer 2016-10-05 15:32:24 +02:00
Jørgen Kvalsvik 3c2ebf9cfd Schedule::getGroup returns reference, not pointer 2016-10-05 15:24:14 +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
Jørgen Kvalsvik ab95133d1c Match RestartConfig interface in opm-parser 2016-08-11 09:59:07 +02:00
Jørgen Kvalsvik dfac3adaea Pass NNC to OutputWriter constructor
Keep up with an interface change in opm-output.
2016-06-16 13:34:29 +02:00
Jørgen Kvalsvik ef51e9a2eb Well shared_ptr alias deprecated
The shared_ptr aliasing is deprecated, and in the Well case this has
been removed upstream.
2016-06-16 10:01:04 +02:00
Jørgen Kvalsvik 03104f2320 WellPtr and GroupPtr deprecated
shared_ptr aliases are considered deprecated and has largely been
removed upstream (and replaced by raw pointers).
2016-06-16 09:33:43 +02:00
Jørgen Kvalsvik 84b0c8bc59 Check for HAVE_UMFPACK in LinearSolverFactory
Check for the right preprocessor define to enable umfpack support.
Matches the directive set in config.h
2016-06-10 17:00:34 +02:00
Jørgen Kvalsvik 71560b5fb2 BlackoilOutputWriter rewritten to use opm-output
Changes to BlackoilOutputWriter as mandated by the split and rewrite of
opm-output. Notable changes:

* BlackoilOutputWriter is no longer a child class of OutputWriter.
* Minor interface changes; writeTimeStep requires a Wells pointer
* restore requires a Wells* pointer
* VTK/Matlab support rewrites; no longer inherits OutputWriter
* WellStateFullyImplicitBlackoil::report added, to write its data to a
  opm-output understood format

Relies on utility/Compat.hpp for quick conversion to the opm-output
defined formats.
2016-06-07 10:15:07 +02:00
Jørgen Kvalsvik 254bb2e1e6 Make struct wells unique member of WellState 2016-06-06 12:42:54 +02:00
Jørgen Kvalsvik 18fda2d7f0 WellState::report() to make opm-output Well data 2016-06-06 12:40:44 +02:00
Jørgen Kvalsvik ec28c46842 WellState::report() to make opm-output Well data 2016-06-06 12:40:44 +02:00
Jørgen Kvalsvik 6ec0594f17 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-04-14 11:32:08 +02:00
jokva 8b71d81a14 Merge pull request #994 from pgdr/use-eclipse3dproperties
@bska We're merging as-is for now, and we've made a note to replace `shared_ptr` and maintain (and document!) this property. Those changes will obviously be internal and you won't notice a difference.
2016-04-13 11:01:43 +02:00
jokva 586afdb816 Merge pull request #644 from pgdr/use-eclipse3dproperties
Using new EclipseState API, made ->s into .s
2016-04-13 10:59:27 +02:00
Jørgen Kvalsvik 9df3b2fda9 Flow accepts base name for input Deck
Enables flow to accept a basename for a case by appending a .DATA suffix
should it not be provided. It already supported reading the basename
from a .DATA extension file, but not opening said file by handing it to
the parser.
2016-03-30 08:51:41 +02:00
Jørgen Kvalsvik dd77a39d95 Remove Equil + EquilWrapper, replace with upstream
Upstream (opm-parser) now provides a better Equil + EquilRecord, and
simultaneously deprecated EquilWrapper. This patch fixes the resulting
breakage.

One important note: The new Equil does not expose integers for live
oil/wet gas initialization procedure methods, but rather booleans
through constRs/constRv methods. This is how the variable behaves
according to the Eclipse reference manual (EQUIL keyword section).

Code has been updated to reflect this.
2016-03-01 09:59:54 +01:00
Jørgen Kvalsvik 6ae1613765 Add missing opm-parser headers
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2016-02-26 11:56:44 +01:00
Jørgen Kvalsvik 33f8446a4e Add missing opm-parser headers
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2016-02-26 11:49:40 +01:00
Jørgen Kvalsvik 19e41bd246 Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-19 11:55:19 +01:00
Jørgen Kvalsvik 369050cc9c Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Jørgen Kvalsvik 04d605159f Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Jørgen Kvalsvik 9836712782 Remove unused Wrapper includes from Deck/Utility 2016-02-17 14:46:15 +01:00
Jørgen Kvalsvik 850f0884f1 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

OPM/opm-parser#661
2016-01-26 13:32:34 +01:00
Jørgen Kvalsvik e8c6c3102f Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +01:00
Jørgen Kvalsvik b0692304d5 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +01:00
Jørgen Kvalsvik 98190eceb1 Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2016-01-21 09:42:51 +01:00
Jørgen Kvalsvik 50c1bbdc85 Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2016-01-21 09:42:51 +01:00
Jørgen Kvalsvik 087710df7d Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers doing
includes. From opm-parser PR-656 https://github.com/OPM/opm-parser/pull/656
this assumption is no longer valid.
2016-01-20 15:11:30 +01:00