OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,445 Commits 18 Branches 75 Tags
d508b643125c69023502649cda7f0e8f10e469b5
Commit Graph

1445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser
d508b64312 Schedule: fix handling of the RESV item 
it turns out that, in contrast to the RATE item, this item is always a
liquid rate (-> bbl/day in FIELD units), i.e., the dimension is always
"LiquidVolume/Time" irrespectibly of the fluid phase.
 2015-02-12 19:07:03 +01:00
Andreas Lauser
c6e28b66c6 allow the schedule object to be immutable 
quite a few important methods (e.g., getWells()) missed the variants
which are marked as 'const'. this leads to the problem that these
can't be called on the object returned by EclipseState::getSchedule()
because it returns a ScheduleConstPtr. (this issue can possibly be
worked-around by creating a new mutable copy of the schedule object
from the one returned by EclipseState::getSchedule(), but to me, this
seems to be strikingly inelegant and inefficient...)

this fixes the compilation of the ECL blackoil simulator of eWoms...
 2015-02-12 12:54:57 +01:00
Fredrik Gundersen
ce5eb28c92 Fix of test after merge of pull request #416 2015-02-12 11:31:09 +01:00
Fredrik Gundersen
42711ee259 Merge remote-tracking branch 'upstream/master' into OPM-158 2015-02-12 10:30:55 +01:00
Fredrik Gundersen
4241e169fc Fix test after update of rules for OPEN well status 2015-02-12 10:29:21 +01:00
Liu Ming
8f61bcd59a Add MinpvMode namespace and remove the whitespace. 2015-02-12 16:00:31 +08:00
Fredrik Gundersen
1a6ec03ac1 Updates after feedback on code 2015-02-12 08:38:26 +01:00
Fredrik Gundersen
dccce11b37 Delete not needed properties class 2015-02-12 08:37:03 +01:00
Fredrik Gundersen
9d0ef9d318 Update to method names and text 2015-02-12 08:30:48 +01:00
Liu Ming
1dfb337a76 Remove isMinpvActive() function, use getMinpvMode() instead. 2015-02-10 16:45:48 +08:00
Liu Ming
3d0c79a4d9 Create Minpv mode enum. 2015-02-10 16:45:03 +08:00
Liu Ming
47b9ff6c1c move MINPVFIL to opm directory. 2015-02-10 14:33:24 +08:00
Liu Ming
785fa97c80 Merge remote-tracking branch 'remotes/opm/master' into add_minpvf 2015-02-09 09:52:40 +08:00
Liu Ming
15164b0e7f Add keyword MINPVF. 2015-02-09 09:52:11 +08:00
Joakim Hove
9f16165dfd Will compare connection factor > 0 before setting 2015-02-06 17:05:19 +01:00
Fredrik Gundersen
a41bc4ce18 Cleanup after merge 2015-02-06 15:02:38 +01:00
Fredrik Gundersen
88274cff6e Merge remote-tracking branch 'upstream/master' into OPM-158 
Conflicts:
	opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
	opm/parser/eclipse/EclipseState/Schedule/Well.cpp
 2015-02-06 15:00:30 +01:00
Fredrik Gundersen
670d835fa1 Remove old code 2015-02-06 14:57:24 +01:00
Fredrik Gundersen
ba603634af Added tests to verify that RFT/RFTPLT parsing works 2015-02-06 14:55:03 +01:00
Fredrik Gundersen
2c332e6ef8 Added support for parsing RTF/PLT 2015-02-06 14:54:03 +01:00
Fredrik Gundersen
9a9d7ea053 Updated Well class to support RFT and PLT 2015-02-06 14:53:38 +01:00
Fredrik Gundersen
80a7b99f87 Added new enums for RFT and PLT keys 2015-02-06 14:52:59 +01:00
Fredrik Gundersen
340501f113 Added support for new keyword 2015-02-06 14:51:48 +01:00
Fredrik Gundersen
3de8caa848 Added class to hold RTF data during parsing 2015-02-06 14:51:31 +01:00
Joakim Hove
eda7b60f54 Handle missing xxxDIMS keywords 
For some keywords the number of records is given as the value of an item
in another keyword, for instance the number of records in the EQUIL
keyword is given by NTEQUL item in the EQLDIMS keyword.

