Commit Graph

71 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
f0ae5db131 opm-parser adoption of Deck automatic ownership
Since the Deck* family of classes have changed their interfaces to no
longer use shared_ptr, a lot of code broke. This patch fixes all
problems in tests, other signatures and accesses to now use the new Deck
interfaces.
2016-02-18 13:27:24 +01:00
Joakim Hove
31c69e6702 Using unique_ptr in EclipseGrid. 2016-02-03 16:18:31 +01:00
Jørgen Kvalsvik
4b98943665 Replaces unecessary header includes with fwd decls
Every header is self-contained and includes only what it must to
function, relying on users include what they need in source files,
adopting a pay-what-you-use model (in particular for internal
dependencies).
2016-01-26 13:23:22 +01:00
Jørgen Kvalsvik
04900a4bb6 ParserKeywords.hpp -> ParserKeywordsX.hpp
To reduce compiler stress and be more explicit w.r.t. dependencies, all
files now includes only the keywords they need, instead of the
collection of all files.
2016-01-21 09:25:58 +01:00
Joakim Hove
a9477d057e Added function get cellDxDyDz 2016-01-08 15:36:59 +01:00
Atgeirr Flø Rasmussen
d87e20578c Change return type from tuple to array for getCellCenter(). 2015-11-24 14:25:37 +01:00
Liu Ming
b0995cfc0b add PinchMode from string function. 2015-10-09 17:23:37 +08:00
Liu Ming
98f2659c84 add PinchMode to instead of string. 2015-10-09 16:28:53 +08:00
Liu Ming
7181255d6d Add support for PINCH item 4 and 5. 2015-10-09 10:29:33 +08:00
Joakim Hove
6362bd2eb1 Fixed typo. 2015-07-28 09:27:05 +02:00
Joakim Hove
847fc3ba6f Added EclipseGrid::cellThickNess() method 2015-07-27 17:57:34 +02:00
Joakim Hove
d7406273c5 Enforce bitwise equality in ZCORN with full TOPS. 2015-07-24 09:32:54 +02:00
Joakim Hove
679ef35d0b Updated code to use compiled defaults 2015-06-08 11:29:21 +02:00
Fredrik Gundersen
bb97d3f7bb Fix parameter name 2015-05-22 22:58:39 +02:00
Fredrik Gundersen
48699b569a OPM-203 Added supoort for converting of Metric grid values 2015-05-21 12:35:32 +02:00
Joakim Hove
08a7132db8 Merge pull request #398 from joakim-hove/singleton-example
Singleton Logger
2015-03-09 08:08:12 +01:00
Joakim Hove
9fb229ccd7 Replaced references to logger with OpmLog::addMessage() 2015-03-04 22:14:31 +01:00
Joakim Hove
3a60605d99 Removed most of the functionality from CounterLog 2015-03-04 22:12:53 +01:00
Joakim Hove
25bff6480d Renamed MessageCounter -> CounterLog 2015-03-04 22:12:52 +01:00
Joakim Hove
d3277543ec Renamed existing Logger -> MessageCounter 2015-03-04 22:09:54 +01:00
chflo
f3b427121e OPM-157: Added method getGlobalIndex to EclipseGrid, needed from opm-core EclipseWriter 2015-03-04 14:09:43 +01:00
Fredrik Gundersen
ce5eb28c92 Fix of test after merge of pull request #416 2015-02-12 11:31:09 +01:00
Liu Ming
8f61bcd59a Add MinpvMode namespace and remove the whitespace. 2015-02-12 16:00:31 +08:00
Liu Ming
1dfb337a76 Remove isMinpvActive() function, use getMinpvMode() instead. 2015-02-10 16:45:48 +08:00
Liu Ming
785fa97c80 Merge remote-tracking branch 'remotes/opm/master' into add_minpvf 2015-02-09 09:52:40 +08:00
Liu Ming
15164b0e7f Add keyword MINPVF. 2015-02-09 09:52:11 +08:00
Atgeirr Flø Rasmussen
ff80db33ba Improved cartesian convenience constructor.
It now can take cell size arguments, and it always creates a complete grid.
2015-01-27 09:54:10 +01:00
Joakim Hove
e432a1c75a Added getCellDepth() method to EclipseGrid 2015-01-26 12:26:23 +01:00
Joakim Hove
b585655a5c Changes in the log class:
1. Moved to from eclipse/Parser -> eclipse/Log
 2. Renamed ParserLog -> OpmLog
2014-12-15 17:36:10 +01:00
Andreas Lauser
ea38a25af4 remove all trailing white space
this is just the result of

