OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,280 Commits 18 Branches 75 Tags 73 MiB
00dc724aba
Commit Graph

1280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
90562916b5 Merge pull request #230 from andlaus/remove_dimensionString_from_integer_grid_properties 
Grid properties: get rid of the dimension string for integer properties
 2014-06-10 06:43:37 +02:00
osae
de09df3bed Correct dimension is 'Pressure'. 2014-06-05 16:21:59 +02:00
osae
6cb0aad295 Keywords for capillary pressure scaling. 
Four new keywords PCW/PCG/IPCW/IPCG and fixing SWATINIT.
 2014-06-05 15:54:15 +02:00
Joakim Hove
c7987c987e Merge pull request #236 from akva2/no_references_for_you 
fixed: keep a copy instead of a reference
 2014-06-05 12:59:02 +02:00
Arne Morten Kvarving
d85782d9f5 fixed: keep a copy instead of a reference 
storing string references are not a good idea, since temporaries are
often used. fixes RawRecordTest on my box
 2014-06-05 11:48:17 +02:00
Andreas Lauser
fc8adb8453 add definition for the ROCKTAB keyword 2014-06-05 10:46:38 +02:00
Andreas Lauser
6f290a750d Grid properties: get rid of the dimension string for integer properties 
this uses a small amount of template magic, to automatically change
the API of the GridProperty class depending on wheter it is
instantiated for double or for int.
 2014-06-05 10:12:23 +02:00
Kristian Flikka
ac5dc9e6aa Added missing headers, to fix install-based build of opm-polymer 2014-06-04 14:22:09 +02:00
Andreas Lauser
52c5d3fbcb make GCC 4.4 happy 
there was a "typename" outside of a template, but because the
syntactic sugar is created by the Boost unit testing framework, it was
not clear wheter it was a template or not.

Also, some harmless warnings have been fixed. These only appeared
because a few variables have recently been converted from int to
size_t...
 2014-06-03 22:51:03 +02:00
Andreas Lauser
7c53febf57 fix the ADD and EQUALS grid property modifiers 2014-06-03 22:42:23 +02:00
Joakim Hove
c7429dbb23 Fixed bug: intGridProperties -> doubleGridProperties 2014-06-03 22:42:23 +02:00
Joakim Hove
491ccd9a8d Added #include <cstddef> to Box.hpp 2014-06-03 22:42:23 +02:00
Joakim Hove
7a16646cd8 Added throw when trying to load from unsupported keyword. 2014-06-03 22:42:23 +02:00
Joakim Hove
052fb7afad Fix stupid typo 2014-06-03 22:42:23 +02:00
Joakim Hove
1fa84d1923 Removed unused method argument. 2014-06-03 22:42:23 +02:00
Joakim Hove
3da0c228b9 Using size_t instead of int for EclipseGrid::getN? 2014-06-03 22:42:23 +02:00
Joakim Hove
b52ffe5a4a Avoid use of {} in init to satisfy clang. 2014-06-03 22:42:23 +02:00
Joakim Hove
73d88280a5 Renamed getXXXProperty -> getXXXGridProperty 2014-06-03 22:42:23 +02:00
Joakim Hove
40b15c59b3 Added const qualifier to EclipseState::getxxxProperty() methods. 2014-06-03 22:42:23 +02:00
Joakim Hove
5e56f16369 Added double properties for e.g. PERM and PORO to the EclipseState 2014-06-03 22:42:23 +02:00
Joakim Hove
7269924543 Added name() property to section objects. 2014-06-03 22:42:23 +02:00
Joakim Hove
6b29eb5176 Supporting the ADD and EQUALS keywords. 2014-06-03 22:42:23 +02:00
Joakim Hove
8137331d5d Added new keyword PVTNUM 2014-06-03 22:42:23 +02:00
Joakim Hove
eb9e11849e Added support for MULTIPLY keyword. 2014-06-03 22:42:23 +02:00
Joakim Hove
6301fd1ad7 EclipseState now handles COPY keyword. 2014-06-03 22:42:23 +02:00
Joakim Hove
bd1c756e30 Added copyFrom() property to GridProperty 2014-06-03 22:42:23 +02:00
Joakim Hove
22ed38b319 Added iterators begin() and end() to DeckKeyword class. 2014-06-03 22:42:23 +02:00
Joakim Hove
5c04cd4540 Basic BOX support when reading integer properties. 2014-06-03 22:42:23 +02:00
Joakim Hove
f5c5722508 ERT-656: Changed GridProperty to take (nx,ny,nz) instead of volume. 2014-06-03 22:42:23 +02:00
Joakim Hove
1d0e3c9772 Added BoxManager() to keep track of the currently active input box. 2014-06-03 22:42:23 +02:00
Joakim Hove
2a5ec9aac9 Added Box::equal() comparison function. 2014-06-03 22:42:23 +02:00
Joakim Hove
74f66a5f3c Added constructor for sub box. 2014-06-03 22:42:23 +02:00
Joakim Hove
e820eadfeb Added Box() class to book keep the indices in a box. 2014-06-03 22:42:23 +02:00
Andreas Lauser
ad1dfab8d7 fix spurious GCC warnings 
The root cause are pretty (too?) strict flags w.r.t. compiler
warnings. In this case, the offenders are "-Wmissing-declarations" and
"-Wtype-limits".
 2014-06-02 13:01:56 +02:00
