From c2380fbcfafdf2b9c96cafca885c26f6f640173f Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 1 Jul 2020 15:59:02 +0200
Subject: [PATCH] Adapt VTK Writing Cell type from INT TO UINT.
---
cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp | 2 +-
cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h | 2 +-
cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp | 2 +-
cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h | 2 +-
.../CoProcessors/TimeAveragedValuesCoProcessor.cpp | 2 +-
.../CoProcessors/TimeAveragedValuesCoProcessor.h | 2 +-
.../CoProcessors/TurbulenceIntensityCoProcessor.cpp | 2 +-
.../CoProcessors/TurbulenceIntensityCoProcessor.h | 2 +-
.../CoProcessors/WriteBoundaryConditionsCoProcessor.cpp | 2 +-
.../CoProcessors/WriteBoundaryConditionsCoProcessor.h | 2 +-
.../CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp | 2 +-
.../CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp b/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
index 7c5cdf726..474703728 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
+++ b/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
@@ -274,7 +274,7 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
//int ghostLayerWidth = kernel->getGhostLayerWidth();
//knotennummerierung faengt immer bei 0 an!
- int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
+ unsigned int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
int minX1 = 0;
int minX2 = 0;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h b/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
index 65ef5721b..f3931c4be 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
+++ b/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
@@ -48,7 +48,7 @@ protected:
private:
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::vector<std::vector<SPtr<Block3D>> > blockVector;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp b/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
index 291eb31e9..6378c3b7e 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
+++ b/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
@@ -116,7 +116,7 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
- int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
+ unsigned int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
int minX1 = 0;
int minX2 = 0;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h b/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
index 52bb28600..1a1f53d9a 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
+++ b/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
@@ -48,7 +48,7 @@ protected:
private:
void init();
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames; //only one entry for QKrit-CoProcessor: Q
std::vector<std::vector<double> > data;
std::vector<std::vector<SPtr<Block3D> > > blockVector;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp b/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
index c1a3b76f2..79dafae06 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
+++ b/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
@@ -285,7 +285,7 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
//int ghostLayerWidth = kernel->getGhostLayerWidth();
//knotennummerierung faengt immer bei 0 an!
- int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
+ unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = iMinC;
int minX2 = iMinC;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h b/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
index 844beb9ff..9a9df0f80 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
+++ b/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
@@ -69,7 +69,7 @@ protected:
private:
SPtr<Communicator> comm;
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::vector<std::vector<SPtr<Block3D> > > blockVector;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp b/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
index 3ca28306c..e3a4f4ee9 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
+++ b/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
@@ -124,7 +124,7 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
//int ghostLayerWidth = kernel->getGhostLayerWidth();
//knotennummerierung faengt immer bei 0 an!
- int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
+ unsigned int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
int minX1 = 0;
int minX2 = 0;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h b/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
index 811bf808d..2fd39b030 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
+++ b/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
@@ -28,7 +28,7 @@ protected:
private:
void init();
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::vector<std::vector<SPtr<Block3D> > > blockVector;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
index d4b4df1d0..d74e1edf3 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
+++ b/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
@@ -130,7 +130,7 @@ void WriteBoundaryConditionsCoProcessor::addDataGeo(SPtr<Block3D> block)
SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
//knotennummerierung faengt immer bei 0 an!
- int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
+ unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = 0;
int minX2 = 0;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h b/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
index bbbca20b0..407d56b3e 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
+++ b/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
@@ -31,7 +31,7 @@ protected:
private:
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::string path;
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
index 5ee510009..25ce8cd39 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
@@ -139,7 +139,7 @@ void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
LBMReal vx1,vx2,vx3,rho;
//knotennummerierung faengt immer bei 0 an!
- int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
+ unsigned int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
if(block->getKernel()->getCompressible())
{
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h b/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
index ca6e2fcb4..e112fc10a 100644
--- a/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
+++ b/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
@@ -35,7 +35,7 @@ protected:
private:
void init();
std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
+ std::vector<UbTupleUInt8> cells;
std::vector<std::string> datanames;
std::vector<std::vector<double> > data;
std::string path;
--
GitLab