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

1982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
abe925ff2f Add method Well::canOpen(currentStep) and use it in Schedule 2015-11-09 09:52:23 +01:00
Tor Harald Sandve
a66c820f0a Prevent wells with zero rate and crossflow disabled to open 2015-11-05 14:37:47 +01:00
Joakim Hove
e08f369b97 Merge pull request #623 from andlaus/fix_build 
fix build when using newish Boost libraries
 2015-10-30 14:35:54 +01:00
Andreas Lauser
b99029a8b9 fix build when using newish Boost libraries 
it seems that recent Boost versions (I used 1.59) enforce a semicolon
behind the BOOST_CHECK macros, while older ones did not.
 2015-10-30 14:32:34 +01:00
Joakim Hove
4178257b17 Merge pull request #622 from joakim-hove/dynamic-vector 
Dynamic vector
 2015-10-30 10:33:45 +01:00
Joakim Hove
a5b97fc2b8 Implemented Events with DynamicVector. 
As a side side effect the m_events member in the Schedule class has
become a shared pointer.
 2015-10-29 14:28:24 +01:00
Joakim Hove
931f430028 Added simple DynamicVector bound to TimeMap. 2015-10-29 14:28:22 +01:00
Joakim Hove
90c55b0257 Drop BHP control when producer <-> injector. 2015-10-29 12:49:30 +01:00
Joakim Hove
ce9727b337 Added method for change injector <-> producer. 
Will reset producer BHP limit to zero when changing to an injector, and
visa versa.
 2015-10-28 17:13:34 +01:00
Joakim Hove
da7871feaf Enable BHP control for history and WELTARG. 2015-10-28 17:13:33 +01:00
Joakim Hove
6027711bad Minor prettyfying of test. 2015-10-28 17:13:31 +01:00
Joakim Hove
461c74cc57 Do not update well BHP limit from WCONHIST. 2015-10-28 17:13:29 +01:00
Tor Harald Sandve
863e96c673 Test for changing BhpLimit in history mode using weltarg 2015-10-28 17:13:28 +01:00
Markus Blatt
d0b54e9f25 Fixes warning about ignored qualifiers on function return types. 
In particular this warning is removed:
"In file included from /home/mblatt/src/dune/opm/opm-parser/opm/parser/eclipse/EclipseState/EclipseState.cpp:34:0:
/home/mblatt/src/dune/opm/opm-parser/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp:438:66: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
     const SaturationFunctionFamily getSaturationFunctionFamily() const{"
                                                                  ^
 2015-10-22 16:09:41 +02:00
Joakim Hove
95fde2080c Merge pull request #612 from akva2/add_versioning 
added/fixed: set soversion for libraries
 2015-10-19 13:56:18 +02:00
Arne Morten Kvarving
1d3b35c426 added/fixed: set soversion for libraries 2015-10-19 13:34:19 +02:00
Atgeirr Flø Rasmussen
7b0a6d2556 Make dist() call well-defined. 2015-10-19 11:00:42 +02:00
Kristian Flikka
c1e1e4bdd1 Deleted unused file MULTREGT.cpp 2015-10-16 13:50:03 +02:00
Kristian Flikka
a2c21f5d88 Added missing curly brace (found using sonar with cppcheck and vera++) 2015-10-16 13:01:39 +02:00
Joakim Hove
88fbe579ed Merge pull request #603 from totto82/shut_crossflow 
Shut wells with zero rates and crossflow not allowed
 2015-10-12 16:12:18 +02:00
Tor Harald Sandve
539e75081f Add paranthesis 2015-10-12 12:28:12 +02:00
Atgeirr Flø Rasmussen
c937867286 Do not use const for value return. 2015-10-12 10:04:35 +02:00
Joakim Hove
fa4ebe7931 Merge pull request #606 from qilicun/sgwfn 
Add keyword SGWFN.
 2015-10-12 08:47:20 +02:00
Liu Ming
664b6a80e5 SGWFN table. 2015-10-12 14:26:51 +08:00
Joakim Hove
3dfbc75bc4 Merge pull request #594 from iLoop2/AddDRSDT_DRVDT_VAPPOR 
Add keywords DRSDT DRVDT VAPPARS
 2015-10-12 08:18:54 +02:00
Liu Ming
68a9366d8d Add keyword SGWFN. 2015-10-12 10:56:21 +08:00
Liu Ming
eca2105f82 make the parameter as const. 2015-10-09 17:28:20 +08:00
Liu Ming
b0995cfc0b add PinchMode from string function. 2015-10-09 17:23:37 +08:00
Liu Ming
98f2659c84 add PinchMode to instead of string. 2015-10-09 16:28:53 +08:00
Fredrik Gundersen
ec74096dcb Changed return value for option to bool 2015-10-09 09:50:09 +02:00
Liu Ming
7181255d6d Add support for PINCH item 4 and 5. 2015-10-09 10:29:33 +08:00
Tor Harald Sandve
99c03c3914 Shut wells with zero rates and crossflow not allowed 
Note: Producing wells in prediction mode is kept open even if the
control rate is set to zero.
 2015-10-08 12:17:29 +02:00
Fredrik Gundersen
80a77136cf Fix OilVaporizationProperties to have only one constructor 2015-10-08 11:17:24 +02:00
Joakim Hove
b67c183544 Merge pull request #600 from totto82/crossflow 
Add flag allowCrossFlow()
 2015-10-07 23:23:13 +02:00
Tor Harald Samdve
0d4d71dcef Use the autogenerated build constants 2015-10-07 12:23:04 +02:00
Atgeirr Flø Rasmussen
6cf9d01cc3 Avoid shadowing the 'record' variable. 2015-10-07 09:43:51 +02:00
Fredrik Gundersen
32914e2ed4 Merge remote-tracking branch 'upstream/master' 2015-10-07 07:59:02 +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
Joakim Hove
dcb92434fd warning that warning macros moved to opm-common. 2015-10-06 11:29:35 +02:00
Joakim Hove
6dee686dc0 Implemented accessor functions for REGDIMS. 2015-10-06 08:44:00 +02:00
Joakim Hove
7070517d1c Removed debug output. 2015-10-05 07:46:49 +02:00
Joakim Hove
b3972de557 Immplemented PLYSHLOG table with TableContainer. 
The PLYSHLOG table specification is based on alternating header and data
records, this is not supported by th parser - and the thing will throw
if more than table is specified.
 2015-10-04 20:03:54 +02:00
Joakim Hove
ea86b51b8d TableContainer for PLYMAX and PLYROCK. 2015-10-04 20:03:53 +02:00
Joakim Hove
40fa456603 TableContainer for PLYADS,PLYDHFL and PLYVISC. 2015-10-04 20:03:51 +02:00
Joakim Hove
821bc9bc9e Implemented ROCKTAB with TableContainer. 2015-10-04 20:03:48 +02:00
Joakim Hove
fae6a9086f Added keyword ROCKCOMP. 2015-10-03 17:32:12 +02:00
Joakim Hove
4857f2299f Using TableContainer for RTEMPVD. 2015-10-03 17:32:12 +02:00
Joakim Hove
d1451bc4e3 Using TableContainer for gas viscosity. 2015-10-03 17:32:12 +02:00
Joakim Hove
1542957e49 Using TableContainer for oil and water viscosity. 2015-10-03 17:32:11 +02:00