Commit Graph

3025 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
e884b0664c Redesign cmake
Tune the makefile according to new principles, which adds a few bells
and whistles and for clarity.

Synopsis:

* The dependency on opm-common is completely gone. This is reflected in
  travis and appveyor as well. No non-kitware cmake modules are used.
* Directories are flattened, quite a bit - source code is located in the
  lib/ directory if it belongs to opm-parser, and external/ if third
  party.
* The sibling build feature is implemented through cmake's
  export(PACKAGE) rather than implicitly looking through source files.
* Targets explicitly set required public and private include
  directories, compile options and definitions, which cmake will handle
  and propagate
* opm-parser-config.cmake for downstream users is now provided.
* Dependencies are set up using targets. In the future, when cmake 3.x+
  can be used, these should be either targets from newer Find modules,
  or interface libraries.
* Fewer system specific assumptions are coded in, instead we assume
  cmake or users set up system specific details.
* All module wide configuration and looking up libraries is handled in
  the root makefile - all sub directories only set up libraries and
  compile options for the module in question.
* Targets are defined and links handled transitively because cmake now
  is told about them. ${module_LIBRARIES} variables are gone.

This is largely guided by the principles outlined in
https://rix0r.nl/blog/2015/08/13/cmake-guide/

Most source files are just moved - if they have some content change then
it's nothing more than include fixes or similar in order to make them
compile.
2017-06-01 15:29:23 +02:00
Joakim Hove
430b216027 Merge pull request #1069 from jijordre/field_oil_efficiency
Add unit test for field oil efficiency (aka FOE)
2017-06-01 12:06:27 +02:00
Jens Ivar Jørdre
699f84f009 Add unit test for field oil efficiency (aka FOE) 2017-05-31 11:33:21 +02:00
Joakim Hove
5565bead86 Fixed mismerge. 2017-05-31 11:14:07 +02:00
Joakim Hove
59838f41c2 Changed library link from eclxx to ecl. 2017-05-31 11:13:15 +02:00
Joakim Hove
3d66efa262 Handle meta keyword PERFORMA.
When adding a ECL_SMSPEC_MISC_TYPE we protect against adding metakeyword
like 'PERFORMA' and 'ALL'.
2017-05-31 09:44:03 +02:00
Joakim Hove
4ce5681a21 SummaryConfig will internalize MISC keywords. 2017-05-31 09:44:02 +02:00
Joakim Hove
79ee673465 Merge pull request #1066 from joakim-hove/summary-rpr
Summary rpr
2017-05-31 09:10:09 +02:00
Joakim Hove
b9823a4c2e Changed region expansion in Rxxx SUMAMRY keywords.
If the region keywords from the SUMMARY section, like e.g. RPR, are
specified without explicit region numbers a summary key is added for all
region values from 1..NTFIP, irrespective of which region values are
actually present.
2017-05-25 23:39:45 +02:00
Joakim Hove
66efc1fd1f Small function which returns number of FIP regions 2017-05-24 21:05:42 +02:00
Markus Blatt
9cdb08b7ee Fixes shadowing member warning
```
opm-parser/opm/parser/eclipse/EclipseState/EndpointScaling.cpp: In constructor ‘Opm::EndpointScaling::EndpointScaling(const Opm::Deck&)’:

/opm-parser/opm/parser/eclipse/EclipseState/EndpointScaling.cpp:102:14: warning: declaration of ‘reversible’ shadows a member of 'this' [-Wshadow]

         bool reversible = true;
```
2017-05-24 11:22:01 +02:00
Jørgen Kvalsvik
6294a5e03d Consume libecl as cmake targets
The upstream libecl exposes targets, not _LIBRARIES variables, and a
-config.cmake rather than a Find module.
2017-05-16 14:34:59 +02:00
Jørgen Kvalsvik
80c0bacaaa Appveyor; clone libecl, not ensembles/ert 2017-05-16 13:24:38 +02:00
Joakim Hove
540a64330c fixup! Added Polymer EVENT. 2017-04-05 16:39:53 +02:00
Joakim Hove
2a591a1661 Added Polymer EVENT. 2017-04-05 16:05:25 +02:00
Joakim Hove
4ec72ba32b Added Well::firstTimeStep( ) 2017-04-05 16:05:12 +02:00
Joakim Hove
67dd83264b Added events to wells. 2017-04-05 14:46:00 +02:00
Joakim Hove
39859c8d88 Skip random text when unknown keyword. 2017-03-29 18:25:23 +02:00
Joakim Hove
aa5a0b1ed9 Merge pull request #1055 from joakim-hove/disable-opm-common-build
Do not build opm-common on Windows.
2017-03-29 18:25:07 +02:00
Joakim Hove
08602e3d7d Do not build opm-common on Windows. 2017-03-29 17:16:08 +02:00
Joakim Hove
f6b168c598 Travis: apt-get install bc 2017-03-21 16:22:45 +01:00
Joakim Hove
0fdde95759 EndpointScaling: will create default is SWATINIT 2017-03-16 08:24:58 +01:00
Kai Bao
3cc14028e9 updating the path to the 2D MSW deck in opm-data
after the path to the deck is changed in opm-data.
2017-03-15 16:33:13 +01:00
Kai Bao
a99cf7c78f adding 1 atma deafult BHP for keyword WCONPROD
and always employing a BHP constraint
2017-03-10 12:51:18 +01:00
Joakim Hove
2cd85aa885 Added json config for keyword: COMPIMB 2017-03-08 08:20:18 +01:00
Joakim Hove
ebc3a3ac79 Added GridProperties::hasDeckKeyword( )
The GridProperties::hasDeckKewyord( ) will return false for keywords
which have only been auto generated. Have also renamed
getInitializedkeyword( ) to getDeckKeyword( ).
2017-02-16 15:13:13 +01:00
Joakim Hove
0dcf411e8c Changed semantics of GridProperties.hasKeyword( )
The GridProperties.hasKeyword( ) would previously return false if a
keyword in the properties container had been auto created. This is now
changed, the hasKeyword( ) implementation will not consider whether a
keyword has been autocreated or not.