If the EQLDIMS keyword is not given in the deck the Parser will consult
the default values of EQLDIMS keyword; i.e. a missing keyword is treated
as all-defaulted.
 2015-02-06 13:04:17 +01:00
Joakim Hove
af249cefd7 Added method to get keyword from Parser. 2015-02-06 13:03:44 +01:00
Joakim Hove
9fb5ab0a95 Made method public 2015-02-03 13:04:57 +01:00
Joakim Hove
b2ae92293c Merge pull request #407 from andlaus/add_COMPS 
Add the "COMPS" E300 keyword
 2015-01-30 17:01:01 +01:00
Joakim Hove
96a0a6b6ca Fixed gcc44 challenged calls to std::to_string() 2015-01-30 16:55:15 +01:00
Andreas Lauser
e3d5a3e860 Add the "COMPS" E300 keyword 2015-01-30 15:39:34 +01:00
Andreas Lauser
dcc36df62e correct the GasvisctTable class 
it turns out that the number of columns of this class depends on the
number of specified components. this lead to all kinds of fun like
manual unit conversion, etc.
 2015-01-30 14:28:23 +01:00
Andreas Lauser
0a477ed18a add table classes for the temperature dependent viscosity keywords 2015-01-30 14:28:14 +01:00
Andreas Lauser
664ca1e8ff add some keywords required to specify the temperature dependence of viscosity 2015-01-30 14:28:01 +01:00
Joakim Hove
2f9551242b Revert "Temperature dependent viscosity" 2015-01-30 10:12:17 +01:00
Andreas Lauser
d40f093f36 add table classes for the temperature dependent viscosity keywords 2015-01-29 23:02:17 +01:00
Andreas Lauser
b99128e6d9 add some keywords required to specify the temperature dependence of viscosity 2015-01-28 16:05:41 +01:00
Atgeirr Flø Rasmussen
c0d30a7739 Add checkUnhandledKeywords() method and use it. 2015-01-28 09:39:13 +01:00
Atgeirr Flø Rasmussen
38dde951bc Make conversion methods static. 
The convertInjectionRateToSI() methods do not use data members and can therefore
be static just as convertEclipseStringToBool() already is.
 2015-01-28 09:30:07 +01:00
Atgeirr Flø Rasmussen
44f16496d3 Removed surplus docs. 2015-01-28 09:09:30 +01:00
Atgeirr Flø Rasmussen
26fe9cf9b3 Removed const from value-type function arguments. 2015-01-28 09:04:41 +01:00
Atgeirr Flø Rasmussen
bdcb1f5243 Add assert() to findClosestCompletion() method. 2015-01-28 08:08:32 +01:00
Atgeirr Flø Rasmussen
b3f515b4bb Replace unneeded inline deck with new EclipseGrid constructor. 2015-01-27 10:56:48 +01:00
Atgeirr Flø Rasmussen
d150107746 Update test for cartesian constructor. 
We will now have cell info, even with that one.
 2015-01-27 10:41:35 +01:00
Atgeirr Flø Rasmussen
74d213ce18 Fix inconsistencies in test cases. 
Not detected earlier since schedule did not access grid data.
 2015-01-27 10:39:39 +01:00
Atgeirr Flø Rasmussen
ff80db33ba Improved cartesian convenience constructor. 
It now can take cell size arguments, and it always creates a complete grid.
 2015-01-27 09:54:10 +01:00
Atgeirr Flø Rasmussen
79f32521ed Make Well class order completions when added. 2015-01-26 16:40:32 +01:00
Atgeirr Flø Rasmussen
7d6c9e1ea3 Add tests for well completion ordering. 2015-01-26 16:40:13 +01:00
Atgeirr Flø Rasmussen
345337cb2a Add method orderCompletions() to CompletionSet. 2015-01-26 16:39:32 +01:00
Atgeirr Flø Rasmussen
0a6cf17431 Fix initialization order to avoid warning. 2015-01-26 16:38:17 +01:00
Joakim Hove
02e0a12b0a Reorder Grid and Schedule init. 2015-01-26 12:26:25 +01:00