OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
783 Commits 18 Branches 75 Tags
87599c98413526a3c7ea03bc2fc2c1e2acbfc4ae
Commit Graph

783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atle Haugan
87599c9841 Moved has/drop/addProductionControl to WellProductionProperties. The same for WellInjectionProperties. 2014-03-20 10:11:56 +01:00
Atle Haugan
fb5c83086a Moved (duplicated) m_isInPredictionMode to WellProductionProperties and WellInjectionProperties. 2014-03-19 10:51:13 +01:00
Atle Haugan
d9772b83eb Removed unused Well::m_injectionControls, moved m_injectorType to WellInjectionProperties. 2014-03-19 10:42:22 +01:00
Atle Haugan
9c64af0b6b Moved BHPLimits and THPLimits to WellProductionProperties and WellInjectionProperties (duplicated). Several unit tests are still commented out - will fix. 2014-03-19 10:42:21 +01:00
Atle Haugan
3040697ccc Added WellInjectionProperties.InjectionControls. Adjusted som unit tests. Removed some dead code. 2014-03-19 10:40:48 +01:00
Atle Haugan
8aee879dc5 Added WellInjectionProperties, modified Well class to use it 2014-03-19 10:40:07 +01:00
Atle Haugan
df40a0aa21 Replaced single-item calls with call to get/setProductionProperties() 2014-03-19 10:13:58 +01:00
Atle Haugan
9650fce19a Using pointers for WellProductionProperties 2014-03-19 10:13:58 +01:00
Atle Haugan
cd549467b9 Well refactoring - fixed minor bug 2014-03-19 10:13:57 +01:00
Atle Haugan
32c2ef9060 Refactoring the Well class - intermediate step 1 2014-03-19 10:13:57 +01:00
Joakim Hove
77bed42742 Added method at() to the dynamicstate object to return a const reference. 2014-03-19 07:18:09 +01:00
Joakim Hove
c84857ff56 Minor syntax fix in JSON config. 2014-03-18 08:20:51 +01:00
Joakim Hove
1328385c69 Merge pull request #147 from qilicun/polymer_keyword 
Polymer keywords
 2014-03-18 06:49:58 +01:00
Joakim Hove
dca7a8efa1 Merge pull request #144 from qilicun/polymer_units 
Add polymer density unit.
 2014-03-18 06:49:31 +01:00
Liu Ming
49376a554c Add PolymerDensity to system. 2014-03-18 08:19:15 +08:00
Andreas Lauser
189b671930 ScheduleEnums: strip whitespace around the control mode strings 
for some reason, the Norne deck included whitespace for some control
modes of some wells which lead to an exception. Since Eclipse seems to
eat this, and Eclipse is correct by defintion, let's adapt our
digestion system a bit...
 2014-03-17 18:13:49 +01:00
Liu Ming
e29143d95e Add PLYSHEAR, to be used calculation of shear thinning/thickening. 2014-03-17 10:30:49 +08:00
Liu Ming
cf9bb49af5 Add PLYVISC to be used calculation of effective water viscosity. 2014-03-17 10:27:27 +08:00
Liu Ming
106c337435 Add PLYROCK, dealing with permeability reduction. 2014-03-17 10:24:17 +08:00
Liu Ming
45fa031dd4 Add PLYMAX, to be used calculation of the maximum polymer fluid viscosity. 2014-03-17 10:20:30 +08:00
Liu Ming
362585e056 Add PLYADS, dealing with polymer adsorption. 2014-03-17 10:18:18 +08:00
Liu Ming
8de830e225 Add PLMIXPAR for Todd-Longstaff mixing parameter. 2014-03-17 10:15:50 +08:00
Liu Ming
52bd8cceb9 Add polymer density unit. 2014-03-17 09:12:14 +08:00
Joakim Hove
b4bbbb7c8e Merge pull request #137 from joakim-hove/Norne-Schedule 
Small changes to support loading of Norne Schedule file
 2014-03-11 20:08:15 +01:00
