WSL/SLF GitLab Repository

Commit 6a1729e9 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

The cmake files for compiling with LibXML++ have been updated since they would...

The cmake files for compiling with LibXML++ have been updated since they would not work with more recent Linux (but we should consider dropping LibXML++ and only rely on LibXML2 in order to reduce the dependencies and package finding mess). The special points are now called POI (Points of Interest, like for a gps device) in order to make them more familiar.
parent 0140928a
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tools/cmake/")
#SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tools/cmake/")
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/tools/cmake/")
# Version of library
SET(VERSION_MAJOR 2 CACHE INTERNAL "")
......@@ -24,7 +25,7 @@ IF(WIN32)
ELSE(WIN32)
OPTION(BUILD_STATIC_LIBS "Set to ON to build static libraries" OFF)
ENDIF(WIN32)
INCLUDE("${CMAKE_MODULE_PATH}/BuildVersion.cmake")
INCLUDE("${CMAKE_SOURCE_DIR}/tools/cmake/BuildVersion.cmake")
BuildVersion()
IF(MSVC)
......
......@@ -349,9 +349,9 @@ void BufferedIOHandler::push_meteo_data(const Date& date_start, const Date& date
vec_buffer_meteo = vecMeteo;
}
void BufferedIOHandler::readSpecialPoints(std::vector<Coords>& in_cpa)
void BufferedIOHandler::readPOI(std::vector<Coords>& in_cpa)
{
iohandler.readSpecialPoints(in_cpa);
iohandler.readPOI(in_cpa);
}
void BufferedIOHandler::write2DGrid(const Grid2DObject& grid_in, const std::string& in_name)
......
......@@ -101,7 +101,7 @@ class BufferedIOHandler : public IOInterface {
virtual void readDEM(DEMObject& dem_out);
virtual void readAssimilationData(const Date& date_in, Grid2DObject& da_out);
virtual void readLanduse(Grid2DObject& landuse_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void readMeteoData(const Date& dateStart, const Date& dateEnd,
std::vector< METEO_SET >& vecMeteo,
const size_t& stationindex=IOUtils::npos);
......
......@@ -335,9 +335,9 @@ void IOHandler::readAssimilationData(const Date& date_in, Grid2DObject& da_out)
plugin->readAssimilationData(date_in, da_out);
}
void IOHandler::readSpecialPoints(std::vector<Coords>& pts) {
IOInterface *plugin = getPlugin("SPECIALPTS", "Input");
plugin->readSpecialPoints(pts);
void IOHandler::readPOI(std::vector<Coords>& pts) {
IOInterface *plugin = getPlugin("POI", "Input");
plugin->readPOI(pts);
}
void IOHandler::write2DGrid(const Grid2DObject& grid_in, const std::string& name)
......
......@@ -69,7 +69,7 @@ class IOHandler : public IOInterface {
void readMeteoData(const Date& date, METEO_SET& vecMeteo);
virtual void readAssimilationData(const Date&, Grid2DObject& da_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void write2DGrid(const Grid2DObject& grid_in, const std::string& name);
virtual void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
......
......@@ -222,7 +222,7 @@ class IOInterface {
* This allows for example to get a list of points where to produce more detailed outputs.
* @param pts (std::vector<Coords>) A vector of points coordinates
*/
virtual void readSpecialPoints(std::vector<Coords>& pts) = 0;
virtual void readPOI(std::vector<Coords>& pts) = 0;
/**
* @brief Write a Grid2DObject
......
......@@ -427,12 +427,12 @@ void IOManager::readAssimilationData(const Date& date, Grid2DObject& grid2D)
}
}
void IOManager::readSpecialPoints(std::vector<Coords>& cpa)
void IOManager::readPOI(std::vector<Coords>& cpa)
{
if (processing_level == IOManager::raw){
rawio.readSpecialPoints(cpa);
rawio.readPOI(cpa);
} else {
bufferedio.readSpecialPoints(cpa);
bufferedio.readPOI(cpa);
}
}
......
......@@ -45,7 +45,7 @@ class IOManager {
void readDEM(DEMObject& dem_out);
void readAssimilationData(const Date& date_in, Grid2DObject& da_out);
void readLanduse(Grid2DObject& landuse_out);
void readSpecialPoints(std::vector<Coords>& pts);
void readPOI(std::vector<Coords>& pts);
void write2DGrid(const Grid2DObject& grid_in, const std::string& options="");
void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
//end legacy support
......
......@@ -683,10 +683,10 @@ void A3DIO::read2DMeteoHeader(const std::string& filename, std::map<std::string,
}
}
void A3DIO::readSpecialPoints(std::vector<Coords>& pts)
void A3DIO::readPOI(std::vector<Coords>& pts)
{
std::string filename;
cfg.getValue("SPECIALPTSFILE", "Input", filename);
cfg.getValue("POIFILE", "Input", filename);
if (!IOUtils::fileExists(filename)) {
throw FileNotFoundException(filename, AT);
}
......
......@@ -52,7 +52,7 @@ class A3DIO : public IOInterface {
const std::string& name="");
virtual void readAssimilationData(const Date&, Grid2DObject& da_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void write2DGrid(const Grid2DObject& grid_in, const std::string& name);
virtual void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
......
......@@ -322,7 +322,7 @@ void ARCIO::writeMeteoData(const std::vector< std::vector<MeteoData> >&, const s
throw IOException("Nothing implemented here", AT);
}
void ARCIO::readSpecialPoints(std::vector<Coords>&)
void ARCIO::readPOI(std::vector<Coords>&)
{
//Nothing so far
throw IOException("Nothing implemented here", AT);
......
......@@ -59,7 +59,7 @@ class ARCIO : public IOInterface {
virtual void writeMeteoData(const std::vector< std::vector<MeteoData> >& vecMeteo,
const std::string& name="");
virtual void readAssimilationData(const Date&, Grid2DObject& da_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void write2DGrid(const Grid2DObject& grid_in, const std::string& filename);
virtual void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
......
......@@ -299,7 +299,7 @@ void ARPSIO::writeMeteoData(const std::vector< std::vector<MeteoData> >& /*vecMe
throw IOException("Nothing implemented here", AT);
}
void ARPSIO::readSpecialPoints(std::vector<Coords>&)
void ARPSIO::readPOI(std::vector<Coords>&)
{
//Nothing so far
throw IOException("Nothing implemented here", AT);
......
......@@ -67,7 +67,7 @@ class ARPSIO : public IOInterface {
const std::string& name="");
virtual void readAssimilationData(const Date&, Grid2DObject& da_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void write2DGrid(const Grid2DObject& grid_in, const std::string& filename);
virtual void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
......
......@@ -417,7 +417,7 @@ void BormaIO::readAssimilationData(const Date&, Grid2DObject&)
throw IOException("Nothing implemented here", AT);
}
void BormaIO::readSpecialPoints(std::vector<Coords>&)
void BormaIO::readPOI(std::vector<Coords>&)
{
//Nothing so far
throw IOException("Nothing implemented here", AT);
......
......@@ -65,7 +65,7 @@ class BormaIO : public IOInterface {
const std::string& name="");
virtual void readAssimilationData(const Date&, Grid2DObject& da_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void write2DGrid(const Grid2DObject& grid_in, const std::string& name);
virtual void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
......
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/")
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/tools/cmake/")
CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/meteoio/IOHandler.cmake.cc ${PROJECT_SOURCE_DIR}/meteoio/IOHandler.cc )
......
......@@ -490,7 +490,7 @@ void CosmoXMLIO::writeMeteoData(const std::vector< std::vector<MeteoData> >& vec
}
}
void CosmoXMLIO::readSpecialPoints(std::vector<Coords>&)
void CosmoXMLIO::readPOI(std::vector<Coords>&)
{
//Nothing so far
throw IOException("Nothing implemented here", AT);
......
......@@ -61,7 +61,7 @@ class CosmoXMLIO : public IOInterface {
virtual void writeMeteoData(const std::vector< std::vector<MeteoData> >& vecMeteo, const std::string& name="");
virtual void readAssimilationData(const Date&, Grid2DObject& da_out);
virtual void readSpecialPoints(std::vector<Coords>& pts);
virtual void readPOI(std::vector<Coords>& pts);
virtual void write2DGrid(const Grid2DObject& grid_in, const std::string& filename);
virtual void write2DGrid(const Grid2DObject& grid_in, const MeteoGrids::Parameters& parameter, const Date& date);
......
......@@ -1068,7 +1068,7 @@ void GRIBIO::writeMeteoData(const std::vector< std::vector<MeteoData> >& /*vecMe
throw IOException("Nothing implemented here", AT);
}
void GRIBIO::readSpecialPoints(std::vector<Coords>&)
void GRIBIO::readPOI(std::vector<Coords>&)
{
//Nothing so far
throw IOException("Nothing implemented here", AT);
......
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