From 52ace09d9d4be276d2ee598bd746d12975ab6e27 Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Fri, 28 Jul 2017 14:45:38 +0200
Subject: [PATCH] fixed swmm interface and mesh initialisation
---
Applications/FileIO/SWMM/SWMMInterface.h | 2 +-
Applications/Utils/SWMMConverter/SWMMConverter.cpp | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Applications/FileIO/SWMM/SWMMInterface.h b/Applications/FileIO/SWMM/SWMMInterface.h
index da001e9d810..e656c7f44b5 100644
--- a/Applications/FileIO/SWMM/SWMMInterface.h
+++ b/Applications/FileIO/SWMM/SWMMInterface.h
@@ -70,7 +70,7 @@ public:
std::string const& vec_name, std::vector<double> const& data);
/// Returns the mesh generated from SWMM file content.
- MeshLib::Mesh const& getMesh() const { return *_mesh; }
+ MeshLib::Mesh& getMesh() const { return *_mesh; }
/// Returns the name of the data array for the given object type and parameter index.
std::string getArrayName(SwmmObject obj_type, std::size_t var_idx) const;
diff --git a/Applications/Utils/SWMMConverter/SWMMConverter.cpp b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
index 8515288a880..1689da9bcf0 100644
--- a/Applications/Utils/SWMMConverter/SWMMConverter.cpp
+++ b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
@@ -55,12 +55,11 @@ int addObjectsToMesh(FileIO::SwmmInterface &swmm, MeshLib::Mesh &mesh,
int writeMeshOutput(std::string const& input_file, std::string const& output_file,
bool const node_args, bool const link_args)
{
- std::unique_ptr<FileIO::SwmmInterface> swmm = nullptr;
- swmm = FileIO::SwmmInterface::create(input_file);
+ std::unique_ptr<FileIO::SwmmInterface> swmm = FileIO::SwmmInterface::create(input_file);
if (swmm == nullptr)
return -1;
- MeshLib::Mesh mesh = swmm->getMesh();
+ MeshLib::Mesh& mesh = swmm->getMesh();
bool const no_output_file = !swmm->existsSwmmOutputFile();
if (!(node_args || link_args) || no_output_file)
@@ -106,8 +105,7 @@ void writeObjectsOfSwmmTypeToCsv(FileIO::SwmmInterface &swmm, FileIO::SwmmObject
int writeCsvOutput(std::string input_file, std::string output_file,
bool const node_args, bool const link_args, bool const catchment_args, bool const system_args)
{
- std::unique_ptr<FileIO::SwmmInterface> swmm = nullptr;
- swmm = FileIO::SwmmInterface::create(input_file);
+ std::unique_ptr<FileIO::SwmmInterface> swmm = FileIO::SwmmInterface::create(input_file);
if (swmm == nullptr)
return -1;
--
GitLab