Commit Graph
53 Commits
Author SHA1 Message Date
Torbjørn Skille 49cc815136 Fixed defect in ESmry constructor. Fails when using class on Summary files generated from commercial simulator Eclipse 2019-05-02 10:32:18 +02:00
Atgeirr Flø Rasmussen 7a47f7cf2d Add missing standard library includes. 2019-04-30 11:39:21 +02:00
Arne Morten Kvarving 9d8b08a8d8 Merge pull request #699 from akva2/new_ecl_io
New ECL I/O classes
2019-04-26 09:53:01 +02:00
Markus Blatt 393a543ed5 Removes nearly all warnings experienced with g++-8.3
Namely:
- unused parameter
- type qualifiers ignored ...
- catchinhg polymorphic type ... by value
2019-04-12 13:37:03 +02:00
Torbjørn Skille 4768f72400 added: new utility convertECL
for converting between formatted and binary ecl files
2019-04-08 11:36:20 +02:00
Torbjørn Skille db142f698b added: ESmry class for reading summary data from ECL files 2019-04-08 11:36:20 +02:00
Torbjørn Skille c54cb2195b added: ERst class for reading restart simulation data from ECL files 2019-04-08 11:36:20 +02:00
Torbjørn Skille 24a8efb2e3 added: ERft class for reading RFT simulation data from ECL files 2019-04-08 11:36:20 +02:00
Torbjørn Skille 181eeffbdb added: EGrid class for reading GRID data from ECL files 2019-04-08 11:36:20 +02:00
Torbjørn Skille 46f2542487 finish class EclFile
this is a base class for ECL I/O classes
2019-04-08 11:36:20 +02:00
Torbjørn Skille 6d1b2f3f4f added: EclOutput class for writing ECL files 2019-04-08 11:36:20 +02:00
Torbjørn Skille 188f78f2d6 add some common utilities used by Ecl IO classes 2019-04-08 11:36:20 +02:00
Arne Morten Kvarving f55d3e1578 mark constructor explicit
pass string by const ref
avoid a potential no return from function
2019-02-27 11:14:36 +01:00
Joakim Hove b02578655d Small utility to hash deck 2019-02-22 08:54:49 +01:00
tskille a27b39ff05 changed copyright header for EclIOdata.hpp 2019-02-15 14:05:58 +01:00
Torbjørn Skille 1be3e88f58 New routines for reading binary eclipse format files
1) Start of new class EclFile which includes one anonomus namespace with routines for reading binary eclipse format files
  2) One very basic test of EclFile constructor included in test_EclFile.cpp
      - testing that file exist, throwing an exception if not.
2019-02-15 13:04:06 +01:00
tskille 92b1b34dca new class Ecl_IO including 14 unit tests 2019-01-31 22:07:41 +01:00
Joakim Hove 59b4ca4b20 Change msim simulator to not hold Schedule object 2019-01-22 13:12:06 +01:00
Joakim Hove bf52e6d123 Added ErrorGuard& arguments to library 2019-01-03 13:14:40 +01:00
Joakim Hove cf61068ad1 Merge pull request #587 from bska/compare-ecl-ignoreextra
Make Summary Comparison Able to Ignore Different Number of Keywords
2018-12-13 21:31:28 +01:00
Bård Skaflestad 9098316775 Make Summary Comparison Able to Ignore Different Number of Keywords
This commit adds the ability of SummaryRegressionTest to bypass the
check for equal number keywords/summary vectors in the two result
sets being compared.  The primary purpose of this is to continue
comparing contents of existing summary vectors if new summary
keywords are introduced in a GitHub Pull Request.