```
find -iname "*.[ch]pp" | xargs sed -i "s/ *$//"
find opm/parser/share/keywords -type f |  xargs sed -i "s/ *$//"
```

so if it causes conflicts with other patches, the others should get
priority. The rationale behind this patch is that some people tell
their editor to remove white space which leads to larger than
necessary patches...
2014-12-08 16:34:28 +01:00
Joakim Hove
b2fbbfc8a7 Added small method to check if cell is active. 2014-11-16 20:07:03 +01:00
Joakim Hove
24cb9944c6 EclipseGrid - check content of c_ptr before use
This commit contains quite large changes to the EclipseGrid. The main
functional change is that the access to the ecl_grid_type pointer is
protected. In addition there are 'white space' changes due to methods
moving around and some methods have been marked static.
2014-11-10 00:14:55 +01:00
Joakim Hove
39bca17ce0 Split EclipseGrid in dimensions and cell info.
In many cases the only required information in an EclipseGrid instance
is the cartesian dimensions. To facilitate simpler testing - and not
have to create a full dummy grid the dimensions have been internalized
as a separate nx,ny,nz triplet. With this commit it is possible to
instantiate a grid with only dimensions, and no underlying ecl_grid_type
pointer.
2014-11-09 23:31:53 +01:00
Joakim Hove
e0cf8cebde Added postprocessor properties to scatter from top.
For the petrophysical properties PERM? and PORO only the top layer must
be specified, cells further down can be copied from the layer
above. This functionality is implemented with a GridProperty
postprocessor.
2014-10-10 15:48:57 +02:00
Joakim Hove
82e8d1a56b Added static_cast<long long> before calling std::to_string() 2014-10-10 15:24:26 +02:00
Andreas Lauser
f51016db57 EclipseState: significantly extend usage of the new logging facility
in the process quite a few exceptions have been converted into log
messages.
2014-10-07 15:39:15 +02:00
Joakim Hove
f88fd65937 Implemented PINCH and MINPV as Value<double> 2014-09-04 22:10:16 +02:00
Atgeirr Flø Rasmussen
da50b320fa Add MINPV features to EclipseGrid class. 2014-08-25 11:15:39 +02:00
Atgeirr Flø Rasmussen
52c7a4bc3f Remove section-using EclipseGrid constructors.
Also:
 - Simplify implementation (no templates).
 - Update tests.
2014-08-22 12:12:37 +02:00
Atgeirr Flø Rasmussen
eaea25772e Create pointer-to-const objects.
Older gcc (4.4) does not allow conversion of shared_ptr<Foo> to
shared_ptr<const Foo>. Pointed out by @bska.
2014-08-21 15:13:50 +02:00
Atgeirr Flø Rasmussen
4253fb151b Allow DIMENS to be used as well as SPECGRID when no sections are found.
Also refactor DIMENS/SPECGRID to dimension code as a function.
2014-08-21 13:14:03 +02:00
Atgeirr Flø Rasmussen
d3a2db6867 Add new constructor taking a Deck.
The new constructor allows us to create EclipseGrid objects from decks
that do not have a strict sectioned structure.

Also modify some implementation details. Many methods are now templates,
and can take Deck or Section objects (they have the same
hasKeyword/getKeyword interface).
2014-08-21 10:30:47 +02:00
Atgeirr Flø Rasmussen
577f8a7088 Name magic constant (invalidThickness). 2014-08-20 13:38:46 +02:00
Atgeirr Flø Rasmussen
f831637a5f Follow opm-parser naming conventions for data members. 2014-08-20 13:05:21 +02:00
Atgeirr Flø Rasmussen
03a74ade2d Make getPinchThresholdThickness() throw if isPinchActive() is false. 2014-08-20 09:34:44 +02:00
Atgeirr Flø Rasmussen
4529cbe468 Add isPinchActive() and getPinchThresholdThickness() members.
Now reading the optional PINCH keyword from the GRID section.
2014-08-20 09:23:32 +02:00
Joakim Hove
c06e1bebbf Added new EclipseGrid constructor
The new EclipseGrid constructor EclipseGrid(nx,ny,nz , GridSection)
allows the construction of a GRID without the RUNSPEC section.
2014-08-19 08:25:10 +02:00
Joakim Hove
8ff5a91a4f Added constructor based on existing ecl_grid_type pointer 2014-07-17 21:20:09 +02:00
Joakim Hove
1737afb823 Added bool flag to ert function ecl_grid_compare() 2014-07-17 21:19:30 +02:00
Joakim Hove
e041cf337c Added c_ptr() method to EclipseGrid 2014-07-16 12:29:31 +02:00