From 51e0512989f944285be0a49d9171336ca9358ff3 Mon Sep 17 00:00:00 2001
From: Xavier Raynaud <xavier.raynaud@sintef.no>
Date: Thu, 23 Aug 2012 16:51:51 +0200
Subject: [PATCH] Removed non-used members in class ResidualEquation.

---
 examples/polymer_reorder.cpp          | 3 +--
 examples/test_singlecellsolves.cpp    | 2 +-
 opm/polymer/TransportModelPolymer.cpp | 6 +-----
 opm/polymer/TransportModelPolymer.hpp | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/examples/polymer_reorder.cpp b/examples/polymer_reorder.cpp
index 9a998f8d8..a6f123f14 100644
--- a/examples/polymer_reorder.cpp
+++ b/examples/polymer_reorder.cpp
@@ -83,7 +83,6 @@
 #include <list>
 
 
-
 static void outputState(const UnstructuredGrid& grid,
                         const Opm::PolymerState& state,
                         const int step,
@@ -120,7 +119,7 @@ static void outputState(const UnstructuredGrid& grid,
         std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n"));
     }
 
-    #if PROFILING
+    #ifdef PROFILING
     std::ostringstream fname;
     fname << output_dir << "/" << "residualcounts" << "-" << std::setw(3) << std::setfill('0') << step << ".dat";
     std::ofstream file(fname.str().c_str());
diff --git a/examples/test_singlecellsolves.cpp b/examples/test_singlecellsolves.cpp
index 5f0515a76..111f2c20e 100644
--- a/examples/test_singlecellsolves.cpp
+++ b/examples/test_singlecellsolves.cpp
@@ -229,7 +229,7 @@ main(int argc, char** argv)
                                 state.concentration(),
                                 state.maxconcentration());
 
-#if PROFILING
+#ifdef PROFILING
             // Extract residual counts.
             typedef std::list<Opm::TransportModelPolymer::Newton_Iter> ListRes;
             const ListRes& res_counts = reorder_model.res_counts;
diff --git a/opm/polymer/TransportModelPolymer.cpp b/opm/polymer/TransportModelPolymer.cpp
index b6b640818..cf723ed0c 100644
--- a/opm/polymer/TransportModelPolymer.cpp
+++ b/opm/polymer/TransportModelPolymer.cpp
@@ -45,8 +45,6 @@ public:
     double porosity;
     double dtpv;    // dt/pv(i)
     double dps;
-    double res_factor;
-    double c_max_ads;
     double rhor;
     double ads0;
     GradientMethod gradient_method;
@@ -204,7 +202,7 @@ namespace Opm
 	}
 	visc_ = props.viscosity();
 
-#if PROFILING
+#ifdef PROFILING
         res_counts.clear();
 #endif
 
@@ -445,8 +443,6 @@ namespace Opm
 	dps = tm.polyprops_.deadPoreVol();
 	rhor = tm.polyprops_.rockDensity();
         tm.polyprops_.adsorption(c0, cmax0, ads0);
-	res_factor = tm.polyprops_.resFactor();
-	c_max_ads = tm.polyprops_.cMaxAds();
 	double dflux       = -tm.source_[cell];
 	bool src_is_inflow = dflux < 0.0;
 	influx  =  src_is_inflow ? dflux : 0.0;
diff --git a/opm/polymer/TransportModelPolymer.hpp b/opm/polymer/TransportModelPolymer.hpp
index 685c22a21..da3ff2a63 100644
--- a/opm/polymer/TransportModelPolymer.hpp
+++ b/opm/polymer/TransportModelPolymer.hpp
@@ -116,7 +116,7 @@ namespace Opm
         int solveGravityColumn(const std::vector<int>& cells);
         void scToc(const double* x, double* x_c) const;
 
-        #if PROFILING
+        #ifdef PROFILING
         class Newton_Iter {
         public:
             bool res_s;