Commit Graph
47 Commits
Author SHA1 Message Date
Arne Morten Kvarving ff8cfcd7d1 remove accessors in IOConfig added for external serialization 2020-03-16 12:59:20 +01:00
Arne Morten Kvarving 58b7f8cd45 add serialization template to IOConfig 2020-03-16 12:59:20 +01:00
Joakim Hove 0b19eb7ffb Remove unused method declarations 2020-01-29 00:27:35 +01:00
Arne Morten Kvarving 1c2a284ee8 remove unused member m_first_restart_step from IOConfig 2020-01-24 13:13:22 +01:00
Arne Morten Kvarving 95680c70c3 allow constructing IOConfig from variables
also add accessors and equality operator
2019-12-17 16:36:06 +01:00
Bård Skaflestad bcfe700461 Decouple Most of OPM-Common From LibECL
This commit takes a pass at the implementation files in opm-common
and removes references to libecl functions where practical.  In
particular we switch to using types from C++'s standard library (and
Boost.Filesystem) to achieve the effects of the interfaces being
replaced.

We also insert direct calls to Posix function fnmatch() to preserve
existing pattern matching behaviour (well lists and well templates).
2019-10-14 06:13:38 -05:00
Joakim Hove 3677f470fb Force UPPER_CASE when input deck has MixeDCase basename 2018-11-21 13:07:33 +01:00
Joakim Hove 079d946723 Make ecl compatible restart files default 2018-09-12 18:02:47 +02:00
Joakim Hove 71d92c3dc8 Add opm_formatted property to the IOConfig 2018-09-12 11:34:57 +02:00
Joakim Hove f82a6fd281 Removed unused function tracking first RFT. 2017-09-28 08:38:55 +02:00
Joakim Hove b6afb2ab8c Removed date accessor from IOconfig/RestartConfig. 2017-06-18 16:55:22 +02:00
Jørgen Kvalsvik 6f35591fad Make IOConfig::getOutputEnabled const 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik 53f178d7ce Make IOConfig no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik 295ef91063 Moved RestartConfig out of IOConfig
RestartConfig is a first-class citizen of EclipseConfig rather than
being embedded in IOConfig. This narrows IOConfig's responsibility to
only that of paths file system definitions and interactions, and
RestartConfig to what and when to output the restart file.
2016-08-11 09:59:54 +02:00
Joakim Hove 0e53246009 Internalize whih keywords to restart - in addition to when. 2016-08-10 16:33:25 +02:00
Pål Grønås Drange 41b158bb2b Shortified names, instead of state.getEclipseConfig().getSummaryConfig(), use state.cfg().summary() 2016-08-08 11:39:59 +02:00
Joakim Hove 0069b02e9f Extracted configuration of *when* to write restart
The configuration of when to write restart files is quite complex,
involving at least the three keywords RPTSOL, RPTRST and RPTSCHED. This
commit moves that configuration from the IOConfig class to the
RestartConfig class.

At a later stage the RestartConfgig class will be extended with
information of *what* to save in the restart file.
2016-07-15 15:26:51 +02:00
Joakim Hove 148b9b22ea Extracted configuration of *when* to write restart
The configuration of when to write restart files is quite complex,
involving at least the three keywords RPTSOL, RPTRST and RPTSCHED. This
commit moves that configuration from the IOConfig class to the
RestartConfig class.

At a later stage the RestartConfgig class will be extended with
information of *what* to save in the restart file.
2016-07-15 14:15:26 +02:00
Joakim Hove 896c8881fd Moved NOSIM handling to IOConfig + allow override. 2016-06-29 07:44:30 +02:00
Joakim Hove 337a141d28 Added IOConfig::getOutputBase() 2016-06-27 11:55:58 +02:00
Jørgen Kvalsvik edb8cdc72d IOConfig creates TimeMap independently of Schedule
Completely remove the dependency between Schedule and IOConfig. IOConfig
will generate its own instance of TimeMap, rather than relying on
Schedule to construction and keeping it alive.
2016-06-06 09:04:30 +02:00
Jørgen Kvalsvik 4dfdf7ad7c IOConfig sets restart info, not Schedule
Break the cyclic dependency between IOConfig and Schedule where Schedule
updated parts of IOConfig. Instead, IOConfig completely builds its own
restart config.

