Commit Graph

85 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
98e3bbcf1d Changes to make the code compile and run. 2018-06-29 15:57:15 +02:00
Joakim Hove
976bfdab35 Use opm-internal algorithm for volume calculation 2018-06-29 15:57:15 +02:00
Steinar Foss
d9ffb579e1 Removed MessageContainer. OpmLog used instead.
...

...

...

GenerateKeywords.cmake changed.

ParserContext.handleerror takes only two args.

Schedule: removed all MessageContainer.

...

...

...

GridProperties: removed MessageContiner.

...

Eclipse3DProperties: removed MessageContainer.

...

TabelManager:removed MessageContainer.

...

.nnn.

...

...

...

...

...

...

...

...

...

...

...

...

...
2018-03-26 10:15:18 +02:00
Joakim Hove
009e00ed61 Added EclipseGrid method to get corner positions. 2017-06-23 17:05:11 +02:00
Joakim Hove
494cb74124 Limited support for cylindrical grids.
For cylindrical grids based on the keyword set DRV, DTHETAV, DZV and
TOPS the EclipseGrid implementation will create a cornerpoint
representation of the grid.
2017-06-08 08:26:43 +02:00
Joakim Hove
fbb2ce73cd Added circle property to EclipseGrid 2017-06-08 07:01:25 +02:00
Joakim Hove
eb283a1434 ZCORN adjustments considers cell-cell relation. 2016-12-04 22:56:54 +01:00
Joakim Hove
c022809073 Added functionality to "fix" ZCORN problems. 2016-11-23 14:59:48 +01:00
Jørgen Kvalsvik
1906bf4d16 Make EclipseGrid no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
9aee6e7708 Return identity when compressing active-only cells. 2016-09-12 21:14:07 +02:00
Joakim Hove
74e1aff9dc Compress std::vector<T> and GridPropery. 2016-09-08 09:14:30 +02:00
Joakim Hove
56077998e0 Added EclipseGrid::getGlobalIndex( activeIndex ) 2016-09-08 09:14:29 +02:00
Joakim Hove
15588fe7ca Added EclipseGrid::allActive() convenience method. 2016-09-08 09:14:28 +02:00
Joakim Hove
489602c51c EclipseGrid: default copy and move constructors. 2016-09-08 09:14:27 +02:00
Joakim Hove
c2b4ee687f Added class ZcornMapper. 2016-09-07 11:08:31 +02:00
Joakim Hove
4af4c40dc6 Added EclipseGrid processed copy. 2016-09-07 11:07:51 +02:00
Jørgen Kvalsvik
bb2d0c5324 Active cell cache with automatic storage
Simplify slightly by using automatic memory management, rather than
heap-alloc.
2016-08-25 13:51:46 +02:00
Joakim Hove
1c0716aefd EclipseGrid::activeMap( ) will cache the results. 2016-08-25 11:50:09 +02:00
Joakim Hove
f16283e367 Removed the EclipseGrid.fwriteEGRID() method. 2016-07-12 14:28:57 +02:00
Joakim Hove
20bbeeda56 Added EclipseGrid::getActiveMap(). 2016-06-30 08:32:45 +02:00
Pål Grønås Drange
49f3356934 Removed getDims() and disable this EclipseGrid
* Removed method getDims since getNXYZ already exists
* Now we throw if EclipseGrid get lean deck
* Removed tests for assertCellInfo and hasCellInfo
* Fixed ResinsightTests to use GridDims
2016-06-21 14:56:34 +02:00
Pål Grønås Drange
1fada954e2 Merge and rebase fixup 2016-06-21 13:13:00 +02:00
Pål Grønås Drange
ce4bbe8b9f Rewrote EclipseGrid to use std::array when 3D 2016-06-21 12:39:15 +02:00
Pål Grønås Drange
55e950a9a4 Fixed GridDims after rebase, removed ERT knowledge in GridDims 2016-06-21 12:34:57 +02:00
Pål Grønås Drange
12b1815f7b initial griddims 2016-06-21 12:34:11 +02:00
Joakim Hove
a7e3d50e53 Cornerpoint based EclipseGrid constructor. 2016-06-16 22:24:39 +02:00
Joakim Hove
152069351c Added EclipseGrid::activeIndex( ) NB: throws!! 2016-05-27 15:14:40 +02:00
Joakim Hove
0792121bec EclipseGrid copy constructor.
Removed EclipseGrid::EclipseGrid( ecl_grid_type * )
2016-05-27 15:14:39 +02:00
Jørgen Kvalsvik
1d5ae5ea55 EclipseGrid::getNXYZ which returns xyz as array 2016-05-09 14:55:24 +02:00
Pål Grønås Drange
63e452167c Introduce deckptr-less EclipseState and EclipseGrid 2016-05-03 13:22:56 +02:00
Joakim Hove
54579155a1 Merge pull request #782 from jokva/grid-properties-std-function
Refactor GridPropertyInitializers to use std::function
2016-04-28 09:02:25 +02:00
Pål Grønås Drange
e1ab313cb7 Added method getIJK in EclipseGrid 2016-04-27 12:55:14 +02:00
Jørgen Kvalsvik
eb1182da27 Moved temp init into GridProperty
The GridPropertyInitializers files now really only held the temperature
initialisation function, and has been merged into GridProperty.
2016-04-27 11:51:45 +02:00
Liu Ming
c42cfafc90 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
	opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
2016-04-22 14:53:16 +08:00
Pål Grønås Drange
444f74642c Refactored EclipseState.getEclipseGrid to getInputGrid 2016-04-19 16:47:05 +02:00
Pål Grønås Drange
ba01b7eb53 Fixes support for BOXed ACTNUM
* Added ACTNUM as keyword to Eclipse3DProperties
* Removed certain checks from EclipseGrid that are no longer of use
* Added tests to EclipseGridTests that test boxed ACTNUM and activeCells
* Made EclipseGrid non-const in EclipseState since we must run resetACTNUM
* Fixed a minor typo in an error message in EclipseGrid
* Fixed typo in GridProperty: Deckeyword -> DeckKeyword
* Fixed two errors in tests recently introduced relating to Ecl3DProps
* Removed test in EclipseGridTests; We now accept too small ACTNUM vectors
* Added ACTNUM test for GridProperties
2016-04-19 10:54:09 +02:00
Liu Ming
2fd5477f44 make the memeber function as non-static, use MessageContainer to replace OpmLog. 2016-04-18 15:16:09 +08:00
Liu Ming
f28dd65142 add MessageContainer object. 2016-04-14 09:39:28 +08:00
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
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
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
847fc3ba6f Added EclipseGrid::cellThickNess() method 2015-07-27 17:57:34 +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