code cleanup and improvements to some of the figures (for the INARCH workshop)

doc/images/meteoio_workflow.fig

@@ -210,5 +210,6 @@ Single
 4 1 0 50 -1 2 16 0.0000 4 180 1695 4635 8100 Generate Data\001
 4 1 0 50 -1 2 16 0.0000 4 225 1755 4725 9450 Spatialize Data\001
 4 1 -1 50 -1 3 20 0.0000 4 240 855 8145 8235 Caller\001
-4 1 0 50 -1 2 16 0.0000 4 240 1905 4725 4005 raw data editing\001
+4 1 0 50 -1 2 16 0.0000 4 240 1980 4725 4005 Raw data editing\001
 4 1 0 50 -1 2 16 0.0000 4 180 1230 4725 2655 Read Data\001
+4 1 -1 50 -1 3 20 0.0000 4 285 2235 8145 8640 (data consumer)\001

meteoio/Meteo1DInterpolator.h

@@ -21,7 +21,7 @@
 #include <meteoio/dataClasses/MeteoData.h>
 #include <meteoio/Config.h>
 #include <meteoio/meteoResampling/ResamplingAlgorithms.h>
-#include <meteoio/meteoFilters/ProcessingBlock.h>
+#include <meteoio/meteoFilters/ProcessingBlock.h> //for ProcessingProperties
 
 #include <string>
 #include <vector>

meteoio/Meteo2DInterpolator.cc