Tests are updated to reflect this.
2016-06-06 09:04:30 +02:00
Jørgen Kvalsvik 469f33c575 Defaults for IOConfig; add string constructor
Brings back the Deck-less constructor for IOConfig, but leveraged by
default values for most members.
2016-06-06 09:04:30 +02:00
Jørgen Kvalsvik f79f40802a IOConfig constructor accept Deck, use init list
IOConfig's string constructor has been deprecated in favour of accepting
a Deck. handleGridSection and handleRunspecSection been moved into the
constructor itself. This clarifies the *actual* dependency in expected
IOConfig usage.
2016-06-06 09:04:30 +02:00
Jørgen Kvalsvik caa10631b0 IOConfig::handle* takes references over shared_ptr 2016-05-09 14:56:04 +02:00
Kjell W. Kongsvik db7958d439 Return type -> const & 2016-05-02 10:13:28 +02:00
Kjell W. Kongsvik 34dbf826de Support explicit setting of BaseName
Needed when reading deck from string and trying to write to disk.
If this is not set there is no baseName to base the file name on.
2016-04-29 16:04:16 +02:00
Kjell W. Kongsvik 65277fcc9f Removed getDeckFileName as the usage of it in EclipseWriter is not needed
Remove in opm-output
2016-04-28 16:19:56 +02:00
Kjell W. Kongsvik 5fb3a6fc53 Add dataFile to Deck if loaded from file
If loaded from string keep empty
2016-04-28 13:45:08 +02:00
Kjell W. Kongsvik 206e16fba5 Added fields to IOConfig so parameters can be removed from EclipseWriter
std::string     m_deck_filename;
bool            m_output_enabled;
std::string     m_output_dir;
2016-04-28 13:45:08 +02:00
Joakim Hove b0a12b230e Internalize first output step for restart and RFT. 2016-03-28 18:47:30 +02:00
Jørgen Kvalsvik f0ae5db131 opm-parser adoption of Deck automatic ownership
Since the Deck* family of classes have changed their interfaces to no
longer use shared_ptr, a lot of code broke. This patch fixes all
problems in tests, other signatures and accesses to now use the new Deck
interfaces.
2016-02-18 13:27:24 +01:00
Jørgen Kvalsvik 4b98943665 Replaces unecessary header includes with fwd decls
Every header is self-contained and includes only what it must to
function, relying on users include what they need in source files,
adopting a pay-what-you-use model (in particular for internal
dependencies).
2016-01-26 13:23:22 +01:00
Jørgen Kvalsvik f404828d63 Cleans up headers to improve build preformance
This is an effort to improve build performance.  Several includes
scattered across the project are either unused or partially used (i.e.
just used to import a type name, not depending on the actual contents of
the header file).

Replaces a lot of these includes with forward declarations.
2016-01-21 09:22:06 +01:00
chflo 43216273b4 OPM-250: Added method to IOConfig to support restart 2015-12-09 14:36:09 +01:00
chflo b1ddf6deb5 OPM-218-fix: Fix in method getWriteRestartFileFrequency() for rptrst basic=3/4/5 2015-09-25 10:29:07 +02:00
chflo 920759b2e0 OPM-217: IOConfig - changes after review 2015-08-18 16:50:24 +02:00
chflo de844ad4b9 OPM-217: Added support for RPTSOL RESTART keyword to IOConfig 2015-08-13 11:35:18 +02:00
Joakim Hove b2cf484ded Added comment. 2015-08-04 17:21:59 +02:00
Joakim Hove 923d715bb9 Bug in handleSolutionsection():
- The handleSolutionsection() method would initialize the timemap, but
   not the storage vector.

 - Renamed initRestartOutputConfig -> assertTimeMap and calling it
   unconditionally.
2015-08-04 17:15:46 +02:00
Joakim Hove 2df100dbc9 Added debug method IOCOnfig::dumpRestartConfig() 2015-08-04 15:20:30 +02:00
chflo 7855af03a2 OPM-218: Fixed restart interval write for RPTRST 2015-08-02 22:03:09 +02:00
chflo c9bf166b08 Fixed IOConfig compiler warning; wrong return type for method overrideRestartWriteInterval 2015-06-22 11:18:45 +02:00
chflo 7aea4129b3 OPM-212: Added method for overriding write of restart file interval to IOConfig 2015-06-15 11:49:32 +02:00
chflo 8a12c3eda9 OPM-205: Added support for RPTSCHED RESTART, and handling of RPTRST BASIC = 0 2015-05-29 12:07:32 +02:00
Atgeirr Flø Rasmussen 2cc4c8ae8e Remove unused deck argument from IOConfig constructor.
Also made constructor explicit since it now only takes a single argument,
to avoid unintended implicit conversion.
2015-05-27 11:51:19 +02:00
chflo 783fad01b2 OPM 199: Added new class IOConfig and corresponding tests 2015-05-26 09:43:58 +02:00