Commit Graph

129 Commits

Author SHA1 Message Date
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
Andreas Lauser
a2edc063b8 some additional dimensions for keywords used by the Norne case 2014-01-15 15:44:38 +01:00
Andreas Lauser
f9fa6d428c add additional dimensions for the keywords required to convert autodiff's sim_fibo_ad 2014-01-15 15:44:38 +01:00
Andreas Lauser
7a3755926b Units: add 'Timestep' dimension
the motivation for this is the 'TSTEP' eclipse keyword.

the reason why this dimension is not simply called 'Time' is that in
eclipse, different keywords might use different units, e.g. one
keyword could use seconds, another could use years while a third uses
days. As an added bonus, the used time units may be different for
different scales but identical in others (e.g., for one keyword times
might be specified in 'days' for the metric as well as for the
labscale, but in 'days' and 'hours' for another second keyword.)
2014-01-15 12:52:12 +01:00
Andreas Lauser
6f721581bd add utility classes for some common keywords
the idea is to create a lightweight wrapper objects around
DeckKeywords which allow more convenient and more readable access to
the data. E.g. instead of

  std::vector outerColumnNames{"RV", "P", "BG", "MUG"};
  std::vector innerColumnNames{"P", "BG", "MUG"};
  Opm::FullTable pvtgTable(deck->getKeyword("PVTG"),
                           outerColumnNames, innerColumnNames);
  pvtgTable->getOuterTable()->getColumn(1);

one now better uses

  Opm::PvtgTable pvtgTable(deck->getKeyword("PVTG"));
  pvtgTable->getOuterTable()->getPressureColumn();

the idea for the other keywords is similar.
2014-01-15 12:52:12 +01:00
Andreas Lauser
234625758c add dimensions to PVTG 2014-01-15 12:52:12 +01:00
Andreas Lauser
5fd51021d9 fix JSON of the PVTO keyword
the magic word is "num_tables" and not "size". with the latter it only
parses the first record of the keyword. Stupid me!
2014-01-15 12:52:12 +01:00
Atle Haugan
ddd4563f97 Renamed from 'help' to 'description' for ParserKeyword and ParserItem 2014-01-10 10:57:35 +01:00
Atle Haugan
3271156f9d First pull request candidate with help support 2014-01-09 13:33:32 +01:00
Andreas Lauser
a88b47750e fix more (hopefully all) conversion factors
also, correct the dimension of the Rv item of the PVDG keyword which
is 1/Rs. Finally, the conversion factor for stock tank barrels to m^3
was off by a factor of 1000. (I suppose that liters instead of m^3
were assumed to be the SI unit in this case.)
2013-12-22 11:03:26 +01:00
Joakim Hove
c78c6d3e96 Merge remote-tracking branch 'upstream/master' into tablecollection-with-items 2013-12-19 13:56:54 +01:00
Joakim Hove
ae2260aa43 Table collection keywords PVTO and PVTG now have individual items: settings. 2013-12-19 13:54:51 +01:00
Andreas Lauser
3ae1890276 add dimensions to the PVTO keyword 2013-12-18 18:23:50 +01:00
Andreas Lauser
02afdf89da add dimensions to the SGOF keyword 2013-12-18 16:51:46 +01:00
Andreas Lauser
b7a67685c9 add dimensions for the PVDG table 2013-12-18 16:37:30 +01:00
Andreas Lauser
7096979a4b add a few missing dimensions
This makes getSIDouble*() work on PORO and PVTW.
2013-12-18 16:27:47 +01:00
Andreas Lauser
5f612a7e90 add missing PERM?? keywords 2013-12-18 15:35:55 +01:00
Andreas Lauser
6473a6eb69 add dimensions to PERMY and PERMZ 2013-12-18 15:28:12 +01:00
Joakim Hove
1d80ffaed8 Added test example for parsing DENSITY keyword. 2013-12-18 12:32:02 +01:00
Joakim Hove
70e66c4660 Enabled field keyword - removed ACTION:IGNORE_WARNING. 2013-12-18 12:30:45 +01:00
Joakim Hove
c1d7e87b71 Added dimension FlowVolume 2013-12-18 12:30:10 +01:00
Joakim Hove
b4a97f514e Added dimensions to SWOF keyword. 2013-12-17 16:39:58 +01:00
Joakim Hove
99542f6685 Added dimensions to GCONINJE / GCONPROD / WCONINJE / WCONINJH. 2013-12-16 17:23:46 +01:00
Joakim Hove
65c9882b53 Added dimensions to WCONHIST & WCONPROD. 2013-12-16 00:02:47 +01:00
Joakim Hove
800c4ff32e Added dimensions to TVDP* keyword family. 2013-12-15 22:38:57 +01:00