Commit Graph

3134 Commits

Author SHA1 Message Date
Joakim Hove
77fcc865de Extracted SummaryConfig out from EclipseState 2017-10-24 09:13:21 +02:00
Atgeirr Flø Rasmussen
f682a87f5d Merge pull request #1145 from GitPaean/msw_support_more_perf
obtaining the depth for the completions based on segment information
2017-10-16 22:46:31 +02:00
Kai Bao
4e6bf8f019 obtaining the depth for the completions based on segment information 2017-10-16 21:53:49 +02:00
Joakim Hove
c5a19f2a0e Merge pull request #1147 from blattms/fix-libecl-search-for-install
Fix search path of libecl for installed opm-parser.
2017-10-15 18:26:33 +02:00
Atgeirr Flø Rasmussen
bfe098c1d4 Merge pull request #1142 from atgeirr/silence-warnings
Silence minor warnings.
2017-10-13 14:52:57 +02:00
Markus Blatt
e11fca5850 Fix search path of libecl for installed opm-parser.
Previously, ecl_DIR was always set to the build directory used even
for the installed cmake configuration file. This patch at least allows
to overwrite that location and for the installed version tries to guess
the correct location. The guess is that libecl and opm-parser are installed
under the same prefix. As a fallback we use the package registry.
2017-10-10 13:16:13 +02:00
Bård Skaflestad
f9973c5cf0 Parser: Recognise Keywords 'LAB' and 'PVT-M'
Add test to verify that the parser recognises these keywords.
2017-10-06 15:34:49 +02:00
Bård Skaflestad
c1fad41ae5 Deck Handling: Hook PVT-M Units Up to Deck Unit System
Missing in commit 17f518e.  Thanks to Joakim Hove for administering
the clue-by-four.

Pointy Hat: [at]bska.
2017-10-05 22:17:14 +02:00
Bård Skaflestad
e821f5534b UnitSystem: Add Support for PVT-M Unit Conventions
The PVT-M unit convention is essentially the same as the Metric
collection, except that pressure values are measured in atmospheres
rather than bars.
2017-10-05 17:39:45 +02:00
Joakim Hove
2c7d4dec41 Merge pull request #1135 from totto82/shutCompletionsFix
Fix shut well logic when WELOPEN and COMPDAT is combined
2017-10-05 14:27:34 +02:00
Atgeirr Flø Rasmussen
26a57dc4c9 Silence minor warnings. 2017-10-03 12:41:07 +02:00
Tor Harald Sandve
eb4f0b68d6 Fix shut well logic when WELOPEN and COMPDAT is combined
Do not shut well if all completions are shut using WELOPEN but new
completions are opened using COMPDAT in the same time step.
2017-10-03 08:26:09 +02:00
Jens Gåsemyr Magnus
6aa83ab0d3 Added deck support for several keywords
Added deck support for the following keywords
  ACTION,
  APIGROUP,
  ENDACTIO,
  GLIFTOPT,
  GSATPROD,
  LIFTOPT,
  NOWARN,
  PPCWMAX,
  QDRILL,
  WARN,
  WELPI,
  WGASPROD,
  WINJMULT,
  WLIMTOL,
  WORKTHP
