OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to make the code compile and run.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2018-06-29 12:28:38 +02:00
parent 976bfdab35
commit 98e3bbcf1d
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -181,7 +181,7 @@ namespace Opm {
Value<double> m_pinch;
PinchMode::ModeEnum m_pinchoutMode;
PinchMode::ModeEnum m_multzMode;
std::vector<double> volume_cache mutable;
mutable std::vector<double> volume_cache;
mutable std::vector< int > activeMap;
bool m_circle = false;
/*

35
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -25,6 +25,7 @@
#include <functional>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/utility/numeric/calculateCellVol.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
@@ -57,12 +58,13 @@ namespace Opm {
const std::vector<double>& zcorn ,
const int * actnum,
const double * mapaxes)
: m_minpvValue(0),
: GridDims(dims),
m_minpvValue(0),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
m_multzMode(PinchMode::ModeEnum::TOP),
volume_cache(dims[0] * dims[1] * dims[2], -1)
volume_cache(dims[0] * dims[1] * dims[2], -1.0)
{
initCornerPointGrid( dims, coord , zcorn , actnum , mapaxes );
}
@@ -79,8 +81,7 @@ namespace Opm {
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
m_multzMode(PinchMode::ModeEnum::TOP),
volume_cache(dims[0] * dims[1] * dims[2], -1)
m_multzMode(PinchMode::ModeEnum::TOP)
{
ecl_grid_type * new_ptr = ecl_grid_load_case__( filename.c_str() , false );
if (new_ptr)
@@ -91,6 +92,8 @@ namespace Opm {
m_nx = ecl_grid_get_nx( c_ptr() );
m_ny = ecl_grid_get_ny( c_ptr() );
m_nz = ecl_grid_get_nz( c_ptr() );
volume_cache.resize(m_nx * m_ny * m_nz, -1.0);
}
@@ -102,7 +105,7 @@ namespace Opm {
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
m_multzMode(PinchMode::ModeEnum::TOP),
volume_cache(dims[0] * dims[1] * dims[2], -1)
volume_cache(nx * ny * nz, -1.0),
m_grid( ecl_grid_alloc_rectangular(nx, ny, nz, dx, dy, dz, NULL) )
{
}
@@ -114,7 +117,7 @@ namespace Opm {
m_pinch( src.m_pinch ),
m_pinchoutMode( src.m_pinchoutMode ),
m_multzMode( src.m_multzMode ),
volume_cache(dims[0] * dims[1] * dims[2], -1)
volume_cache(src.volume_cache.size(), -1.0)
{
const int * actnum_data = (actnum.empty()) ? nullptr : actnum.data();
m_grid.reset( ecl_grid_alloc_processed_copy( src.c_ptr(), zcorn , actnum_data ));
@@ -168,7 +171,7 @@ namespace Opm {
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
m_multzMode(PinchMode::ModeEnum::TOP),
volume_cache(dims[0] * dims[1] * dims[2], -1)
volume_cache(m_nx * m_ny * m_nz, -1.0)
{
const std::array<int, 3> dims = getNXYZ();
@@ -733,24 +736,22 @@ namespace Opm {
double EclipseGrid::getCellVolume(size_t globalIndex) const {
assertGlobalIndex( globalIndex );
if (volume_cache[global_index] < 0) {
if (volume_cache[globalIndex] < 0.0) {
// Calculate cell volume and put it in the cache.
std::vector<double> x(8,0);
std::vector<double> y(8,0);
std::vector<double> z(8,0);
for (int i=0; i < 8; i++)
ecl_grid_gell_corner_xyz1(c_ptr(), static_cast<int>(globalIndex), i, &x.data()[i], &y.data()[i], &z.data()[i]);
volume_cache[i] = calc_cell_volume(x,y,z);
for (int i=0; i < 8; i++) {
ecl_grid_get_cell_corner_xyz1(c_ptr(), static_cast<int>(globalIndex), i, &x.data()[i], &y.data()[i], &z.data()[i]);
}
volume_cache[globalIndex] = calculateCellVol(x,y,z);
}
return volume_cache[global_index];
return volume_cache[globalIndex];
}
double EclipseGrid::getCellVolume(size_t i , size_t j , size_t k) const {
assertIJK(i,j,k);
return ecl_grid_get_cell_volume3( c_ptr() , static_cast<int>(i),static_cast<int>(j),static_cast<int>(k));
return getCellVolume(getGlobalIndex(i, j, k));
}
double EclipseGrid::getCellThicknes(size_t i , size_t j , size_t k) const {