Merge pull request #783 from hnil/nicer_comments

- removed not nice comments

opm/models/blackoil/blackoilintensivequantities.hh

@@ -530,13 +530,7 @@ public:
      *        quantities.
      *
      * This allows to specify different Pressure-Volume-Temperature (PVT) relations in
-     * different parts of the spatial domain. Note that this concept should be seen as a
-     * work-around of the fact that the black-oil model does not capture the
-     * thermodynamics well enough. (Because there is, err, only a single real world with
-     * in which all substances follow the same physical laws and hence the same
-     * thermodynamics.) Anyway: Since the ECL file format uses multiple PVT regions, we
-     * support it as well in our black-oil model. (Note that, if it is not explicitly
-     * specified, the PVT region index is 0.)
+     * different parts of the spatial domain.
      */
     auto pvtRegionIndex() const
         -> decltype(std::declval<FluidState>().pvtRegionIndex())

opm/models/blackoil/blackoilprimaryvariables.hh

@@ -193,10 +193,9 @@ public:
     /*!
      * \brief Set the index of the region which should be used for PVT properties.
      *
-     * The concept of PVT regions is a hack to work around the fact that the
-     * pseudo-components used by the black oil model (i.e., oil, gas and water) change
-     * their composition within the spatial domain. We implement them because, the ECL
-     * file format mandates them.
+     * PVT regions represent spatial variation of the composition decribed
+     * by the pseudo-components used by the black oil model (i.e., oil, gas
+     * and water). This introduce spatially varying pvt behaviour.
      */
     void setPvtRegionIndex(unsigned value)
     { pvtRegionIdx_ = static_cast<unsigned short>(value); }

opm/models/discretization/common/fvbaseproblem.hh

@@ -479,7 +479,7 @@ public:
             std::cout << std::setprecision(3)
                       << "Simulation of problem '" << asImp_().name() << "' finished.\n"
                       << "\n"
-                      << "------------------------ Timing receipt ------------------------\n"
+                      << "------------------------ Timing ------------------------\n"
                       << "Setup time: " << setupTime << " seconds" << Simulator::humanReadableTime(setupTime)
                       << ", " << setupTime/(executionTime + setupTime)*100 << "%\n"
                       << "Simulation time: " << executionTime << " seconds" << Simulator::humanReadableTime(executionTime)
@@ -499,15 +499,8 @@ public:
                       << "Threads per processes: " << threadsPerProcess << "\n"
                       << "Total CPU time: " << globalCpuTime << " seconds" << Simulator::humanReadableTime(globalCpuTime) << "\n"
                       << "\n"
-                      << "Note 1: If not stated otherwise, all times are wall clock times\n"
-                      << "Note 2: Taxes and administrative overhead are "
-                      << (executionTime - (linearizeTime+solveTime+updateTime+prePostProcessTime+writeTime))/executionTime*100
-                      << "%\n"
-                      << "\n"
-                      << "Our simulation hours are 24/7. Thank you for choosing us.\n"
                       << "----------------------------------------------------------------\n"
-                      << "\n"
-                      << std::flush;
+                      << std::endl;
         }
     }
 

opm/models/utils/start.hh

@@ -349,10 +349,8 @@ static inline int start(int argc, char **argv,  bool registerParams=true)
                 std::cout << tmp << std::endl << std::endl;
             }
             else
-                std::cout << "eWoms " << versionString
-                          << " will now start the trip. "
-                          << "Please sit back, relax and enjoy the ride.\n"
-                          << std::flush;
+                std::cout << "opm models " << versionString
+                          << " will now start the simulation. " << std::endl;
         }
 
         // print the parameters if requested
@@ -393,9 +391,7 @@ static inline int start(int argc, char **argv,  bool registerParams=true)
         simulator.run();
 
         if (myRank == 0) {
-            std::cout << "eWoms reached the destination. If it is not the one that was intended, "
-                      << "change the booking and try again.\n"
-                      << std::flush;
+            std::cout << "Simulation completed" << std::endl;                                 
         }
         return 0;
     }