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

715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Flikka
bd564ad944 Added WGRUPCON, and simple YES/NO handling in Schedule 2014-02-17 16:10:31 +01:00
Joakim Hove
3a3e40efb1 Merge pull request #125 from flikka/fix-treefromschedule-bug 
Fix treefromschedule bug
 2014-02-14 13:35:45 +01:00
Joakim Hove
c61f71f552 Merge pull request #124 from flikka/add-grouptree-child-iter-test 
Add grouptree child iter test
 2014-02-14 13:35:30 +01:00
Joakim Hove
99cbff8f3c Merge pull request #123 from flikka/constify-group-iterator 
Changed the begin and end iterator functions of GroupTreeNode into const...
 2014-02-14 13:35:21 +01:00
Kristian Flikka
56c3dd2085 Make sure that the tree is updated correctly after reading WELSPECS 2014-02-14 12:36:26 +01:00
Kristian Flikka
46b3a364d8 Added test to run through the iter functionality in GroupTreeNode 2014-02-14 11:38:49 +01:00
Kristian Flikka
dea586829c Changed the begin and end iterator functions of GroupTreeNode into const_iterators 2014-02-14 09:58:06 +01:00
Andreas Lauser
c972e6c0c1 GconinjeWrapper: return raw instead of SI rates 
the wrapper could be a bit more sophisticated and do the conversion
internally, but the new wells management code seems to ignore the
wrapper anyway, so there is no real point in investing time into that
(yet).
 2014-02-13 14:23:56 +01:00
Joakim Hove
b386b0b944 Merge pull request #119 from flikka/add-producergroup-status 
Add producergroup status to Group object
 2014-02-12 14:35:36 +01:00
Joakim Hove
452da21fc4 Merge pull request #118 from flikka/getnodes-grouptree 
Added getNodes to get a vector of the group nodes in the tree
 2014-02-12 14:34:57 +01:00
Kristian Flikka
720cd21b0e Merged from upstream/master 2014-02-12 10:13:49 +01:00
Kristian Flikka
e105b0b3c5 Added missing files from the Utility folder to the CMakeLists file. 2014-02-12 08:53:53 +01:00
Joakim Hove
e31873f560 Merge pull request #117 from andlaus/unit_system_cleanups 
Unit system cleanups
 2014-02-11 13:13:39 +01:00
Andreas Lauser
03d6e9a20b correct the context dependent rates in the schedule code 2014-02-11 12:45:44 +01:00
Andreas Lauser
849bc7df93 units: introduce a "ContextDependent" dimension 
this is meant for those nasty keywords where the dimension of an entry
depends on a user-defined value of some field of a (potentially
different) keyword. One example for this are the surface rates of the
produced fluids for the .CON(INJ|PROD).* keywords which exhibit
different units depending on whether the user choses to control for
the surface gas or the liquid rate.

the approach taken in this patch is to convert all numbers to NaN if
the unit is queried in SI (via item->getSIDouble()). It might be more
desireable to throw an exception in this case, but this approach would
be more elaborate and NaNs should be quickly noticeable by the users
of this code.

I tried to adapt all implemented keywords, but it's quite likely that
I missed some...
 2014-02-11 12:45:44 +01:00
Andreas Lauser
50f2288148 units: rename "m" to "Mass" 2014-02-11 12:45:44 +01:00
Andreas Lauser
690f26c223 units: rename "Rho" to "Density" 2014-02-11 12:45:43 +01:00
Andreas Lauser
ae73345763 units: rename "K" to "Permeability" 2014-02-11 12:45:43 +01:00
Andreas Lauser
ac60eed7d6 units: rename "1/Rs to "OilDissolutionFactor" and "Rs to "GasDissolutionFactor" 2014-02-11 12:45:43 +01:00
Andreas Lauser
bc4d467322 units replace: "mu" by "Viscosity" 2014-02-11 12:45:43 +01:00
Andreas Lauser
19d89d44cd units: Replace "P" by "Pressure" 2014-02-11 12:45:43 +01:00
Andreas Lauser
0129a382a8 units: Replace "L" by "Length" 2014-02-11 12:45:43 +01:00
Andreas Lauser
6a97d78cc6 units: replace "t" with "Time" 
this makes things more explicit and more readable
 2014-02-11 12:45:41 +01:00
Andreas Lauser
44f310bfbf units: substitute "FlowVolume" by "LiquidVolume" and "GasVolume" 
because the units for them are different in the "Field" unit system.
 2014-02-11 12:45:05 +01:00
Kristian Flikka
1988221d41 Added const to a couple of get-type methods 2014-02-11 09:32:34 +01:00
Kristian Flikka
f33b05248b Merge pull request #113 from blattms/make-arbitrary-sibling-possible 
[PATCH] [cmake] Makes arbitrary build subdirectories possible.
 2014-02-10 15:45:45 +01:00
