WSL/SLF GitLab Repository

Commit 8f6a7552 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Some warnings found with Visual C++ 10 have been fixed (mostly about types)

parent 5d982c00
......@@ -343,7 +343,7 @@ std::string IOManager::toString() const {
//display meteocache
unsigned int count=0;
unsigned int min_stations=std::numeric_limits<unsigned int>::max();
unsigned int max_stations=-std::numeric_limits<unsigned int>::max();
unsigned int max_stations=0;
std::map<Date, std::vector<MeteoData> >::const_iterator iter = resampled_cache.begin();
for (; iter != resampled_cache.end(); iter++) {
const unsigned int nb_stations = iter->second.size();
......
......@@ -287,7 +287,7 @@ char IOUtils::getEoln(std::istream& fin)
char tmp = '0';
int chars = 0;
int position = fin.tellg();
const std::streampos position = fin.tellg();
do {
fin.get(tmp);
......
......@@ -38,12 +38,9 @@ Meteo1DInterpolator::Meteo1DInterpolator(const Config& in_cfg) : cfg(in_cfg) {
taskargs.push_back(vecResamplingArguments);
}
window_size = 0.5; //default size is 0.5 julian days
string tmp = cfg.get("WINDOW_SIZE", "Interpolations1D", Config::nothrow);
if (tmp != "") {
window_size = cfg.get("WINDOW_SIZE", "Interpolations1D");
window_size /= 86400; //user uses seconds, internally julian day is used
}
window_size = 0.5*86400.; //default size is 0.5 julian days
cfg.getValue("WINDOW_SIZE", "Interpolations1D", window_size, Config::nothrow);
window_size /= 86400; //user uses seconds, internally julian day is used
if (window_size <= 0.01)
throw IOException("WINDOW_SIZE not valid", AT);
}
......
......@@ -63,6 +63,10 @@ inline float fastSqrt_Q3(const float x) {
return x * invSqrt(x);
}
inline double fastSqrt_Q3(const double x) {
return x * invSqrt(x);
}
const double Interpol2D::wind_ys = 0.58;
const double Interpol2D::wind_yc = 0.42;
const double Interpol2D::bilin_inflection = 1200.;
......
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