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

692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Joakim Hove
137eb5b6e1 Added bitmask status flag to keep track of which controls have been set. 2014-01-30 16:44:21 +01:00
Joakim Hove
dbb0272d12 Changed ControlEnums to become 2^n 2014-01-30 16:44:21 +01:00
Joakim Hove
e42234b17a Added Well::Producercontrolmode 2014-01-30 16:44:21 +01:00
Joakim Hove
d0da1275c4 Changed name of item: ControlMode -> CMODE 2014-01-30 16:44:20 +01:00
Joakim Hove
5dd6865838 Added RESV target to Well. 2014-01-30 16:44:20 +01:00
Joakim Hove
7f58de5b3e Have added liquidRate setting from Schedule.cpp 2014-01-30 16:44:20 +01:00
Joakim Hove
a83d994494 Added well->liquidRate() from WCONPROD. 2014-01-30 16:44:20 +01:00
Atle Haugan
c20c3baf6f Fixed algorithm for concatenating strings 2014-01-30 15:18:34 +01:00
Atle Haugan
1dd448b178 Merge branch 'master' into specialkeywords 
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.hpp
 2014-01-30 15:05:01 +01:00
Atle Haugan
825e976566 New version based on feedback from code review 2014-01-29 19:39:33 +01:00
Joakim Hove
46bd341808 Setting injectorType from Schedule class. 2014-01-29 16:42:55 +01:00
Joakim Hove
0f707b7498 Keeping track of well OPEN|SHUT|STOP status from WCONxxxx keywords. 2014-01-29 15:55:02 +01:00
Joakim Hove
0457525b10 Changed name of item to STATUS. 2014-01-29 15:54:15 +01:00
Joakim Hove
db26d6cf93 Added status flag as well property. 2014-01-29 15:34:33 +01:00
Joakim Hove
86e8cc3585 Added WellCommon namespace with StatusEnum. 2014-01-29 15:10:52 +01:00
Joakim Hove
49604cf631 Added injectorControlMode to Well class. 2014-01-29 13:33:28 +01:00
Joakim Hove
c60ce712ea Added ControlMode enum to the WellInjector namespace. 2014-01-29 13:21:04 +01:00
Joakim Hove
65e87189e4 Changed namespace InjectorType -> WellInjector. 2014-01-29 13:11:35 +01:00
Kristian Flikka
37084e991d Shifting WELSPECS and COMPDAT i,j,k indices down one, to go from 0 2014-01-29 11:48:02 +01:00
Joakim Hove
3f62b3c777 Updated numerical test values for connection factor; due to SI dimension. 2014-01-29 10:39:55 +01:00
Kristian Flikka
3c4f12f3c7 Added dimension to connection factor / well index in json config. Updated fetching to use SI value 2014-01-28 21:29:35 +01:00
Kristian Flikka
efcfad657e Merge pull request #102 from joakim-hove/well-injection-phase 
Well injection phase
 2014-01-28 11:37:49 -08:00
Joakim Hove
b0545fab0a Merge pull request #100 from flikka/add-to-completion 
Added skinFactor and diameter to Completion
 2014-01-28 07:04:40 -08:00