OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,567 Commits 18 Branches 75 Tags
88c55dcd91a5e21c3381339c42a346bd79e94143
Commit Graph

2567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
88c55dcd91 Merge pull request #851 from joakim-hove/suppress-warnings 
Removed unused include and forward declaration.
 2016-06-16 16:54:23 +02:00
Joakim Hove
371b0c94e6 Merge pull request #848 from joakim-hove/error-msg 
Error msg
 2016-06-16 16:51:53 +02:00
Joakim Hove
3ab1559a2b Improved error msg. 2016-06-16 16:05:02 +02:00
Joakim Hove
2b8a0ba1e6 Removed unused include and forward declaration. 2016-06-16 16:03:51 +02:00
Andreas Lauser
76da7a7429 use boost::regex unconditionally 
this fixes opm-simulators#702. which turned out to be a quirk of the
build system which is due to the fact that opm-parser likes to do some
things differently than the rest of OPM. (in this case the culprit was
that it does not generate a `config.h` file which resulted in the
HAVE_REGEX macro to be different between opm-parser and downstream
which in turn causes the ABI to be incompatible.)

Note that it would be nice to use `std::regex` instead of Boost, but
this is currently blocked by the requirement that the oldest supported
compiler is GCC 4.8. (GCC 4.8 only provides a stub implementation of
`std::regex`.)
 2016-06-16 14:23:39 +02:00
Joakim Hove
f324f13e03 Merge pull request #846 from joakim-hove/suppress-warnings 
Suppress warnings
 2016-06-16 09:27:53 +02:00
Joakim Hove
10bf441076 Added ParseContext::PARSE_MISSING_INCLUDE 2016-06-15 17:34:44 +02:00
Joakim Hove
1e8a19f729 Hide unused variable. 2016-06-15 15:41:47 +02:00
Joakim Hove
9b874aabfb Avoid shadowing of member variable. 2016-06-15 15:31:37 +02:00
Joakim Hove
7f540951f4 Removed unused arguments. 2016-06-15 15:27:33 +02:00
Joakim Hove
0f53084015 Merge pull request #827 from joakim-hove/check-symlinks 
Check for symlink() and compile test conditionally
 2016-06-15 15:19:29 +02:00
Joakim Hove
8e9dce4bd8 Merge pull request #839 from joakim-hove/ignore-operate 
Added keyword OPERATE.
 2016-06-15 09:10:26 +02:00
Joakim Hove
e65d19a49a Merge pull request #841 from pgdr/mixed-case 
Supporting reading and writing mixed case properties
 2016-06-15 08:56:09 +02:00
Pål Grønås Drange
1c5ce34a96 Using Utility/String.hpp helper function uppercase 2016-06-14 17:43:37 +02:00
Jørgen Kvalsvik
06c90c4bc7 RawKeyword uses uppercase from util 2016-06-14 17:01:50 +02:00
Jørgen Kvalsvik
2b10bba815 String.hpp/uppercase 
A tiny utility file for shared string-related functions.
 2016-06-14 17:01:50 +02:00
Jørgen Kvalsvik
eeba4f37e6 Expand on possible failure case in parser 2016-06-14 14:44:46 +02:00
Joakim Hove
8f089f284c Merge pull request #840 from jokva/parse-comma-separated-deck 
Strip commas from the input deck
 2016-06-14 14:40:59 +02:00
Jørgen Kvalsvik
f56a2d61d0 Strip commas from the input deck 
Some decks use comma to separate items in a record, but the comma adds
no extra information and is essentially ignored. Post-process the file
after cleaning it and replace all commas with whitespace.

Considering the record "foo bar , , , baz" / baz will silently be moved
to the third item, but handling that situation is a **lot** more
difficult and time consuming and not worth the effort for now.
Additionally, we have yet to receive decks that fail in such a manner,
nor are we sure if it is even a valid record in Eclipse.
 2016-06-14 12:57:05 +02:00
Pål Grønås Drange
3f980665e9 Supporting reading and writing mixed case properties/keyword 2016-06-14 12:54:37 +02:00
Joakim Hove
8cfb73d991 Added keyword OPERATE. 2016-06-14 12:29:31 +02:00
Liu Ming
44fdf9b3c5 1. If the message is more than 1 line, add '\n' at the end of this message. 
2. put file in front of line.
 2016-06-13 13:40:57 +08:00
Joakim Hove
774c36c4a9 Check for symlink() and compile test conditionally 2016-06-11 07:45:24 +02:00
Joakim Hove
aa7cf3b9f1 Merge pull request #824 from joakim-hove/travis-build-downstream 
Travis build downstream
 2016-06-10 13:00:32 +02:00
Joakim Hove
4d3bd50cb8 Travis: opm-common/travis/build-and-test.sh 2016-06-10 11:43:11 +02:00
Liu Ming
3bd87fb9c8 well related message should go into print file. 2016-06-10 09:13:12 +02:00
Liu Ming
d611c2deb6 remove unused variable. 2016-06-09 08:30:37 +02:00
Liu Ming
1f28277f70 minor typo issue. 2016-06-08 15:40:11 +02:00
Liu Ming
4b210aaa51 format the messages. 2016-06-08 15:38:21 +02:00
Liu Ming
c843c714de make the messages relates to history to print file. 2016-06-08 13:46:34 +02:00
Liu Ming
6c7af4afc1 Make a clear message for VFP. 2016-06-08 13:45:40 +02:00
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