Kristian Flikka
08ec94e15c Added setting of the injection/production status of group 2014-02-10 15:43:37 +01:00
Kristian Flikka
41a1e889b8 Added isProducerGroup to Group class, need this in opm-core 2014-02-10 15:43:37 +01:00
Kristian Flikka
9363f39cb9 Added getNodes to get a vector of the group nodes in the tree 2014-02-10 12:18:42 +01:00
Joakim Hove
e4c60e6aa1 Merge pull request #112 from andlaus/another_typo 
fix another missibility typo
 2014-02-06 22:25:51 +01:00
Joakim Hove
1447a8b05e Merge pull request #115 from andlaus/add_endpoint_scaling_stuff 
add keywords used by the opm-core endpoint scaling code
 2014-02-06 21:13:05 +01:00
Joakim Hove
d39bf25cb2 Merge pull request #116 from andlaus/remove_r300_column_in_rock 
remove the "MATRIX_COMPRESSIBILITY" from ROCK
 2014-02-06 21:10:57 +01:00
Andreas Lauser
b26656e741 remove the "MATRIX_COMPRESSIBILITY" from ROCK 
This field is specific to the Eclipse 300 geomechanics module. IMHO,
either all fields for the eclipse 300 geomechanics module should be
added or none. Adapting the table code to "partially defined" keywords
is a pain I'd rather avoid!
 2014-02-06 18:45:22 +01:00
Andreas Lauser
c41be6c91a add keywords used by the opm-core endpoint scaling code 
plus some wrappers/tables
 2014-02-06 18:44:10 +01:00
Kristian Flikka
15682a71df Merge pull request #114 from joakim-hove/valgrind 
Valgrind
 2014-02-06 16:39:30 +01:00
Joakim Hove
ae9b57409c Made unit system a shared_ptr to avoid memleak in test. 2014-02-06 15:45:23 +01:00
Joakim Hove
b2d4363fae Added explicit delete in keyword test code. 2014-02-06 15:35:18 +01:00
Joakim Hove
25221c78ad Changed order of elements in comparison: To avoid unitialized variable warning. 2014-02-06 15:08:02 +01:00
Joakim Hove
1943a05b08 Changed order of variables in comparison: avoid warning of uninitialised data. 2014-02-06 15:05:24 +01:00
Joakim Hove
e17f03b8a0 Merge remote-tracking branch 'akva2/run_tests_through_valgrind' into valgrind 2014-02-06 14:30:01 +01:00
Markus Blatt
52da1a7838 [PATCH] [cmake] Makes arbitrary build subdirectories possible. 
Instead of guessing the suffix or subdir of the build directory,
we now simply compare PROJECT_{BINARY,SOURCE]_DIR to detect it.
By this e.g. opm-core/opm-parallel is a possible build directory, too.
 2014-02-06 11:16:00 +01:00
Andreas Lauser
3a73a2c2b5 fix another missibility typo 
this one was not fixed in @bska's PR because my branch for ROCKTAB was
not merged back then. /me is confused by too many things going on at
once...
 2014-02-06 00:21:01 +01:00
Joakim Hove
c38e079a6d Merge pull request #111 from andlaus/better_rocktab 
add a utility class for the ROCKTAB keyword
 2014-02-05 15:47:42 +01:00
Andreas Lauser
d5bedde8a7 add a utility class to handle ROCK tables 
So far, this only considers Eclipse R100...
 2014-02-05 15:20:56 +01:00
Andreas Lauser
6eab8d62b1 add a utility class for the ROCKTAB keyword 
this one is a bit more complicated than a plain SimpleTable as the
number of columns depends on the deck. (to be precise, it depends on
the presence of the RKTRMDIR keyword which is also added in this
patch.)
 2014-02-05 15:04:04 +01:00
Bård Skaflestad
9bfd5b92d7 Fix spelling. 
The connection "strength" (conduction factor) is called
"transmissibility" (double 's'), not "transmiscibility" ('sc').
 2014-02-05 13:39:28 +01:00
Kristian Flikka
9db42f6eb3 Added support for WELOPEN in the Schedule class, NOT support specific completions, only the well 2014-02-04 16:12:49 +01:00
Joakim Hove
0d35b7d3f6 Merge pull request #101 from AtleH/specialkeywords 
Specialkeywords
 2014-01-31 05:33:25 -08:00
Joakim Hove
bb444b5139 Added flag injectionControls to keep track of available injection controls. 2014-01-30 16:44:21 +01:00
Joakim Hove
49ee4ed1ed Added addProductionControl() and dropproductioncontrol() to Schedule. 2014-01-30 16:44:21 +01:00