@@ -119,12 +119,12 @@ Meteo2DInterpolator::~Meteo2DInterpolator()
 */
 void Meteo2DInterpolator::setAlgorithms()
 {
-	set<string> set_of_used_parameters;
+	std::set<std::string> set_of_used_parameters;
 	get_parameters(cfg, set_of_used_parameters);
 
-	set<string>::const_iterator it;
+	std::set<std::string>::const_iterator it;
 	for (it = set_of_used_parameters.begin(); it != set_of_used_parameters.end(); ++it) {
-		const std::string parname = *it;
+		const std::string parname( *it );
 		std::vector<std::string> tmpAlgorithms;
 		const size_t nrOfAlgorithms = getAlgorithmsForParameter(cfg, parname, tmpAlgorithms);
 
@@ -151,7 +151,7 @@ size_t Meteo2DInterpolator::get_parameters(const Config& cfg, std::set<std::stri
 	for (size_t ii=0; ii<vec_keys.size(); ii++) {
 		const size_t found = vec_keys[ii].find_first_of(":");
 		if (found != std::string::npos){
-			const string tmp = vec_keys[ii].substr(0,found);
+			const std::string tmp( vec_keys[ii].substr(0,found) );
 			set_parameters.insert( IOUtils::strToUpper(tmp) );
 		}
 	}
@@ -172,7 +172,7 @@ void Meteo2DInterpolator::interpolate(const Date& date, const DEMObject& dem, co
 	if (!algorithms_ready)
 		setAlgorithms();
 
-	const string param_name = MeteoData::getParameterName(meteoparam);
+	const std::string param_name( MeteoData::getParameterName(meteoparam) );
 	
 	//Get grid from buffer if it exists
 	std::ostringstream grid_hash;
@@ -181,7 +181,7 @@ void Meteo2DInterpolator::interpolate(const Date& date, const DEMObject& dem, co
 		return;
 
 	//Show algorithms to be used for this parameter
-	const map<string, vector<InterpolationAlgorithm*> >::iterator it = mapAlgorithms.find(param_name);
+	const std::map<string, vector<InterpolationAlgorithm*> >::iterator it = mapAlgorithms.find(param_name);
 	if (it==mapAlgorithms.end())
 		throw IOException("No interpolation algorithms configured for parameter "+param_name, AT);
 
@@ -224,7 +224,7 @@ void Meteo2DInterpolator::interpolate(const Date& date, const DEMObject& dem, co
                             const std::vector<Coords>& in_coords, std::vector<double>& result, std::string& info_string)
 {
 	result.clear();
-	vector<Coords> vec_coords(in_coords);
+	std::vector<Coords> vec_coords(in_coords);
 
 	if (use_full_dem) {
 		Grid2DObject result_grid;
@@ -289,7 +289,7 @@ size_t Meteo2DInterpolator::getArgumentsForAlgorithm(const std::string& param,
                                                      std::vector<std::string>& vecArgs) const
 {
 	vecArgs.clear();
-	const string keyname = param +"::"+ algorithm;
+	const std::string keyname = param +"::"+ algorithm;
 	cfg.getValue(keyname, "Interpolations2D", vecArgs, IOUtils::nothrow);
 
 	return vecArgs.size();
@@ -301,9 +301,9 @@ void Meteo2DInterpolator::checkMinMax(const double& minval, const double& maxval
 
 	for (size_t ii=0; ii<nxy; ii++){
 		double& value = gridobj(ii);
-		if (value == IOUtils::nodata){
+		if (value == IOUtils::nodata)
 			continue;
-		}
+
 		if (value < minval) {
 			value = minval;
 		} else if (value > maxval) {
@@ -418,7 +418,7 @@ size_t Meteo2DInterpolator::getVirtualStationsData(const Date& i_date, METEO_SET
 	vecMeteo.clear();
 
 	// Check if data is available in cache
-	const map<Date, vector<MeteoData> >::const_iterator it = virtual_point_cache.find(i_date);
+	const std::map<Date, vector<MeteoData> >::const_iterator it = virtual_point_cache.find(i_date);
 	if (it != virtual_point_cache.end()){
 		vecMeteo = it->second;
 		return vecMeteo.size();
@@ -514,7 +514,8 @@ size_t Meteo2DInterpolator::getVirtualStationsFromGrid(const Date& i_date, METEO
 	return vecMeteo.size();
 }
 
-const std::string Meteo2DInterpolator::toString() const {
+const std::string Meteo2DInterpolator::toString() const
+{
 	ostringstream os;
 	os << "<Meteo2DInterpolator>\n";
 	os << "Config& cfg = " << hex << &cfg << dec << "\n";

meteoio/Meteo2DInterpolator.h

@@ -22,12 +22,10 @@
 #include <meteoio/TimeSeriesManager.h>
 #include <meteoio/Config.h>
 #include <meteoio/dataClasses/Buffer.h>
-#include <meteoio/dataClasses/Date.h>
 #include <meteoio/dataClasses/MeteoData.h>
 #include <meteoio/dataClasses/DEMObject.h>
 #include <meteoio/spatialInterpolations/InterpolationAlgorithms.h>
 
-#include <memory>
 #include <vector>
 #include <map>
 

meteoio/meteoFilters/ProcShade.cc

@@ -146,8 +146,7 @@ void ProcShade::readMask(const std::string& filter, const std::string& filename,
 	std::ifstream fin(filename.c_str());
 	if (fin.fail()) {
 		std::ostringstream ss;
-		ss << "Filter " << filter << ": ";
-		ss << "error opening file \"" << filename << "\", possible reason: " << strerror(errno);
+		ss << "Filter " << filter << ": " << "error opening file \"" << filename << "\", possible reason: " << strerror(errno);
 		throw AccessException(ss.str(), AT);
 	}
 
@@ -222,10 +221,10 @@ void ProcShade::parse_args(const std::vector<std::string>& vec_args)
 	} else if (nrArgs==1) {
 		const std::string root_path( cfg.getConfigRootDir() );
 		//if this is a relative path, prefix the path with the current path
-		const std::string in_filename = vec_args[0];
+		const std::string in_filename( vec_args[0] );
 		const std::string prefix = ( FileUtils::isAbsolutePath(in_filename) )? "" : root_path+"/";
-		const std::string path = FileUtils::getPath(prefix+in_filename, true);  //clean & resolve path
-		const std::string filename = path + "/" + FileUtils::getFilename(in_filename);
+		const std::string path( FileUtils::getPath(prefix+in_filename, true) );  //clean & resolve path
+		const std::string filename( path + "/" + FileUtils::getFilename(in_filename) );
 		std::vector< std::pair<double,double> > mask;
 		readMask(getName(), filename, mask);
 		masks["*"] = mask; //this mask is valid for ALL stations