Commit Graph

228 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
53f178d7ce Make IOConfig no longer use shared_ptr 2016-10-19 20:38:27 +02:00
Jørgen Kvalsvik
b3dbd6f930 Return const ref from getSchedule 2016-10-19 20:38:27 +02:00
Liu Ming
a25c5c0850 Merge remote-tracking branch 'opm/master' into get-messages 2016-10-14 13:48:49 +08:00
Liu Ming
c7b3e2cf57 Get MESSAGES limits from Schedule and update every time step. 2016-10-14 10:06:35 +08:00
Liu Ming
5fc2463097 Get print and stop limits from MESSAGES keyword. 2016-09-13 21:33:54 +08:00
Joakim Hove
81b71d5d08 Removed EclipseGrid member from Schedule class. 2016-09-12 21:42:34 +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
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
Pål Grønås Drange
dde7a25673 Made EclipseConfig.SimulationConfig and .InitConfig references 2016-08-08 09:37:13 +02:00
Pål Grønås Drange
b359e9c0fb transmult is member, use ref's, use proper constructor of EclipseState 2016-08-05 15:07:15 +02:00
Joakim Hove
d3f415c5aa ParseContext treatment of unknown wells/groups. 2016-07-01 17:04:58 +02:00
Pål Grønås Drange
49f3356934 Removed getDims() and disable this EclipseGrid
* Removed method getDims since getNXYZ already exists
* Now we throw if EclipseGrid get lean deck
* Removed tests for assertCellInfo and hasCellInfo
* Fixed ResinsightTests to use GridDims
2016-06-21 14:56:34 +02:00
Pål Grønås Drange
ff26034445 Added DIMENS/SPECGRID test case, several GridDims changes
* Added a test to ensure DIMENS/SPECGRID are handled consistently
* Added GridDims.cpp source file and moved code from header
* Added GridDims.(c|h)pp to CMakeLists
* Removed use of MessageContainer in GridDims, updated calls
* Made function getDims(keyword) inline readDims
* Reformatted GridDimens
2016-06-21 12:39:16 +02:00
Pål Grønås Drange
55e950a9a4 Fixed GridDims after rebase, removed ERT knowledge in GridDims 2016-06-21 12:34:57 +02:00
Pål Grønås Drange
30b03b6aec Fixed value/reference bug, changed init to add...
* Fixed a Section to Section& bug that occurred after removing ptr's
* Renamed initFaults to addFaultFace
* Organized imports in EclipseState and Eclipse3DProperties
* Fixed 2013 to 2016 error in header in E3DP
2016-06-21 11:43:20 +02:00
Pål Grønås Drange
ff9ee958d7 Minor refactor. Changed shared_ptr to references in EclipseState, MULTREGTScanner and FaultCollection 2016-06-20 12:27:56 +02:00
Joakim Hove
7f540951f4 Removed unused arguments. 2016-06-15 15:27:33 +02:00
Pål Grønås Drange
415c1b22ba Moved initIOConfigPostSchedule into constructor, fixed includes 2016-06-07 14:53:58 +02:00
Pål Grønås Drange
e9bdf2d29d Introducing EclipseConfig -- a container class
* This class contains the following State methods
** getSchedule
** getIOConfig
** getInitConfig
** getSimulationConfig
** getSummaryConfig
* For better decoupling
* For future, ease the shared_ptr-ref transition
2016-06-07 14:53:38 +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
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
Joakim Hove
0792121bec EclipseGrid copy constructor.
Removed EclipseGrid::EclipseGrid( ecl_grid_type * )
2016-05-27 15:14:39 +02:00
Joakim Hove
21de4055bc Merge pull request #814 from jokva/unit-system-improvements
Unit system improvements
2016-05-24 11:48:54 +02:00
Joakim Hove
58f9837eac Call resetACTNUM() unconditionally. 2016-05-24 08:50:56 +02:00
Jørgen Kvalsvik
5dde6323e8 Alternative 'getUnits' to 'getDeckUnitSystem'
getDeckUnitSystem largely implies getting an *identifier* to the unit
system used in the deck, where the actual object returned has conversion
features to/from SI as well. Augment EclipseState's interface with the
simpler getUnits name.
2016-05-23 15:12:12 +02:00
Joakim Hove
5ef7519115 Merge pull request #806 from pgdr/nnc-input
Renamed getNNC() to getInputNNC() avoids confusion
2016-05-19 13:44:06 +02:00
Liu Ming
ca085fa6a2 remove ParseContext. 2016-05-14 09:15:26 +02:00
Pål Grønås Drange
607e4e2b9a Renamed getNNC() to getInputNNC() avoids confusion
* The NNC in the eclipse state is and will always be the nnc from deck
* updated tests
2016-05-13 14:09:29 +02:00
Jørgen Kvalsvik
42992d9b91 Add missing member constructor call. 2016-05-10 10:08:29 +02:00
Jørgen Kvalsvik
3106e6ae8a Create SummaryConfig object in EclipseState 2016-05-09 15:10:21 +02:00
Jørgen Kvalsvik
79a8f6efc5 Clean up initialisation order in EclipseState
The previous order was inaccurate and confusing. Clean up member and
initialisation order to more closely reflect the actual intent and
behaviour.
2016-05-09 15:09:42 +02:00
Jørgen Kvalsvik
28ae15cf0f Move getRegions into 3DProperties 2016-05-09 14:55:24 +02:00
Pål Grønås Drange
091dc196f3 Added parse functions for Parser, for simpler creation of state and grids 2016-05-06 12:21:41 +02:00
Pål Grønås Drange
b8b1ba9528 ParseContext is now a member of EclipseState
* EclipseState now copies input ParseContext and keeps it as member
* Made the argument (ParseContext) default as ParseContext()
* Now you can make a new EclipseState with only deck as argument
* Removed test that tested address equality of ParseContext objects
2016-05-06 11:37:26 +02:00
Pål Grønås Drange
d9eb3ebf86 Added test for IOConfigBaseName and fixed a self-introduced bug in E.S. 2016-05-03 14:07:01 +02:00
Pål Grønås Drange
5a7dcc5427 Made FaultCollection reference in State thereby fixing compiler warn 2016-05-03 13:22:57 +02:00
Pål Grønås Drange
63e452167c Introduce deckptr-less EclipseState and EclipseGrid 2016-05-03 13:22:56 +02:00
Kjell W. Kongsvik
b3b8cebeff Simplified deck filename handling. Only set filename if successfully opened 2016-04-28 15:42:07 +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
Liu Ming
c42cfafc90 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
	opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
