Added PROFILING preprocessor flag.

examples/polymer_reorder.cpp

@@ -120,6 +120,7 @@ static void outputState(const UnstructuredGrid& grid,
         std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n"));
     }
 
+    #if PROFILING
     std::ostringstream fname;
     fname << output_dir << "/" << "residualcounts" << "-" << std::setw(3) << std::setfill('0') << step << ".dat";
     std::ofstream file(fname.str().c_str());
@@ -134,6 +135,7 @@ static void outputState(const UnstructuredGrid& grid,
         file << it->res_s << "," << it->cell << "," << std::setprecision(15) << it->s << "," << std::setprecision(15) << it->c << "\n";
     }
     file.close();
+    #endif
 
     
 }

examples/test_singlecellsolves.cpp

@@ -229,6 +229,7 @@ main(int argc, char** argv)
                                 state.concentration(),
                                 state.maxconcentration());
 
+#if PROFILING
             // Extract residual counts.
             typedef std::list<Opm::TransportModelPolymer::Newton_Iter> ListRes;
             const ListRes& res_counts = reorder_model.res_counts;
@@ -241,6 +242,7 @@ main(int argc, char** argv)
             // std::cout << "c residual count: " << counts[0] << '\n';
             // std::cout << "s residual count: " << counts[1] << '\n';
             std::cout << counts[0] << ' ' << counts[1] << ' ' << s << ' ' << c << '\n';
+#endif
         }
     }
 }

opm/polymer/TransportModelPolymer.cpp

@@ -204,7 +204,9 @@ namespace Opm
 	}
 	visc_ = props.viscosity();
 
+#if PROFILING
         res_counts.clear();
+#endif
 
 	// Set up smin_ and smax_
 	int num_cells = props.numCells();
@@ -245,7 +247,9 @@ namespace Opm
         toWaterSat(saturation, saturation_);
 	concentration_ = &concentration[0];
 	cmax_ = &cmax[0];
+#if PROFILING
         res_counts.clear();
+#endif
         reorderAndTransport(grid_, darcyflux);
         toBothSat(saturation_, saturation);
     }
@@ -292,7 +296,9 @@ namespace Opm
 	}
 	double operator()(double s) const
 	{
+#if PROFILING
             tm_.res_counts.push_back(Newton_Iter(true, cell_, s, c_));
+#endif
             double ff;
             tm_.fracFlow(s, c_, cmax0_, cell_, ff);
 	    return s - s0_ +  dtpv_*(outflux_*ff + influx_ + s*comp_term_);
@@ -379,8 +385,10 @@ namespace Opm
 		+ rhor*((1.0 - porosity)/porosity)*(c_ads - c_ads0)
 		+ dtpv*(outflux*ff*mc + influx_polymer)
                 + dtpv*(s_arg*c_arg*(1.0 - dps) - rhor*c_ads)*comp_term;
+#if PROFILING
             tm.res_counts.push_back(Newton_Iter(true, cell, s_arg, c_arg));
             tm.res_counts.push_back(Newton_Iter(false, cell, s_arg, c_arg));
+#endif
 
 	}
 
@@ -403,7 +411,9 @@ namespace Opm
             tm.polyprops_.adsorption(c0, cmax0, c_ads0);
 	    double c_ads;
             tm.polyprops_.adsorption(c, cmax0, c_ads);
+#if PROFILING
             tm.res_counts.push_back(Newton_Iter(false, cell, s, c));
+#endif
             double res = (1 - dps)*s*c - (1 - dps)*s0*c0
 		+ rhor*((1.0 - porosity)/porosity)*(c_ads - c_ads0)
 		+ dtpv*(outflux*ff*mc + influx_polymer)
@@ -563,14 +573,18 @@ namespace Opm
             }
             if (if_res_s) {
                 res[0] = s - s0 +  dtpv*(outflux*ff + influx + s*comp_term);
+#if PROFILING
                 tm.res_counts.push_back(Newton_Iter(true, cell, x[0], x[1]));
+#endif
             }
             if (if_res_c) {
                 res[1] = (1 - dps)*s*c - (1 - dps)*s0*c0
                     + rhor*((1.0 - porosity)/porosity)*(ads - ads0)
                     + dtpv*(outflux*ff*mc + influx_polymer)
 		    + dtpv*(s*c*(1.0 - dps) - rhor*ads)*comp_term;
+#if PROFILING
                 tm.res_counts.push_back(Newton_Iter(false, cell, x[0], x[1]));
+#endif
             }
             if (if_dres_s_dsdc) {
                 dres_s_dsdc[0] = 1 + dtpv*(outflux*dff_dsdc[0] + comp_term);
@@ -590,7 +604,9 @@ namespace Opm
             tm.fracFlow(s, c, cmax0, cell, ff);
             if (if_res_s) {
                 res[0] = s - s0 +  dtpv*(outflux*ff + influx + s*comp_term);
+#if PROFILING
                 tm.res_counts.push_back(Newton_Iter(true, cell, x[0], x[1]));
+#endif
             }
             if (if_res_c) {
                 tm.computeMc(c, mc);
@@ -600,7 +616,9 @@ namespace Opm
                     + rhor*((1.0 - porosity)/porosity)*(ads - ads0)
                     + dtpv*(outflux*ff*mc + influx_polymer)
 		    + dtpv*(s*c*(1.0 - dps) - rhor*ads)*comp_term;
+#if PROFILING
                 tm.res_counts.push_back(Newton_Iter(false, cell, x[0], x[1]));
+#endif
             }
         }
 

opm/polymer/TransportModelPolymer.hpp

@@ -114,8 +114,9 @@ namespace Opm
                                     const int pos,
                                     const double* gravflux);
         int solveGravityColumn(const std::vector<int>& cells);
+        void scToc(const double* x, double* x_c) const;
 
-        // for testing
+        #if PROFILING
         class Newton_Iter {
         public:
             bool res_s;
@@ -132,8 +133,8 @@ namespace Opm
         };
 
         std::list<Newton_Iter> res_counts;
+        #endif
 
-        void scToc(const double* x, double* x_c) const;
 
     private:
 	const UnstructuredGrid& grid_;