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

153 Commits

Author SHA1 Message Date
Joakim Hove
c84857ff56 Minor syntax fix in JSON config. 2014-03-18 08:20:51 +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
Joakim Hove
2259d32258 Added two new keywords. 2014-03-04 16:47:00 +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
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
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
4a2ab048e9 fix the definition of the START keyword 
this one had the same problems as DATES
 2014-02-21 17:06:21 +01:00
Andreas Lauser
6b70634f94 fix the "DATES" keyword 
The time of the day field was missing. The defaults for it are those
of E100.
 2014-02-21 17:06:21 +01:00
Atle Haugan
280e722501 Forgot to add new JSON file for PATHS keyword 2014-02-21 12:57:26 +01:00
Kristian Flikka
bd564ad944 Added WGRUPCON, and simple YES/NO handling in Schedule 2014-02-17 16:10:31 +01:00
Atle Haugan
ed17058ad3 Renamed FLOAT to DOUBLE in JSON files, tests and some code using the enum 2014-02-17 15:02:40 +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
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
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
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
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
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
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
d0da1275c4 Changed name of item: ControlMode -> CMODE 2014-01-30 16:44:20 +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
0457525b10 Changed name of item to STATUS. 2014-01-29 15:54:15 +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
Atle Haugan
cd3d4f9337 First cut: TITLE keyword now being parsed correctly. 2014-01-28 10:01:11 +01:00
Joakim Hove
dee5509108 Added default value for BHPLimit/target. 2014-01-27 18:22:57 +01:00
Atle Haugan
620774c3a4 Added missing files 2014-01-24 12:05:03 +01:00
Atle Haugan
ef11a2331f OPM-17: First attempt to handle END and ENDINC keywords 2014-01-24 10:01:17 +01:00
Kristian Flikka
a7d51c387e Merged upstream/master 2014-01-21 10:14:16 +01:00
Kristian Flikka
bd74a32c89 Added dimension to WELSPECS REF_DEPT, updated usage to query for SI 2014-01-21 10:10:05 +01:00
Andreas Lauser
a0785e37dd add dimension to the GCONTINJE keyword 
these are required by the WellsManager for Norne
 2014-01-17 11:37:29 +01:00
Andreas Lauser
9332f0edd1 PVTO: Add unit test and make the function names of the table class consistent with PVTG 2014-01-16 15:22:33 +01:00
Andreas Lauser
1c39df2d57 improve unit test for PVTG 
now the data is parsed from a string specified in the source file
instead of a separate file, the PvtgTable utility class is tested and
the order of the fields in the JSON definition of PVTG is the same as
for that of PVTO.
 2014-01-16 13:23:13 +01:00