Joakim Hove
c55cb6cb73 Fixed typo in item name 2014-05-30 23:41:25 +02:00
Joakim Hove
e6aca19601 Changed name of items in PVCDO keyword. 2014-05-30 15:28:26 +02:00
Joakim Hove
adab017f19 Merge pull request #222 from joakim-hove/fix-PVCDO 
Changed name of oil compressibility item.
 2014-05-27 13:59:07 +02:00
Joakim Hove
97f42219e8 Changed name of oil compressibility item. 2014-05-27 13:57:36 +02:00
Bård Skaflestad
317192ca63 Support 'SOIL' keyword 
This commit introduces support for the SOIL (initial oil saturation)
keyword.  This is similar to existing keywords 'SWAT' and 'SGAS' and
needed to input some decks.
 2014-05-26 18:57:45 +02:00
Andreas Lauser
d71cb1aa51 parser integration test: use std::istream as a template argument for std::shared_ptr 
gcc 4.4 has problems with such implicit conversions...
 2014-05-20 13:27:37 +02:00
Andreas Lauser
0d92cd43b0 export possibility to parse an arbitrary std::istream 
this has the potential to reduce the memory requirements of the parser
for opm-benchmarks considerably and is quite easy to add since
internally all parsing happend on istreams anyway...

The parser integration test has been extended to test the new method
as well as `parseString()` which was omitted previously. (I wonder who
introduced this without changing the test. ;)
 2014-05-20 12:12:12 +02:00
Joakim Hove
4316a6fa54 Merge pull request #215 from akva2/fix_linking 
fixed: linking due to several specializations being generated
 2014-05-19 13:58:59 +02:00
Arne Morten Kvarving
c1a3cc5e2f fixed: linking due to several specializations being generated 2014-05-19 13:43:05 +02:00
Arne Morten Kvarving
463eae9b07 fixed: don't mix member names and function parameters 2014-05-19 13:15:09 +02:00
Joakim Hove
e5c61b2816 Merge pull request #207 from joakim-hove/gridproperties 
Gridproperties
 2014-05-19 13:01:32 +02:00
Joakim Hove
b660cc1b6a Merge pull request #213 from atgeirr/conversion-factors 
Conversion factors
 2014-05-19 12:18:34 +02:00
Atgeirr Flø Rasmussen
61d1c1a2cf Make conversion factors more readable. 
The using directives will put a lot into the Field and Metric
namespaces, but it should not be problematic.
 2014-05-19 12:10:11 +02:00
Atgeirr Flø Rasmussen
799a52e8bc Embedded unit system from opm-core to ensure proper conversion factors. 2014-05-19 12:10:11 +02:00
Joakim Hove
e72a0da8b1 Added GridProrpties to EclipseState. 2014-05-16 15:58:04 +02:00
Joakim Hove
ce0dc92822 Added grid properties container. 2014-05-16 15:57:47 +02:00