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

596 Commits

Author SHA1 Message Date
atleh
a4b8c08c0e Some code cleanup in XyzSection classes 2014-03-24 14:56:20 +01:00
atleh
7225ee8f90 First version of XyzSection classes implemented - based on Section class 2014-03-24 14:48:23 +01:00
atleh
0e9cd5ff33 Some more logic added to the Section class 2014-03-24 10:05:22 +01:00
atleh
0d3f74986a Added a few tests 2014-03-21 15:40:44 +01:00
atleh
14507208d5 Added first version of Section class 2014-03-21 14:39:24 +01:00
Joakim Hove
5b51d306be Merge pull request #143 from AtleH/OPM-68 
Opm 68
 2014-03-21 00:46:21 +01:00
Joakim Hove
f84ec0bb3f Made injection and production control variables into property variables. 2014-03-21 00:07:23 +01:00
Joakim Hove
011eb8a2c6 camelCased property attributes in the production and injection properties structures. 2014-03-20 23:27:18 +01:00
Atle Haugan
62f2a16496 Fixed unit tests after rebase/merge 2014-03-20 10:56:28 +01:00
Atle Haugan
eae65c3da3 Added unit tests 2014-03-20 10:43:21 +01:00
Atle Haugan
cfea44d264 Fixed implementation of getXyzProperties() - now returning correct reference to original object. Unit test still missing. 2014-03-20 10:43:21 +01:00
Atle Haugan
3daaf827c9 Renamed getXyzProperties to getXyzPropertiesCopy. Added new getXyzProperties which currently does not work... 2014-03-20 10:36:57 +01:00
Atle Haugan
af784c6734 Enabled the remaining tests. 2014-03-20 10:31:21 +01:00
Atle Haugan
2058bb5789 Re-activated the old tests. 2014-03-20 10:26:44 +01:00
Atle Haugan
7358ac5d5a Added addProductionControl() method to the WellProductionProperties struct. Same for WellInjectionProperties. 2014-03-20 10:19:20 +01:00
Atle Haugan
87599c9841 Moved has/drop/addProductionControl to WellProductionProperties. The same for WellInjectionProperties. 2014-03-20 10:11:56 +01:00
Andreas Lauser
674d380006 fix a few pedantic GCC warnings due to superfluous semicolons 
these warnings are only only produced by GCC in its pedantic mode (and
possibly with -O3 in addition, but I haven't checked this...)
 2014-03-19 16:24:28 +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
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
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
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
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
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
Andreas Lauser
e6c0ff4546 TimeMap: Expose more data 
basically, we now can access the beginning of a timestep its length
and the total time passed since the beginning of life, the universe
and all the rest.
 2014-02-21 17:06:21 +01:00