WSL/SLF GitLab Repository

Commit f15509d7 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Last round of bug fix for the popc version (hopefully)

parent d533edfc
......@@ -227,7 +227,7 @@ void IOManager::writeMeteoData(const std::vector< METEO_TIMESERIE >& vecMeteo, c
}
#ifdef _POPC_ //HACK popc
void IOManager::interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters& meteoparam,
void IOManager::interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters meteoparam,
Grid2DObject& result)
#else
void IOManager::interpolate(const Date& date, const DEMObject& dem, const MeteoData::Parameters& meteoparam,
......@@ -239,7 +239,7 @@ void IOManager::interpolate(const Date& date, const DEMObject& dem, const MeteoD
}
#ifdef _POPC_ //HACK popc
void IOManager::interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters& meteoparam,
void IOManager::interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters meteoparam,
Grid2DObject& result, std::string& info_string)
#else
void IOManager::interpolate(const Date& date, const DEMObject& dem, const MeteoData::Parameters& meteoparam,
......
......@@ -98,21 +98,21 @@ class IOManager {
unsigned int getMeteoData(const Date& i_date, METEO_TIMESERIE& vecMeteo);
#ifdef _POPC_ //HACK popc
void interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters& meteoparam,
Grid2DObject& result, std::string& info_string);
void interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters meteoparam,
Grid2DObject& result);
#else
void interpolate(const Date& date, const DEMObject& dem, const MeteoData::Parameters& meteoparam,
Grid2DObject& result, std::string& info_string);
Grid2DObject& result);
#endif
#ifdef _POPC_ //HACK popc
void interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters& meteoparam,
Grid2DObject& result);
void interpolate(/*const*/ Date& date, /*const*/ DEMObject& dem, /*const*/ MeteoData::Parameters meteoparam,
Grid2DObject& result, std::string& info_string);
#else
void interpolate(const Date& date, const DEMObject& dem, const MeteoData::Parameters& meteoparam,
Grid2DObject& result);
Grid2DObject& result, std::string& info_string);
#endif
/**
* @brief Set the desired ProcessingLevel of the IOManager instance
* The processing level affects the way meteo data is read and processed
......
......@@ -73,12 +73,12 @@ parclass IOManager {
std::string toString() /*const*/; //HACK popc
//friend std::ostream& operator<<(std::ostream& os, const IOManager& io);
/*enum ProcessingLevel { //HACK popc
enum ProcessingLevel { //HACK BUG popc
raw = 1,
filtered = 1 << 1,
resampled = 1 << 2,
num_of_levels = 1 << 3
};*/
};
private:
void add_to_cache(const Date& i_date, const METEO_TIMESERIE& vecMeteo);
......
......@@ -70,7 +70,7 @@
#ifdef _POPC_
#include <meteoio/IOHandler.ph>
#include <meteoio/IOManager.ph>
#include <meteoio/IOManager.h> //HACK
#include <meteoio/marshal_meteoio.h>
#else
#include <meteoio/IOHandler.h>
......
......@@ -16,7 +16,7 @@
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/IOHandler.ph>
#include <meteoio/IOManager.ph>
//#include <meteoio/IOManager.ph>
//@pack(IOHandler, IOManager)
@pack(IOHandler)
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