Joakim Hove
a135b7999f
Merge pull request #153 from joakim-hove/SPE9-keywords
...
Spe9 fix
2014-03-28 18:58:33 +01:00
Joakim Hove
5785d088ea
Added functionality in Completion class to adjust I and J to wellHead value if they have been defaulted (i.e. have value -1). This is unfortunate because we loose quite a lot of const correctness.
2014-03-28 18:56:21 +01:00
osae
ba5a793525
Two new keywords: RVVD and TOPS
2014-03-28 15:13:58 +01:00
Joakim Hove
a422a4929b
Added keyword configuration for keywords used in SPE9 example.
2014-03-27 14:55:03 +01:00
Joakim Hove
a141d7722b
Added missing #include <iostream> in two tests.
2014-03-25 12:34:48 +01:00
atleh
ec22c39f5c
Minor adjustments in Section[Tests], Schedule and KeywordContainerTests
2014-03-25 09:26:43 +01:00
atleh
d761081d96
Commented out failing assert in KeywordContainerTests
2014-03-25 07:29:51 +01:00
atleh
73df57b920
Added some iterator support in KeywordContainer and Section. Not finished.
2014-03-24 18:55:35 +01:00
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
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
