Commit Graph

1420 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
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
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
0fdde95759 EndpointScaling: will create default is SWATINIT 2017-03-16 08:24:58 +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
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
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
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
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
6e64935d5c Implement restartfilename with ERT::EclFilename 2017-01-12 13:36:39 +01:00
Pål Grønås Drange
41dd173be6 added REGIONS to opernum kw 2017-01-12 12:25:39 +01:00
Pål Grønås Drange
97294c988c Made getRegion() in e3d private 2017-01-11 16:18:04 +01:00
Joakim Hove
4f076c4813 Added method Runspec::eclPhaseMask( ) 2017-01-11 13:48:12 +01:00
Pål Grønås Drange
b8b5bd374b Added FIP_PROBE and tests, we now accept FIPxxxx kws 2017-01-11 12:36:22 +01:00
Joakim Hove
d4c7d6f92e Merge pull request #1021 from joakim-hove/endscale-rename
Endscale rename
2017-01-10 12:21:00 +01:00
Pål Grønås Drange
164d5f449a Do not choke when encounter AITS or ROCKNUM
* internalized ROCKNUM, added tests
2017-01-09 15:16:50 +01:00
Pål Grønås Drange
67e2199a68 implement == for Well 2017-01-09 15:16:43 +01:00
Joakim Hove
694ace932e Renamed endpoint_scaling() -> endpointScaling() 2017-01-03 19:29:56 +01:00
Joakim Hove
1e191fe928 Moved EndpointScaling.hpp to separate file. 2017-01-03 19:25:30 +01:00
Jørgen Kvalsvik
36d2e1349d Understand ENDSCALE and SCALECRS
Exposes the semantics defined by ENDSCALE (and SCALECRS) in
Runspec.endpoint_scaling.
2017-01-03 16:49:51 +01:00
jokva
328c320641 Merge pull request #1015 from jokva/solvent-support-in-phases
Solvent support in Runspec.phases
2017-01-03 12:23:52 +01:00
jokva
35df865753 Merge pull request #1016 from jokva/pvcdo-viscref-watdent
Understand PVCDO, VISCREF, WATDENT
2017-01-03 11:51:38 +01:00
Jørgen Kvalsvik
45cfedb183 Understand PVDCO, VISCREF, WATDENT 2017-01-03 11:39:08 +01:00
Jørgen Kvalsvik
20abeb5754 Tests for production_rate+injection_rate 2017-01-03 10:18:36 +01:00
Pål Grønås Drange
e5de0ca8d1 Revert throw, write warning to stderr
* no throw on JFUNC abuse, std::cerr
* removed 'get' from function names
2016-12-28 19:20:31 +01:00
Pål Grønås Drange
172725aef8 Added JFUNC in TableManager and getJFuncColumn()
* Fully internalized JFUNC
* Added JFunc.cpp, throw on wrong FLAG/DIR in JFUNC kw
* added tests for JFUNC in TableManagerTests
* added protected member m_jfunc to SimpleTable
* Added getJFuncColumn to accompany getPcowColumn
* Throws if pressure or jfunc is accessed inappropriately
 * ... meaning if getPcowColumn is called when JFUNC is in deck, or
 * getJFuncColumn is called when JFUNC is not in deck
* added tests for throwing and for getJFuncColumn
* SimpleTable.getColumn("PCOW/PCOG") throws if JFUNC
* In the event that one tries to get "PCOW" or "PCOG" via getColumn
* ... this will throw if JFUNC is present in the deck.
* Added tests.
2016-12-28 19:20:31 +01:00
Jørgen Kvalsvik
295a808310 Const'd OilVaporizationProperties 2016-12-22 15:18:04 +01:00
Jørgen Kvalsvik
31b4c4a0fb Solvent support in Runspec.phases 2016-12-20 14:13:07 +01:00
jokva
848d701b0d Merge pull request #1013 from jokva/understand-density-keyword
Provide DENSITY & ROCK table through EclipseState
2016-12-20 14:06:47 +01:00
Jørgen Kvalsvik
9a336f62fb Understand the ROCK keyword 2016-12-20 12:52:43 +01:00
Jørgen Kvalsvik
5413b841ef Generalise 'flat table'; implement DENSITY, PVTW
Several tables are identical both in structure *and* parsing, i.e. the
code required to parse them only differ in output type and possibly
number of items to read.

FlatTable is a simple vector-based template that expands into this exact
parsing routine, based on a simple specification of the record.
2016-12-20 12:52:43 +01:00
Jørgen Kvalsvik
e12ec3c003 Support RS+RV 2016-12-20 10:53:55 +01:00