2017-09-29 15:07:01 +02:00
Joakim Hove
f82a6fd281 Removed unused function tracking first RFT. 2017-09-28 08:38:55 +02:00
Joakim Hove
0f211bd2c1 Merge pull request #1132 from joakim-hove/schedule-refactor
EclipseState: refactor constructor
2017-09-26 18:43:43 +02:00
Joakim Hove
a580259d99 Changed summaryconfig constructor. 2017-09-25 10:05:09 +02:00
Joakim Hove
6379cec8e0 Changed Transmult constructor 2017-09-24 15:43:29 +02:00
Joakim Hove
28f62a019f Removed GridDims from EclipseState. 2017-09-24 09:22:54 +02:00
Joakim Hove
df12c44963 Moved SummaryConfig to EclipseState root. 2017-09-24 02:35:36 +02:00
Joakim Hove
4c3aacc685 Moved SummaryConfig to EclipseState root. 2017-09-24 02:22:16 +02:00
Joakim Hove
726f7e9507 MOved SimulationConfig to EclipseState root. 2017-09-24 02:09:51 +02:00
Joakim Hove
6b3db2f9fe Removed EclipseState::getSchedule( ) calls. 2017-09-24 01:46:05 +02:00
Alf Birger Rustad
66841bdb14 Added include on cmath to restore build on Debian. 2017-09-12 06:24:47 +02:00
Joakim Hove
77ea1decbd Added keyword CPRL to symmary parse test. 2017-09-11 18:24:48 +02:00
Joakim Hove
9a738d2363 Merge pull request #1128 from joakim-hove/cprl
Added CPRL as support connection keyword.
2017-09-11 17:26:53 +02:00
Joakim Hove
50206efd42 Added CPRL as support connection keyword. 2017-09-11 15:47:46 +02:00
Joakim Hove
4b3c06cbcc Fixed bug in time dependence of RFT configuration. 2017-09-08 23:33:52 +02:00
Joakim Hove
1bc7f306d9 Added method DynamicState::update_elm() 2017-09-08 23:33:50 +02:00
Jens Gåsemyr Magnus
fa100bba1a Added Deck copy constructor
Copying Decks caused the first and last iterators in DeckView to point
to invalid memory.
2017-09-07 09:34:23 +02:00
Joakim Hove
266937ce0f Merge pull request #1120 from joakim-hove/deckitem-cout
Deck operator<<
2017-09-02 10:21:04 +02:00
Joakim Hove
5d6efc2d42 Merge pull request #1123 from joakim-hove/add-rptsmry
Added keyword RPTSMRY
2017-08-31 18:29:52 +02:00
Joakim Hove
54a5ea6393 Added keyword RPTSMRY 2017-08-30 18:23:00 +02:00
Joakim Hove
114c5da03b Added dump -> re_parse test loop for test decks. 2017-08-30 17:00:11 +02:00
Joakim Hove
1050b8cba9 Added operator<< suppport for Deckxxx 2017-08-30 16:57:23 +02:00
Joakim Hove
1f646711d4 Added DeckXXX::equal( ) method. 2017-08-30 16:57:22 +02:00
Joakim Hove
da55685b62 Added simple DeckOutput class for output. 2017-08-30 16:57:21 +02:00
Jens Gåsemyr Magnus
e8bfc517ee Remove python bindings
The Sunbeam project https://github.com/Statoil/sunbeam is replacing the
python bindings. The bindings have long been deprecated and are finally
removed.
2017-08-25 14:15:11 +02:00
Joakim Hove
1908e86c66 Added OPM keyword RHO. 2017-08-17 12:12:09 +02:00
Joakim Hove
a50f4d174c Merge pull request #1112 from joakim-hove/smspec-sort
Sort SummaryConfig with smspec_node_cmp( ).
2017-08-11 05:41:13 +02:00
Arne Morten Kvarving
a809db074a fixed: usage of libecl from sibling directories 2017-08-10 12:17:31 +02:00
Andreas Lauser
af736c1837 make the build system compatible with Dune's cmake build system
before this, dune modules that are not using the OPM build system
needed to treat opm-parser as an external library. With this patch,
opm-parser can be build as part of duncontrol build chains, i.e.,
other modules just need to specify a depencency on opm-parser in their
dune.module file and opm-parser's libraries and headers get picked up
just fine.

Things like generating opm-parser-config.cmake should quite likely be
done in a better way, but I'm not really a cmake expert and the
solution proposed in this patch seems to get things done regardless of
whether opm-parser is system-installed or not. Comprehensive solutions
are highly appreciated.
2017-08-10 12:17:31 +02:00
Joakim Hove
e6320dc783 Merge pull request #1116 from joakim-hove/properties-scan-order
Change order of section scan.
2017-08-09 11:34:58 +02:00
Joakim Hove
99b9ec199a Change order of section scan. 2017-08-09 10:03:55 +02:00
Atgeirr Flø Rasmussen
78f7f9b347 Add missing <string> include. 2017-08-01 13:23:49 +02:00
Joakim Hove
0b60b4811a Sort SummaryConfig with smspec_node_cmp( ). 2017-07-31 11:52:15 +02:00
Joakim Hove
44d4aa64cc Added Schedule::getWells( group, time) overload
The new Schedule::getWells( group, time) overload will recursively scan
th group tree rooted at 'group' and return all the wells in that tree.
2017-07-25 20:19:12 +02:00
Arne Morten Kvarving
c6f6b078a7 changed: avoid use of targets for exports
the exported file refers to imported targets through their
name with the expectation that these are defined whenever
the target file is included.

the use of custom imported targets for boost thus becomes
problematic in downstreams, since they are forced to define
these targets prior to opm-parser inclusion.

as the targets are named the same as their library
counterparts it appears to work per murphy's law.
cmake will simply fall back to interpreting the target names as
library names, e.g. it will do -lboost_filesystem.
2017-07-21 12:37:09 +02:00
Andreas Lauser
294f09ec44 make opm-parser fully independent of opm-common
i.e. now it does not use anything from opm-common anymore even when
it is build using dunecontrol.
2017-07-05 17:30:28 +02:00
Joakim Hove
20f34386c9 Merge pull request #1104 from joakim-hove/timemap
Timemap
2017-07-03 13:22:30 +02:00
Joakim Hove
384e2c8d0a Skip SPE10 tests on Appveyer.
Windows does not handle times before 1970 when using std::time_t
2017-07-03 11:57:39 +02:00