2016-04-22 14:53:16 +08:00
Pål Grønås Drange
444f74642c Refactored EclipseState.getEclipseGrid to getInputGrid 2016-04-19 16:47:05 +02:00
Pål Grønås Drange
aaf0a2fcbc Renamed m_eclipseGrid to m_inputGrid internally in EclipseState 2016-04-19 13:06:37 +02:00
Pål Grønås Drange
ba01b7eb53 Fixes support for BOXed ACTNUM
* Added ACTNUM as keyword to Eclipse3DProperties
* Removed certain checks from EclipseGrid that are no longer of use
* Added tests to EclipseGridTests that test boxed ACTNUM and activeCells
* Made EclipseGrid non-const in EclipseState since we must run resetACTNUM
* Fixed a minor typo in an error message in EclipseGrid
* Fixed typo in GridProperty: Deckeyword -> DeckKeyword
* Fixed two errors in tests recently introduced relating to Ecl3DProps
* Removed test in EclipseGridTests; We now accept too small ACTNUM vectors
* Added ACTNUM test for GridProperties
2016-04-19 10:54:09 +02:00
Liu Ming
17918ac5b3 use proper function to log filename, line number, msg. 2016-04-19 15:06:03 +08:00
Liu Ming
7ddad9bf67 assemble messages in the constructor. 2016-04-18 14:26:39 +08:00
Liu Ming
7176753297 solve conflict. 2016-04-15 09:41:45 +08:00
Liu Ming
940d7f8449 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
2016-04-15 09:14:00 +08:00
Jørgen Kvalsvik
a705b0750b Query all IDs of (FIP) regions in State
Enable support for querying what fluid-in-point regions are defined in
the deck. For now the only interesting regions are the ones specified by
the FIPNUM keyword in the REGIONS section.

The implementation is somewhat inefficient (n log n over the number of
cells in the grid), but since this is likely to only be called when
default-expanding SUMMARY section keywords this isn't too bad, since the
implementation is so dead simple.
2016-04-14 09:30:55 +02:00
Liu Ming
77557eaa84 append messages. 2016-04-14 13:56:01 +08:00