OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Glue in support for the grid property modifier keywords

Browse Source 
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
This commit is contained in:
Andreas Lauser
2014-06-06 14:07:14 +02:00
parent ed5bd42980
commit 05775a0b36
10 changed files with 155 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/props/rock/RockFromDeck.hpp
View File

@@ -20,7 +20,7 @@
#ifndef OPM_ROCKFROMDECK_HEADER_INCLUDED
#define OPM_ROCKFROMDECK_HEADER_INCLUDED
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <vector>
@@ -36,12 +36,12 @@ namespace Opm
RockFromDeck();
/// Initialize from deck and cell mapping.
/// \param deck Deck produced by the opm-parser code
/// \param eclState The EclipseState (processed deck) produced by the opm-parser code
/// \param number_of_cells The number of cells in the grid.
/// \param global_cell The mapping fom local to global cell indices.
/// global_cell[i] is the corresponding global index of i.
/// \param cart_dims The size of the underlying cartesian grid.
void init(Opm::DeckConstPtr deck,
void init(Opm::EclipseStateConstPtr eclState,
int number_of_cells, const int* global_cell,
const int* cart_dims);
@@ -72,10 +72,10 @@ namespace Opm
}
private:
void assignPorosity(Opm::DeckConstPtr deck,
void assignPorosity(Opm::EclipseStateConstPtr eclState,
int number_of_cells,
const int* global_cell);
void assignPermeability(Opm::DeckConstPtr deck,
void assignPermeability(Opm::EclipseStateConstPtr eclState,
int number_of_cells,
const int* global_cell,
const int* cart_dims,