WSL/SLF GitLab Repository

Commit 2fe2e97d authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Fixed some warnings that appeared with the previous commit. A missing method...

Fixed some warnings that appeared with the previous commit. A missing method has now been implemented in Array3D. The example io.ini is now up to date with the code structure (ie: looking for the plugins in the proper subdirectory)
parent c479ae5f
[General]
PLUGINPATH = ../../lib/plugins
PLUGINPATH = ../../meteoio/lib/plugins
BUFF_CHUNK_SIZE = 30
BUFF_BEFORE = 1.5
......
......@@ -350,6 +350,13 @@ template<class T> Array3D<T>::Array3D(const unsigned int& anx, const unsigned in
keep_nodata = true;
}
template<class T> void Array3D<T>::setNodataHandling(const IOUtils::nodata_handling flag_nodata) {
if(flag_nodata==IOUtils::RAW_NODATA)
keep_nodata=false;
else
keep_nodata=true;
}
template<class T> void Array3D<T>::resize(const unsigned int& anx, const unsigned int& any, const unsigned int& anz) {
clear(); //we won't be able to "rescue" old values, so we reset the whole vector
vecData.resize(anx*any*anz);
......
......@@ -270,7 +270,7 @@ double& Grid2DObject::operator()(const unsigned int& ix, const unsigned int& iy)
return grid2D(ix,iy);
}
const double Grid2DObject::operator()(const unsigned int& ix, const unsigned int& iy) const {
double Grid2DObject::operator()(const unsigned int& ix, const unsigned int& iy) const {
return grid2D(ix,iy);
}
......
......@@ -60,7 +60,7 @@ class Grid2DObject {
Grid2DObject& operator=(const Grid2DObject&); ///<Assignement operator
double& operator ()(const unsigned int& ix, const unsigned int& iy);
const double operator ()(const unsigned int& ix, const unsigned int& iy) const;
double operator ()(const unsigned int& ix, const unsigned int& iy) const;
friend std::ostream& operator<<(std::ostream& os, const Grid2DObject& grid);
......
......@@ -268,7 +268,7 @@ double& Grid3DObject::operator()(const unsigned int& ix, const unsigned int& iy,
return grid3D(ix,iy,iz);
}
const double Grid3DObject::operator()(const unsigned int& ix, const unsigned int& iy, const unsigned int& iz) const {
double Grid3DObject::operator()(const unsigned int& ix, const unsigned int& iy, const unsigned int& iz) const {
return grid3D(ix,iy,iz);
}
......
......@@ -54,7 +54,7 @@ class Grid3DObject{
Grid3DObject& operator=(const Grid3DObject&); ///<Assignement operator
double& operator ()(const unsigned int& ix, const unsigned int& iy, const unsigned int& iz);
const double operator ()(const unsigned int& ix, const unsigned int& iy, const unsigned int& iz) const;
double operator ()(const unsigned int& ix, const unsigned int& iy, const unsigned int& iz) const;
friend std::ostream& operator<<(std::ostream& os, const Grid3DObject& grid);
......
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