Jørgen Kvalsvik
caa10631b0
IOConfig::handle* takes references over shared_ptr
2016-05-09 14:56:04 +02:00
Pål Grønås Drange
672b240e00
fixed bug in Parser, use openRootFile
2016-05-03 15:22:34 +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
bedd431b10
Use path of input as default output path
...
Custom output path can be set explicitly using IOConfig::setOutputDir(path)
2016-04-29 11:24:48 +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
79ab818c3a
Default output dir is current active directory
...
Optionally specify using IOCondig::setOutputDir()
2016-04-28 13:45:09 +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
Liu Ming
a4a449538d
rename ParseMode as ParseContext in EclipseState folder.
2016-03-16 17:15:09 +08: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
67800715db
OPM-218-fix: Cleanup in IOConfigTest.cpp
2015-09-25 10:29:38 +02: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
bbe73bd0fa
OPM-217: Fixed IOConfig RPTRST BASIC with frequency
2015-08-13 11:41:03 +02:00
chflo
de844ad4b9
OPM-217: Added support for RPTSOL RESTART keyword to IOConfig
2015-08-13 11:35:18 +02:00
Atgeirr Flø Rasmussen
519cdc6766
Fix bug in printf() output: formats and types.
2015-08-10 13:04:43 +02:00
Joakim Hove
b253d828c7
Bug in IOConfig: using wrong timemap.
2015-08-06 17:06:15 +02:00
Joakim Hove
2582064c5d
Added ParseMode::unsupportedScheduleGeoModifiers
...
- Added const ParseMode& argument to EclipseState() and Schedule()
constructors.
- Schedule constructor iterates through SCHEDULESection instance
instead of Deck instance.
2015-08-06 15:12:48 +02:00
Joakim Hove
5e64d0f147
Added parser error for 'random text'.
...
Previously random text in the input deck which was not formatted as a
valid keyword header was simply ignored; i.e. this
DIMENS
10 10 10 /
Mohaha random gibbersih - not according to any Spec.
GRID
Would suprisingly parse just fine. This will now be handled according
to the ParseMode::randomText setting. Observe that as a side effect of
this it turned out that many of the test datasets had additional
terminating slashes which were now detected as 'ranomdText'.
2015-08-05 22:02:10 +02:00
Joakim Hove
733af54777
Added struct ParseMode to control parse behaviour.
...
- Introduce a very simple class ParseMode which will become a simple
value object which can be used to control the behavior when errors
and inconsistencies are encountered in the parse and EclipseState
construction phases.
- Added ParseMode instance as second argument to all parseXXX()
methods.
2015-08-05 22:02:09 +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
1156fb6a90
OPM-218: Fixed restart interval write for basic=4/5
2015-08-02 22:01:50 +02:00
chflo
36279ae421
OPM-218: Fixed corresponding tests
2015-07-27 10:48:18 +02:00
Joakim Hove
bc3b9837e0
Renamed DynamicState::add() -> Dynamicstate::update()
2015-07-24 12:40:47 +02:00
chflo
c9bf166b08
Fixed IOConfig compiler warning; wrong return type for method overrideRestartWriteInterval
2015-06-22 11:18:45 +02:00
Atgeirr Flø Rasmussen
e11bd93646
Silence shadowing warning.
2015-06-16 14:41:45 +02:00
chflo
e477aaf3dc
OPM-212: Added test of new method in IOCOnfig
2015-06-15 11:49:33 +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
Joakim Hove
5d2160438f
Changed order in < comparison
2015-06-01 14:53:16 +02:00
chflo
3acd325c39
OPM-205: Reduced severity of output GRID file not supported from throw to warning
2015-05-29 12:07:34 +02:00
chflo
c7d2c62d3d
OPM-205: Added testing of new features in IOConfig
2015-05-29 12:07: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
Arne Morten Kvarving
2f63f49ef9
fix new IOConfig tests
2015-05-26 14:12:36 +02:00
chflo
783fad01b2
OPM 199: Added new class IOConfig and corresponding tests
2015-05-26 09:43:58 +02:00