Extend the 'compareECL' utility to take advantage of this ability.
2018-12-13 20:10:34 +01:00
Joakim Hove 1249ef0dd2 Removed unused file compareSummary.cpp 2018-12-13 19:16:05 +01:00
Atgeirr Flø Rasmussen 71b0c2883f Avoid shadowing of variables. 2018-12-10 16:10:25 +01:00
Joakim Hove f414f5b8ad Adapt to C++ changes in libecl 2018-11-26 17:30:09 +01:00
Tor Harald Sandve 95179f393c Fix vappars and dr[sv]dt logic
The simulator should either use VAPPERS or dr[sv]dt, both the
combination drsdt and drvdt is allowed.
2018-11-05 13:38:42 +01:00
Joakim Hove 984a308e24 Add skeleton for mock simulator 2018-10-17 17:21:11 +02:00
Joakim Hove 7cd29ea7d7 Add option to ignore extra keywords in the regresstion testing 2018-09-11 13:34:51 +02:00
Arne Morten Kvarving cb525c5c75 changed: fold compareSummary into compareECL application 2018-09-10 08:42:26 +02:00
Arne Morten Kvarving b877c8b340 changed: put Deviation struct in a separate header
ODR
2018-09-07 15:33:50 +02:00
Arne Morten Kvarving 7a034ffd01 changed: split ECL(Integration|Regression)Test classes to separate files
to unify code with the summary comparison classes
2018-09-07 15:33:46 +02:00
Arne Morten Kvarving 6e0c31bed4 changed: make getCellVolume a static member of ECLFilesComparator
needed in upcoming splitting commit
2018-09-07 14:38:03 +02:00
Arne Morten Kvarving ef63206925 changed: rename (Integration|Regression)Test ECL(Integration|RegressionTest)
for clarity
2018-09-07 14:38:03 +02:00
Arne Morten Kvarving 0b6d36658d changed: pass basenames as std::string
to unify code with the other comparison classes
2018-09-07 14:38:03 +02:00
Arne Morten Kvarving 44f3b86547 changed: rename the summary regression/integrationtest classes
it restores c++ ODR which is nice, but the main reason is to
allow usage of summary and generic comparison classes in the
the same application.
2018-09-07 14:38:03 +02:00
Arne Morten Kvarving bee4590aaa changed: move the comparison classes out of libopmcommon
these classes are really not made for reusability.
thus they should only be built into the applications.
2018-09-07 14:38:03 +02:00
Arne Morten Kvarving e072365234 added: error analysis support in compareSummary / compareECL
useful for debugging purposes. replaces scripts in opm-simulators
2018-08-14 11:02:56 +02:00
Joakim Hove 9c6a0cc5d9 Add application opmpack to load a deck and dump it again as one stream 2018-07-31 15:05:34 +02:00
Atgeirr Flø Rasmussen cfb3d34467 Add more flexibility to compareECL.
In particular:
 - Grid comparison will now also check that the active cells are the same,
   not just that the number of active cells is identical.
 - In the grid comparison, checking volumes is now optional, from compareECL
   this feature is used by passing the '-V' option on the command line.
2018-06-27 15:22:55 +02:00
Steinar Foss d9ffb579e1 Removed MessageContainer. OpmLog used instead.
...

...

...

GenerateKeywords.cmake changed.

ParserContext.handleerror takes only two args.

Schedule: removed all MessageContainer.

...

...

...

GridProperties: removed MessageContiner.

...

Eclipse3DProperties: removed MessageContainer.

...

TabelManager:removed MessageContainer.

...

.nnn.

...

...

...

...

...

...

...

...

...

...

...

...

...
2018-03-26 10:15:18 +02:00
Arne Morten Kvarving dbba64e5c3 Import opm-output 2018-03-05 10:30:59 +01:00
Joakim Hove 612e255d4f Extracted Schedule and SummaryConfig, 2017-10-24 09:27:42 +02:00
Joakim Hove 77fcc865de Extracted SummaryConfig out from EclipseState 2017-10-24 09:13:21 +02:00
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
Markus Blatt d50ccf507d Fixes some problems with option parsing.
Namely, that m requires an argument and not n as indicated to
getopt. This caused the help message to be printed whenever users
did not want exceptions to be thrown.

Additionally we fix the error message for options that need an argument
but do not get one.
2017-04-19 15:14:25 +02:00
Joakim Hove 01f43dc6ca Change in ert data_type for ecl_kw. 2017-03-25 21:23:07 +01:00
Arne Morten Kvarving 594572152a added: option to not throw on error in restart/init regression test
useful for doing a more thorough analysis of the failure
2017-02-16 15:51:11 +01:00
Arne Morten Kvarving 97a7ca3013 added: option to not throw on error in summary regression test
useful for doing a more thorough analysis of the failure
2017-02-03 09:40:54 +01:00
Atgeirr Flø Rasmussen a9f5fcdfd5 Silence various warnings.
Mostly shadowing, also unused variable and unused argument.
2016-09-23 15:02:36 +02:00
Arne Morten Kvarving a403a8d21c Changed to two applications for comparison
- restartRegressionTest, initRegressionTest was squashed to one
 application, which also supports integration test as well as test
 of restart files (non-unified) and .RFT files.

- summaryRegressionTest was renamed compareSummary -- now it can
 execute an integration test as well as regression test. Also other
 improvements were made.
2016-09-19 14:36:03 +02:00
babrodtk ec43c9c86f Fixed warnings 2016-09-06 07:54:21 +02:00