From 41f9f06df471764ed4a49907ca064833f108d4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Wed, 1 Feb 2012 20:29:05 +0100
Subject: [PATCH] Fallout from removal of grid_t typedef.

---
 opm/core/GridAdapter.hpp                             | 6 +++---
 opm/core/pressure/HybridPressureSolver.hpp           | 6 +++---
 opm/core/pressure/TPFACompressiblePressureSolver.hpp | 4 ++--
 opm/core/pressure/TPFAPressureSolver.hpp             | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/opm/core/GridAdapter.hpp b/opm/core/GridAdapter.hpp
index 25191df5..d1f3b54e 100644
--- a/opm/core/GridAdapter.hpp
+++ b/opm/core/GridAdapter.hpp
@@ -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_;
diff --git a/opm/core/pressure/HybridPressureSolver.hpp b/opm/core/pressure/HybridPressureSolver.hpp
index 78e7554a..1c246602 100644
--- a/opm/core/pressure/HybridPressureSolver.hpp
+++ b/opm/core/pressure/HybridPressureSolver.hpp
@@ -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) {
diff --git a/opm/core/pressure/TPFACompressiblePressureSolver.hpp b/opm/core/pressure/TPFACompressiblePressureSolver.hpp
index 8dedc4a2..1ab1d17b 100644
--- a/opm/core/pressure/TPFACompressiblePressureSolver.hpp
+++ b/opm/core/pressure/TPFACompressiblePressureSolver.hpp
@@ -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) {
diff --git a/opm/core/pressure/TPFAPressureSolver.hpp b/opm/core/pressure/TPFAPressureSolver.hpp
index eb763a2c..ff6825b9 100644
--- a/opm/core/pressure/TPFAPressureSolver.hpp
+++ b/opm/core/pressure/TPFAPressureSolver.hpp
@@ -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) {