WSL/SLF GitLab Repository

Commit 3c7cf373 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Pushed documentation version number, more robust file globing for the...

Pushed documentation version number, more robust file globing for the libraries, more standard uppercase/lowecase conversion and the extra parameters in SMET are now forced to uppercase (so all parameters are uppercase when they come out of the plugins).
parent 11fb1ed6
......@@ -147,9 +147,9 @@ INSTALL(FILES ${hfilterfiles} DESTINATION include/meteoio/meteofilters COMPONENT
INSTALL(FILES ${hstatsfiles} DESTINATION include/meteoio/meteostats COMPONENT headers)
IF(WIN32) #handle the special case of WIN32 needing import libraries
FILE(GLOB_RECURSE importlibs "lib/libmeteoio*.lib*")
FILE(GLOB_RECURSE importlibs "lib/libmeteo*.lib*")
ENDIF(WIN32)
FILE(GLOB_RECURSE solibs "lib/libmeteoio*.${DLL_EXT}")
FILE(GLOB_RECURSE solibs "lib/libmeteo*.${DLL_EXT}")
FILE(GLOB_RECURSE plugins "lib/plugins/lib*.${DLL_EXT}")
FILE(GLOB_RECURSE alibs "lib/*.${STAT_EXT}")
......
......@@ -17,6 +17,7 @@
*/
#include <cmath>
#include <cstring>
#include <algorithm>
#include <meteoio/IOUtils.h>
#include <meteoio/meteolaws/Meteoconst.h> //for math constants
......@@ -195,15 +196,11 @@ void IOUtils::trim(std::string& str)
}
void IOUtils::toUpper(std::string& str){
for(size_t t=0; t<str.length(); t++) {
str[t] = (char)toupper(str[t]);
}
std::transform(str.begin(), str.end(),str.begin(), ::toupper);
}
void IOUtils::toLower(std::string& str){
for(size_t t=0; t<str.length(); t++) {
str[t] = (char)tolower(str[t]);
}
std::transform(str.begin(), str.end(),str.begin(), ::tolower);
}
bool IOUtils::isNumeric(const std::string& str, const unsigned int& nBase)
......
......@@ -31,7 +31,7 @@ PROJECT_NAME = MeteoIODoc
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = MeteoIODoc-2.1.2
PROJECT_NUMBER = MeteoIODoc-2.2.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
......
......@@ -27,6 +27,8 @@ namespace mio {
* The Station meteo data files is a station centered, ascii file format that has been designed with flexibility and ease of use in mind. Please refer to its <a href="../SMET_specifications.pdf">official format specification</a> for more information.
* This plugin can also provide special points, given as a SMET file containing either latitude/longitude/altitude or easting/northing/altitude. For the latter, the header must contain the epsg code (see example below).
*
* Non-standard parameters can also be given, such as extra snow temperatures. These parameters will then take the name that has been given in "fields", converted to uppercase. It is usually a good idea to number these parameters, such as TS1, TS2, TS3 for a serie of temperatures at various positions.
*
* @section template_units Units
* All units are MKSA, the only exception being the precipitations that are in mm/h. It is however possible to use multipliers and offsets (but they must be specified in the file header).
*
......@@ -273,8 +275,11 @@ void SMETIO::identify_fields(const std::vector<std::string>& fields, std::vector
} else if (fields[ii] == "altitude") {
indexes.push_back(IOUtils::npos-5);
} else {
md.addParameter(fields[ii]);
indexes.push_back(md.getParameterIndex(fields[ii]));
//this is an extra parameter, we convert to uppercase
std::string extra_param = fields[ii];
IOUtils::toUpper(extra_param);
md.addParameter(extra_param);
indexes.push_back(md.getParameterIndex(extra_param));
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment