Commit Graph

53 Commits

Author SHA1 Message Date
Joakim Hove
b67c183544 Merge pull request #600 from totto82/crossflow
Add flag allowCrossFlow()
2015-10-07 23:23:13 +02:00
Tor Harald Sandve
9665b54ad3 Add flag allowCrossFlow()
This PR adds support for item 10 in welspecs where a flag is used to
determine whether the well should allow cross flow or not.

A test is added to check default behavior.
2015-10-06 15:47:07 +02:00
Joakim Hove
51e3aa82cc Update include path 2015-10-06 11:30:43 +02:00
chflo
b773756be0 OPM-218-fix: Changes in ScheduleTests due to change in IOConfig logic 2015-09-25 10:29:39 +02:00
Atgeirr Flø Rasmussen
3845e1c239 Suppress warnings from boost.
Done by using the disable_warnings.h and reenable_warnings.h headers.
In some cases also a little reordering of includes, to put all boost
includes in the warning-suppressed part.
2015-08-10 13:06:50 +02:00
Joakim Hove
e368a05e00 Merge fixup 2015-08-06 15:12:53 +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
chflo
7855af03a2 OPM-218: Fixed restart interval write for RPTRST 2015-08-02 22:03:09 +02:00
Fredrik Gundersen
186247f40e Added tests for wellpi
cumulative behavior and reset back to 1.0 with COMPDAT
2015-06-10 07:51:50 +02:00
Fredrik Gundersen
c3758d623b Added test for WPIMULT 2015-06-02 13:30:53 +02:00
chflo
4854547606 OPM-205: Added tests for handling of RPTSCHED RESTART and RPTSCHED NOTHING 2015-05-29 12:07:33 +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
b61d5f57e5 OPM 199: Added handling of IOConfig RPTRST to Schedule, and corresponding tests 2015-05-26 09:43:59 +02:00
Edvin Brudevoll
c620fde78a Updates and actions 2 related to Joacim's comments. 2015-04-08 12:12:57 +02:00
Edvin Brudevoll
8a7f8e6c59 Updates and actions related to Joacim's comments 2015-04-07 08:02:06 +02:00
Edvin Brudevoll (ITV DIS RD)
8ac548d564 OPM-87, added code for handling keyword WELTARG. 2015-03-25 08:20:22 +01:00
Joakim Hove
2a2078d599 Removed non const overloads 2015-02-12 15:32:31 +01:00
Fredrik Gundersen
1a6ec03ac1 Updates after feedback on code 2015-02-12 08:38:26 +01:00
Fredrik Gundersen
ba603634af Added tests to verify that RFT/RFTPLT parsing works 2015-02-06 14:55:03 +01:00
Joakim Hove
e432a1c75a Added getCellDepth() method to EclipseGrid 2015-01-26 12:26:23 +01:00
Joakim Hove
3cfe0291fd Added EclipseGrid as argument to Schedule constructor 2015-01-26 12:21:51 +01:00
Joakim Hove
85092991f6 Merge pull request #400 from iLoop2/Add_COMPLUMP_keyword
Add complump keyword
2015-01-26 12:21:12 +01:00
Fredrik Gundersen
a796cc12fb Update test
Verify that well do not change status to OPEN if the completions are status SHUT
2015-01-22 07:39:29 +01:00
Fredrik Gundersen
4f066af438 Moved logic from schedule to well->setStatus
Only set status for well to open if well has open completions is now verified for all
2015-01-21 14:07:02 +01:00
Fredrik Gundersen
1901aa90bc Changed the error message 2015-01-20 10:27:44 +01:00
Fredrik Gundersen
cccde3a0ee Added more tests for COMPLUMP 2015-01-20 08:59:56 +01:00
Fredrik Gundersen
cd9ed822bf Added test of COMPLUMP keyword 2015-01-19 13:35:33 +01:00
chflo
4d7213651c OPM 147: WELOPEN: Shut well if all completions are closed; throw exception if trying to open a well with all completions shut 2015-01-16 18:05:49 +01:00
Fredrik Gundersen
a05cf32c42 Extended test to include more cases 2015-01-13 15:06:28 +01:00
Fredrik Gundersen
5f14914257 Added more tests 2015-01-13 12:56:17 +01:00
Fredrik Gundersen
5a9620d8b2 Added test for WELOPEN keyword 2015-01-13 11:25:46 +01:00
Joakim Hove
e03413f149 Merge pull request #378 from andlaus/remove_trailing_whitespace
remove all trailing white space
2014-12-08 19:54:53 +01:00
Andreas Lauser
b127b472ed clang 3.3: fix "unknown escape sequence" warnings 2014-12-08 18:28:19 +01:00
Andreas Lauser
ea38a25af4 remove all trailing white space
this is just the result of

```
find -iname "*.[ch]pp" | xargs sed -i "s/ *$//"
find opm/parser/share/keywords -type f |  xargs sed -i "s/ *$//"
```

so if it causes conflicts with other patches, the others should get
priority. The rationale behind this patch is that some people tell
their editor to remove white space which leads to larger than
necessary patches...
2014-12-08 16:34:28 +01:00
chflo
82243d0ec1 OPM-139: Added methods to Schedule to support opm-core in writing wellinfo to restart files 2014-12-05 12:59:53 +01:00
Andreas Lauser
b690d9add8 EclipseState: check the canonical section topology
at least if the "beStrict" parameter for the constructor is set to
true. by default nothing changes...
2014-08-26 12:29:17 +02:00
Kristian Flikka
82a38c1cc8 Merge pull request #208 from AtleH/wellnamewithwildcard
Added wildcard support in WCONINJE and WCONPROD
2014-05-16 12:28:39 +02:00
Arne Morten Kvarving
3827ddca64 fixed: mark static symbols as such to quell warnings 2014-05-15 14:46:16 +02:00
Atle Haugan
47ef4ed0e6 Simplified implementation and (slightly) changed behaviour of Schedule::getWells(wellNamePattern)
Improved performance by checking for wildcard before entering the loop. Logic slightly changed since method now only supports wildcards at the end of the string.
2014-05-14 15:10:17 +02:00
Atle Haugan
344d02ad1c Add support for wildcard in WCONPROD and WCONINJE keywords. 2014-05-06 09:54:37 +02:00
Joakim Hove
142255268d Using OrderedMap to hold wells in Schedule object - thereby preserving
well insert order.
2014-05-02 17:02:10 +02:00
Andreas Lauser
af13b5ed31 TimeMap: always assume the presence of the TIME item
i.e., the number of items in a date record must now always be 4. to
make this happen, some tests had to be fixed, too...
2014-02-26 22:15:53 +01:00
Andreas Lauser
18eb2fd8f4 TimeMap: replace boost::gregorian::date by boost::posix_time::ptime
this is necessary because boost::gregorian::date does not have a
notion of "time during a day" which is required to specify time step
lengths less than a day...
2014-02-21 17:06:21 +01:00
Kristian Flikka
6229fd1250 Added functionality to get vector containing active / all wells 2014-01-22 14:40:10 +01:00
Kristian Flikka
0271e5fc03 Merge master into schedule_groups 2013-11-21 13:43:36 +01:00
Kristian Flikka
e2d53f3777 Added forgotten (half-finished) test 2013-11-20 14:59:43 +01:00
Joakim Hove
176e0af7cc Added m_groups map to the Schedule container. Contains FIELD by default 2013-11-18 13:11:49 +01:00
Kristian Flikka
a8e3128ef8 Made Schedule handle the GRUPTREE keyword, Added testing to GroupTreeTests.cpp 2013-11-14 16:08:32 +01:00