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

Fallout from removal of grid_t typedef.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-02-01 20:29:05 +01:00
parent a3eb09032b
commit 41f9f06df4
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/GridAdapter.hpp
View File

@ -38,12 +38,12 @@ public:
buildGeometry(grid);
}
grid_t* c_grid()
UnstructuredGrid* c_grid()
{
return &g_;
}
/// Access the underlying C grid.
const grid_t* c_grid() const
const UnstructuredGrid* c_grid() const
{
return &g_;
}
@ -175,7 +175,7 @@ public:
}
}
private:
grid_t g_;
UnstructuredGrid g_;
// Topology storage.
std::vector<int> face_nodes_;
std::vector<int> face_nodepos_;

6
opm/core/pressure/HybridPressureSolver.hpp
View File

@ -101,7 +101,7 @@ public:
}
assert(count == ngconn);
grid_t* g = grid_.c_grid();
UnstructuredGrid* g = grid_.c_grid();
mim_ip_simple_all(g->number_of_cells, g->dimensions,
data_->max_ngconn,
g->cell_facepos, g->cell_faces,
@ -158,7 +158,7 @@ public:
double* wdp = 0;
// Scale inner products and gravity terms by saturation-dependent factors.
grid_t* g = grid_.c_grid();
UnstructuredGrid* g = grid_.c_grid();
Binv_mobilityweighted_.resize(Binv_.size());
mim_ip_mobility_update(g->number_of_cells, g->cell_facepos, &total_mobilities[0],
&Binv_[0], &Binv_mobilityweighted_[0]);
@ -258,7 +258,7 @@ public:
"You must call assemble() (and solve the linear system) "
"prior to calling faceFluxToCellFlux().");
}
const grid_t& g = *(grid_.c_grid());
const UnstructuredGrid& g = *(grid_.c_grid());
int num_cells = g.number_of_cells;
cell_fluxes.resize(g.cell_facepos[num_cells]);
for (int cell = 0; cell < num_cells; ++cell) {

4
opm/core/pressure/TPFACompressiblePressureSolver.hpp
View File

@ -164,7 +164,7 @@ public:
if (state_ == Uninitialized) {
throw std::runtime_error("Error in TPFACompressiblePressureSolver::assemble(): You must call init() prior to calling assemble().");
}
grid_t* g = grid_.c_grid();
UnstructuredGrid* g = grid_.c_grid();
// Boundary conditions.
int num_faces = g->number_of_faces;
@ -375,7 +375,7 @@ public:
"You must call assemble() (and solve the linear system) "
"prior to calling faceFluxToCellFlux().");
}
const grid_t& g = *(grid_.c_grid());
const UnstructuredGrid& g = *(grid_.c_grid());
int num_cells = g.number_of_cells;
cell_fluxes.resize(g.cell_facepos[num_cells]);
for (int cell = 0; cell < num_cells; ++cell) {

4
opm/core/pressure/TPFAPressureSolver.hpp
View File

@ -120,7 +120,7 @@ public:
if (state_ == Uninitialized) {
throw std::runtime_error("Error in TPFAPressureSolver::assemble(): You must call init() prior to calling assemble().");
}
grid_t* g = grid_.c_grid();
UnstructuredGrid* g = grid_.c_grid();
// Boundary conditions.
int num_faces = g->number_of_faces;
@ -246,7 +246,7 @@ public:
"You must call assemble() (and solve the linear system) "
"prior to calling faceFluxToCellFlux().");
}
const grid_t& g = *(grid_.c_grid());
const UnstructuredGrid& g = *(grid_.c_grid());
int num_cells = g.number_of_cells;
cell_fluxes.resize(g.cell_facepos[num_cells]);
for (int cell = 0; cell < num_cells; ++cell) {