added compile option for netcdf

Author: swillner

.zenodo.json

@@ -3,7 +3,7 @@
     "license": {
         "id": "AGPL-3.0"
     },
-    "title": "libmrio",
+    "title": "libmrio v2.1.0",
     "upload_type": "software",
     "creators": [
         {

include/MRIOTable.h

@@ -66,10 +66,14 @@ class Table {
     const T basesum(const SuperSector<I>* i, const SuperRegion<I>* r, const SuperSector<I>* j, const SuperRegion<I>* s) const noexcept;
     void write_to_csv(std::ostream& os) const;
     void write_to_mrio(std::ostream& os) const;
+#ifdef LIBMRIO_NETCDF
     void write_to_netcdf(const std::string& filename) const;
+#endif
     void read_from_csv(std::istream& indicesstream, std::istream& datastream, const T& threshold);
     void read_from_mrio(std::istream& instream, const T& threshold);
+#ifdef LIBMRIO_NETCDF
     void read_from_netcdf(const std::string& filename, const T& threshold);
+#endif
 
     inline T& at(const Sector<I>* i, const Region<I>* r, const Sector<I>* j, const Region<I>* s) {
         assert(index_set_.at(i, r) >= 0);

makefile

@@ -9,7 +9,7 @@ CPP_FILES := $(wildcard src/*.cpp)
 OBJ_FILES := $(patsubst src/%.cpp,bin/%.o,$(CPP_FILES))
 .SECONDARY: OBJ_FILES
 LD_FLAGS := -lstdc++ -lnetcdf_c++4 -lnetcdf
-CC_FLAGS := -std=c++11 -I include -I lib/settingsnode/include -I lib/settingsnode/lib/yaml-cpp/include -I lib/cpp-library
+CC_FLAGS := -std=c++11 -I include -I lib/settingsnode/include -I lib/settingsnode/lib/yaml-cpp/include -I lib/cpp-library -DWITH_NETCDF
 LIBMRIO_VERSION := $(shell git describe --tags --dirty --always | sed -e 's/v\([0-9]\+\.[0-9]\+\)\.\(0-\([0-9]\+\)\)\?\(.*\)/\1.\3\4/')
 LIBMRIO_FLAGS := $(GCC_WARNINGS) -DLIBMRIO_VERSION='"$(LIBMRIO_VERSION)"'
 

src/MRIOTable.cpp

@@ -18,17 +18,19 @@
 */
 
 #include "MRIOTable.h"
-#include <ncDim.h>
-#include <ncFile.h>
-#include <ncVar.h>
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
 #include <iostream>
-#include <netcdf>
 #include <sstream>
 #include <stdexcept>
+#ifdef LIBMRIO_NETCDF
+#include <ncDim.h>
+#include <ncFile.h>
+#include <ncVar.h>
+#include <netcdf>
+#endif
 #include "MRIOIndexSet.h"
 #include "csv-parser.h"
 
@@ -254,6 +256,7 @@ void Table<T, I>::write_to_mrio(std::ostream& outstream) const {
     }
 }
 
+#ifdef LIBMRIO_NETCDF
 template<typename T, typename I>
 void Table<T, I>::read_from_netcdf(const std::string& filename, const T& threshold) {
     netCDF::NcFile file(filename, netCDF::NcFile::read);
@@ -335,7 +338,9 @@ void Table<T, I>::read_from_netcdf(const std::string& filename, const T& thresho
     }
     index_set_.rebuild_indices();
 }
+#endif
 
+#ifdef LIBMRIO_NETCDF
 template<typename T, typename I>
 void Table<T, I>::write_to_netcdf(const std::string& filename) const {
     debug_out();
@@ -389,6 +394,7 @@ void Table<T, I>::write_to_netcdf(const std::string& filename) const {
     flows_var.setFill<T>(true, std::numeric_limits<T>::quiet_NaN());
     flows_var.putVar(&data[0]);
 }
+#endif
 
 template<typename T, typename I>
 void Table<T, I>::insert_sector_offset_x_y(const SuperSector<I>* i, const I& i_regions_count, const I& subsectors_count) {
@@ -546,9 +552,9 @@ void Table<T, I>::debug_out() const {
     std::cout << std::setprecision(3) << std::fixed;
     for (const auto& y : index_set_.total_indices) {
         std::cout << index_set_.at(y.sector, y.region) << " " << y.sector->name << " " << (!y.sector->parent() ? "     " : y.sector->parent()->name) << " "
-             << (y.sector->parent() ? *y.sector->parent() : *y.sector) << " " << (*y.sector) << " " << y.sector->level_index() << " " << y.region->name << " "
-             << (!y.region->parent() ? "     " : y.region->parent()->name) << " " << (y.region->parent() ? *y.region->parent() : *y.region) << " "
-             << (*y.region) << " " << y.region->level_index() << "  |  ";
+                  << (y.sector->parent() ? *y.sector->parent() : *y.sector) << " " << (*y.sector) << " " << y.sector->level_index() << " " << y.region->name
+                  << " " << (!y.region->parent() ? "     " : y.region->parent()->name) << " " << (y.region->parent() ? *y.region->parent() : *y.region) << " "
+                  << (*y.region) << " " << y.region->level_index() << "  |  ";
         for (const auto& x : index_set_.total_indices) {
             if (data[x.index * index_set_.size() + y.index] <= 0) {
                 std::cout << " .   ";

src/main.cpp

@@ -100,8 +100,12 @@ int main(int argc, char* argv[]) {
                         throw std::runtime_error("Could not open data file");
                     }
                     basetable.read_from_mrio(data, threshold);
+#ifdef LIBMRIO_NETCDF
                 } else if (type == "netcdf") {
                     basetable.read_from_netcdf(filename, threshold);
+#endif
+                } else {
+                    throw std::runtime_error("Unknown type '" + type + "'");
                 }
             }
             std::cout << "done" << std::endl;
@@ -132,8 +136,12 @@ int main(int argc, char* argv[]) {
                         throw std::runtime_error("Could not create output file");
                     }
                     disaggregation.refined_table().write_to_mrio(outfile);
+#ifdef LIBMRIO_NETCDF
                 } else if (type == "netcdf") {
                     disaggregation.refined_table().write_to_netcdf(filename);
+#endif
+                } else {
+                    throw std::runtime_error("Unknown type '" + type + "'");
                 }
             }
             std::cout << "done" << std::endl;