Have also added a void method GridProperties.assertKeyword( kw ) which by
side effect will ensure that the container contains the keyword kw.
2017-02-16 15:13:12 +01:00
Joakim Hove
304c788e56 Minor python fixup. 2017-02-16 13:51:09 +01:00
Joakim Hove
4df345d18b Merge pull request #1040 from totto82/sat_tableId
Store saturation tableId for completions
2017-02-16 12:57:19 +01:00
Tor Harald Sandve
78e7428b37 Add non-default SATNUM values to the CompletionsFromDeck test 2017-02-16 08:37:36 +01:00
Tor Harald Sandve
89e0e69510 Change SATNUM value to plain int 2017-02-16 08:36:41 +01:00
Tor Harald Sandve
cdfd54593f Default saturation table_id in completions with cell satnum value
Pass eclGridProperties from EclipseState to Completions in order to set
default saturation table. Most changes are due to interface change in
Schedule(...)
2017-02-16 08:27:29 +01:00
Tor Harald Sandve
884d0712e3 Store saturation tableId for completions 2017-02-16 08:27:29 +01:00
Joakim Hove
aa07753769 Merge pull request #1042 from joakim-hove/properties
Added very basic Eclipse3DProperties in Python.
2017-02-15 16:15:13 +01:00
Joakim Hove
9e23ad144b Added very basic Eclipse3DProperties in Python. 2017-02-15 14:24:18 +01:00
Andreas Lauser
1fa80328cf TableManager: export the Eqldims object
this object corresponds to the EQLDIMS keyword. Probably it is not the
most intuitive place to provide access to this keyword, but as far as
I can see the table manager is the only place where this object is
already properly instantiated.
2017-02-13 16:38:23 +01:00
Joakim Hove
c410f99625 Merge pull request #1039 from atgeirr/replace-backslash-include
Replace backslash in INCLUDE paths
2017-02-13 13:35:00 +01:00
Atgeirr Flø Rasmussen
8936d9ab38 Fix tests: actually check for keyword in deck. 2017-02-13 11:16:32 +01:00
Atgeirr Flø Rasmussen
8527e646a1 Improve tests by checking for present keyword. 2017-02-10 13:02:21 +01:00
Atgeirr Flø Rasmussen
b82d9eb9b3 Add tests and test files with backslashes in INCLUDE paths. 2017-02-09 21:17:14 +01:00
Atgeirr Flø Rasmussen
b52381ca14 In INCLUDE paths, replace backslashes with slashes. 2017-02-09 21:08:16 +01:00
Joakim Hove
9e0495dfee Added FWIP as WIP dependency. 2017-02-07 14:35:37 +01:00
Joakim Hove
5ea448ac93 Check required restart fields for summary. 2017-02-07 11:16:28 +01:00
Pål Grønås Drange
4543de807b Merge pull request #1031 from pgdr/opernum_regions
added REGIONS to opernum kw
2017-01-13 12:53:42 +01:00
Pål Grønås Drange
149f39baf5 OPERNUM defaults to reg0 and note on redefinability 2017-01-13 11:55:00 +01:00
Joakim Hove
bc37418d47 Merge pull request #1029 from joakim-hove/runspec-ecl-phase-masl
Added method Runspec::eclPhaseMask( )
2017-01-13 09:52:14 +01:00
Joakim Hove
f1308fa352 Instantiate unit system from Eclipse type id. 2017-01-12 13:36:42 +01:00
Joakim Hove
6e64935d5c Implement restartfilename with ERT::EclFilename 2017-01-12 13:36:39 +01:00
Joakim Hove
ef6def6511 Added getEclType() to UnitSystem 2017-01-12 13:36:38 +01:00
Pål Grønås Drange
41dd173be6 added REGIONS to opernum kw 2017-01-12 12:25:39 +01:00