Simulate with only active cells (#2213)

Use FieldProps implementation for 3D properties
This commit is contained in:
Joakim Hove
2020-01-13 15:46:50 +01:00
committed by GitHub
parent dce86bb078
commit 0e9535319b
10 changed files with 138 additions and 127 deletions

View File

@@ -258,12 +258,7 @@ public:
protected:
void createGrids_()
{
#ifdef ENABLE_3DPROPS_TESTING
const auto& porv = this->eclState().fieldProps().porv(true);
#else
const auto& gridProps = this->eclState().get3DProperties();
const std::vector<double>& porv = gridProps.getDoubleGridProperty("PORV").getData();
#endif
grid_.reset(new Dune::CpGrid());
grid_->processEclipseFormat(&(this->eclState().getInputGrid()),
/*isPeriodic=*/false,
@@ -284,8 +279,6 @@ protected:
equilCartesianIndexMapper_.reset(new CartesianIndexMapper(*equilGrid_));
}
#ifdef ENABLE_3DPROPS_TESTING
std::vector<int> actnum;
unsigned long actnum_size;
if (mpiRank == 0) {
@@ -301,7 +294,6 @@ protected:
auto & field_props = this->eclState().fieldProps();
const_cast<FieldPropsManager&>(field_props).reset_actnum(actnum);
#endif
}
// removing some connection located in inactive grid cells