Commit Graph

2536 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
1b55fb4259 Merge pull request #830 from qilicun/add-prtinfo-type
Add Prtinfo message type allows messages go into print file.
2016-06-08 11:35:23 +02:00
Liu Ming
98ed0521b5 fix indentation. 2016-06-08 11:11:16 +02:00
Liu Ming
dcb91aa070 change type order. 2016-06-08 09:25:07 +02:00
Liu Ming
5d631d7dd2 change Prtinfo to Note. 2016-06-08 09:12:58 +02:00
Joakim Hove
fd3245599e Merge pull request #818 from magnesj/vs2015-compiler-fixes
VS2015 : Workaround for VS2015 compiler bug
2016-06-08 00:15:14 +02:00
jokva
3137a92a41 Merge pull request #812 from pgdr/eclipse-config-container
Introducing EclipseConfig -- a container class
2016-06-07 15:21:23 +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
Liu Ming
dea35c4c34 Add Prtinfo message type allows messages go into print file. 2016-06-07 14:09:35 +02:00
Joakim Hove
bbe67c01aa Merge pull request #828 from qilicun/log-vfp-messages
Write the VFP testing information into Debug file.
2016-06-06 14:43:10 +02:00
Liu Ming
8d59f6d3d8 remove unused method. 2016-06-06 13:48:47 +02:00
Liu Ming
9a23157b6a Write the VFR testing information into Debug file. 2016-06-06 12:26:26 +02:00
Jørgen Kvalsvik
744d2ee773 Remove IOConfig use in Schedule 2016-06-06 11:04:27 +02:00
Jørgen Kvalsvik
58d206f3b0 Comments in IOConfig. 2016-06-06 11:04:27 +02:00
Jørgen Kvalsvik
dcb291fa4d Remove magic numbers.
Prefer named indices in the integer lists when they are used in favour
of mnemonics.
2016-06-06 11:04:27 +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
e9ed9cda1b Remove Schedule::createTimeMap 2016-06-06 09:04:30 +02:00
Jørgen Kvalsvik
e7be3ebab5 Move initFromDeck into constructor 2016-06-06 09:04:30 +02:00
Jørgen Kvalsvik
8a38189c69 Simplify internal schedule IOConfigSettings loop 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
Joakim Hove
1ac0de0d1e Merge pull request #815 from jokva/input-stack-std-stack
Implement InputStack with std::stack
2016-05-31 10:48:04 +02:00
Joakim Hove
a6e9f7a3b0 Merge pull request #817 from joakim-hove/eclipsegrid-copy
EclipseGrid copy constructor.
2016-05-28 08:06:14 +02:00
Joakim Hove
152069351c Added EclipseGrid::activeIndex( ) NB: throws!! 2016-05-27 15:14:40 +02:00
Joakim Hove
0792121bec EclipseGrid copy constructor.
Removed EclipseGrid::EclipseGrid( ecl_grid_type * )
2016-05-27 15:14:39 +02:00
Joakim Hove
0986d49c05 Small test of fun::map and fun::concat. 2016-05-27 09:18:39 +02:00
Joakim Hove
0289349ddb Merge pull request #819 from jokva/ecl-kw-changed-interface
Removed unused EclKW.
2016-05-26 13:27:33 +02:00
Jørgen Kvalsvik
ae8769ff7c Removed unused EclKW. 2016-05-26 09:22:07 +02:00
Magne Sjaastad
f66294832c VS2015 : Workaround for VS2015 compiler bug 2016-05-25 16:23:09 +02:00
Magne Sjaastad
4186ce5a11 VS2015: Test for MSVC when guarding compiler flags 2016-05-25 10:39:19 +02:00
Magne Sjaastad
fafd718789 VS2015: Must name all BOOST_TEST_MODULE to be able to compile 2016-05-25 10:39:19 +02:00
Magne Sjaastad
d51645db72 VS2015 : Use generic_string in generated filenames 2016-05-25 10:39:19 +02:00
Magne Sjaastad
1f91ae2b09 VS2015 : Added include to math 2016-05-25 10:39:19 +02:00
Magne Sjaastad
85e3ae61b3 VS2015 : Added missing include to cctype 2016-05-25 10:39:19 +02:00
Magne Sjaastad
393bdb42f2 VS2015 : Added missing include to ssize_t 2016-05-25 10:39:19 +02:00
Jørgen Kvalsvik
726b0d0957 Implement InputStack with std::stack
Save some implementation by using std::stack as interface and
implementation for InputStack. Remove the vector pair of file and file*
and just use file directly.
2016-05-24 12:40:40 +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
5cf9932b1d Refactored Eclipse3DProperties
- Moved the handling of keywords from Eclipse3DProperties to
   GridProperties<T>.

 - The GridProperty<T> postprocessor is invoked from
   GridProperties<T>::getKeyword() method. The question of whether the
   postprocessor should be invoked or not is determined by the
   overload:

     public:
       const GridProperty<T>& getKeyword(const std::string) const;

     private:
       GridProperty<T>& getKeyword(const std::string);

   The public const overload will run the postprocessor, whereas the
   non-const private overload should (will) be used in the construction
   phase and should not invoke the post processor.

 - The two pass passing where we first internalize integer keywords and
   then floating point keywords has been removed.

 - Code in GridProperties has mainly been moved to GridProperties.cpp
   with explicit instantiation for int and double.
2016-05-24 09:50:15 +02:00
Joakim Hove
1a0a822cbb Renamed member variable. 2016-05-24 08:50:56 +02:00
Joakim Hove
8f70ee7d0b Removed GridProperties::getKeyword( size_t ) 2016-05-24 08:50:56 +02:00
Joakim Hove
c7d4c7fff2 Added ACTNUM postprocessor.
Added a post processor to the ACTNUM property which will set ACTNUM to
zero for all cells with PORV == 0.
2016-05-24 08:50:56 +02:00
Joakim Hove
4c610eb040 GridProperty::runPostProcessor() is public. 2016-05-24 08:50:56 +02:00
Joakim Hove
58f9837eac Call resetACTNUM() unconditionally. 2016-05-24 08:50:56 +02:00
Joakim Hove
3035a89b71 Add test of PORO == 0 -> ACTNUM = 0 behavior. 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
Jørgen Kvalsvik
1c7e7e08c6 Move to_si/from_si into UnitSystem
UnitSystem already offered similar functionality, but via string-map
lookup and a very clunky interface. Offer simple to/from methods as an
addition.
2016-05-23 15:11:33 +02:00
Jørgen Kvalsvik
6affc5f9c1 Split Well/Group; ignore unknown names
Occasionally the SUMMARY section requests wells or groups that aren't
defined in the Deck. Ignore these names (which would typically crash
downstream) and carry on.
2016-05-23 10:32:41 +02:00
Joakim Hove
6882311984 Merge pull request #810 from jokva/schedule-posix-start-time
Support Schedule::posixStartTime()
2016-05-19 14:07:28 +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