From f77ebb344b635552dc5a75d437bc868e2d109076 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Fri, 11 Aug 2023 12:58:09 +0000
Subject: [PATCH] Fix sonarqube warnings
---
src/basics/writer/WbWriterVtkXmlBinary.cpp | 12 ++++++++----
src/basics/writer/WbWriterVtkXmlBinary.h | 3 ++-
.../grid/GridBuilder/MultipleGridBuilder.cpp | 5 ++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/basics/writer/WbWriterVtkXmlBinary.cpp b/src/basics/writer/WbWriterVtkXmlBinary.cpp
index 748820e94..f711dfb8d 100644
--- a/src/basics/writer/WbWriterVtkXmlBinary.cpp
+++ b/src/basics/writer/WbWriterVtkXmlBinary.cpp
@@ -61,11 +61,13 @@ void addCollectionHeader(std::ofstream &outputFileStream)
outputFileStream << " <Collection>" << endl;
}
-void addCollectionDatasetsForTimeStep(std::ofstream &outputFileStream, const vector<string> &filenames, double timeStep, bool separateGroups)
+void addCollectionDatasetsForTimeStep(std::ofstream &outputFileStream, const vector<string> &filenames, double timeStep,
+ bool separateGroups)
{
int group = 0, part = 0;
for (size_t i = 0; i < filenames.size(); i++) {
- outputFileStream << " <DataSet timestep=\"" << timeStep << "\" group=\"" << group << "\" part=\"" << part << "\" file=\"" << filenames[i] << "\"/>" << endl;
+ outputFileStream << " <DataSet timestep=\"" << timeStep << "\" group=\"" << group << "\" part=\"" << part
+ << "\" file=\"" << filenames[i] << "\"/>" << endl;
if (separateGroups)
group++;
else
@@ -84,8 +86,10 @@ void finalizeCollectionFile(std::ofstream &outputFileStream)
outputFileStream.close();
}
-std::string WbWriterVtkXmlBinary::writeCollectionForTimeSeries(const std::string &filename,
- const std::map<uint, std::vector<std::string>> &filesNamesForTimeSteps, bool separateGroups) const
+std::string
+WbWriterVtkXmlBinary::writeCollectionForTimeSeries(const std::string &filename,
+ const std::map<uint, std::vector<std::string>> &filesNamesForTimeSteps,
+ bool separateGroups) const
{
std::string vtkFilename = filename + ".pvd";
ofstream out = createFileStream(vtkFilename);
diff --git a/src/basics/writer/WbWriterVtkXmlBinary.h b/src/basics/writer/WbWriterVtkXmlBinary.h
index a1428aab8..a1f675fea 100644
--- a/src/basics/writer/WbWriterVtkXmlBinary.h
+++ b/src/basics/writer/WbWriterVtkXmlBinary.h
@@ -72,7 +72,8 @@ public:
std::string writeCollection(const std::string &filename, const std::vector<std::string> &filenames,
const double &timeStep, const bool &separateGroups) const;
std::string writeCollectionForTimeSeries(const std::string &filename,
- const std::map<uint, std::vector<std::string>> &filesNamesForTimeSteps, bool separateGroups) const;
+ const std::map<uint, std::vector<std::string>> &filesNamesForTimeSteps,
+ bool separateGroups) const;
std::string addFilesToCollection(const std::string &filename, const std::vector<std::string> &filenames,
const double &timeStep, const bool &separateGroups) const;
std::string writeParallelFile(const std::string &filename, std::vector<std::string> &pieceSources,
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
index 7febc828f..7403888ad 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
+++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
@@ -49,10 +49,9 @@
#include "io/GridVTKWriter/GridVTKWriter.h"
#include "io/STLReaderWriter/STLWriter.h"
-
-MultipleGridBuilder::MultipleGridBuilder() : LevelGridBuilder(), numberOfLayersFine(12), numberOfLayersBetweenLevels(8), subDomainBox(nullptr)
+MultipleGridBuilder::MultipleGridBuilder()
+ : numberOfLayersFine(12), numberOfLayersBetweenLevels(8), subDomainBox(nullptr), gridFactory(GridFactory::make())
{
- gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
}
--
GitLab