WIP in using pinched grid for numerical aquifer

This commit is contained in:
Kai Bao
2020-12-06 00:23:34 +01:00
parent b6fdb7cc8e
commit 74f2fcd121
3 changed files with 6 additions and 4 deletions

View File

@@ -346,14 +346,16 @@ protected:
if (this->eclState().aquifer().hasNumericalAquifer()) {
aquifer_cell_volumes = this->eclState().aquifer().numericalAquifers().cellVolumes();
}
grid_->processEclipseFormat(mpiRank == 0 ? &this->eclState().getInputGrid()
grid_->processEclipseFormat(this->eclState(),
this->deck(),
mpiRank == 0 ? &this->eclState().getInputGrid()
: nullptr,
/*isPeriodic=*/false,
this->eclState().getInputNNC(),
/*flipNormals=*/false,
/*clipZ=*/false,
mpiRank == 0 ? this->eclState().fieldProps().porv(true)
: std::vector<double>(),
this->eclState().getInputNNC(),
aquifer_cell_volumes);
// we use separate grid objects: one for the calculation of the initial condition

View File

@@ -805,7 +805,7 @@ private:
// Discard the NNC if it is between active cell and inactive cell
std::ostringstream sstr;
sstr << "NNC between active and inactive cells ("
<< low << " -> " << high << ")";
<< low << " -> " << high << ") with globalcell is (" << c1 << "->" << c2 <<")";
Opm::OpmLog::warning(sstr.str());
continue;
}

View File

@@ -1943,7 +1943,7 @@ private:
const auto &aqu_cell = aquifer.getCell(global_index);
std::ostringstream ss;
ss << "FOR AQUIFER CELL AT { " << aqu_cell.I + 1 << " " << aqu_cell.J + 1 << " "
<< aqu_cell.J + 1 << " } OF NUMERICAL AQUIFER " << aqu_cell.aquifer_id << " , "
<< aqu_cell.K + 1 << " } OF NUMERICAL AQUIFER " << aqu_cell.aquifer_id << " with global_index " << global_index << ", "
<< "WATER SATURATION IS SET TO BE UNITY";
OpmLog::info(ss.str());
}