Andreas Lauser
08331914bd TimeMap: extend unit tests for the time levels 
I forgot, sorry...
 2014-03-11 19:01:23 +01:00
Andreas Lauser
30a16410aa TimeMap: fix the timePassedUntil() method 
whoever wrote the original code must have his brain left in the bed
that day ;)...
 2014-03-11 15:01:14 +01:00
Joakim Hove
6e62e087ea Changed installation of keywords to use a plain recursive install without consulting git. 2014-03-06 07:00:11 +01:00
Joakim Hove
2259d32258 Added two new keywords. 2014-03-04 16:47:00 +01:00
Joakim Hove
8598fa279e Added throw() in Schedule if trying to control well on an item which has been defaulted. 2014-03-03 15:06:26 +01:00
Joakim Hove
7dc8767c80 Made sure that groups were added when reading the GRUPTREE keyword. 2014-03-03 15:06:26 +01:00
Joakim Hove
ceb4a8df8d Added check on Well->status before reading controlmode. 2014-03-03 15:06:25 +01:00
Atgeirr Flø Rasmussen
3ab6a5388c Suppress unused argument warnings. 2014-03-03 11:06:44 +01:00
Bård Skaflestad
57f34f2ab7 Restore C++-11 checks 
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
 2014-02-28 22:17:13 +01:00
Joakim Hove
ee7e034b08 Merge pull request #134 from bska/uniform-parser-prereqs 
Uniform parser 'prereqs' file
 2014-02-28 21:18:41 +01:00
Joakim Hove
8c3f384b5f Merge pull request #132 from andlaus/add_rv 
add RV keyword
 2014-02-28 21:17:28 +01:00
Bård Skaflestad
600a07f7e2 Depend on Boost.Iostreams 
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
 2014-02-28 19:21:33 +01:00
Bård Skaflestad
97980cb37f Reformat prerequisite file according to convention 
This commit makes a few adjustments to the white-space of file
'opm-parser-prereqs.cmake' to honour the conventions of the other
*-prereqs.cmake files within the OPM project's module suites.

No functional changes.
 2014-02-28 19:21:27 +01:00
Andreas Lauser
0901cd3586 add RV keyword 
For now, this is required to read in the initial condition of Norne...
 2014-02-28 16:27:20 +01:00
Andreas Lauser
b43859a2ad use raw values for context dependent rates in the wrapper of WCONINJE 2014-02-27 13:35:51 +01:00
Joakim Hove
f91229218e Moved the implementation of two micro functions from .hpp to .cpp file + changed one int -> size_t. 2014-02-26 23:24:31 +01:00
Joakim Hove
b0ee11ebb3 Merge pull request #130 from AtleH/pathskeyword 
PATHS keyword
 2014-02-26 23:10:45 +01:00
Joakim Hove
1907a8e467 Merge pull request #129 from andlaus/refactor_timemap 
Refactor timemap
 2014-02-26 23:09:50 +01: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
b9956385ef fixup! TimeMap: Expose more data 2014-02-26 15:46:18 +01:00
Andreas Lauser
57f199a6e8 fixup! TimeMap: add constructor which takes a deck 2014-02-26 15:33:08 +01:00
Atle Haugan
c81fe99fec Fixed definition for PATHS keyword + improved unit test for same 2014-02-26 15:03:04 +01:00
Joakim Hove
47fee36223 Merge pull request #128 from flikka/add-WGRUPCON 
Add WGRUPCON support to parser
 2014-02-25 20:06:45 +01:00
Joakim Hove
b28c082b1a Changed datatype FLOAT -> DOUBLE in configuration of WGRUPCON keyword. 2014-02-25 20:03:45 +01:00
Andreas Lauser
bffa709dd3 TimeMap: extend test to check "from deck construction" and the new accessor methods 2014-02-21 17:06:22 +01:00
Andreas Lauser
9b8c5d317e TimeMap: add constructor which takes a deck 
this simplifies things considerably and hopefully avoids code
excessive code duplication..
 2014-02-21 17:06:22 +01:00