Skip to content
Snippets Groups Projects
Commit 30dd35aa authored by Soeren Peters's avatar Soeren Peters
Browse files

Fix unsigned misused in node numbering.

parent f69c67c9
No related branches found
No related tags found
1 merge request!20Remove all warnings in VirtualFluids CPU (Closes #6, #7)
......@@ -243,9 +243,6 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
// int ghostLayerWidth = kernel->getGhostLayerWidth();
// knotennummerierung faengt immer bei 0 an!
unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = 0;
int minX2 = 0;
int minX3 = 0;
......@@ -313,6 +310,8 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
maxX2 -= 1;
maxX3 -= 1;
int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
// cell vector erstellen
for (int ix3 = minX3; ix3 <= maxX3; ix3++) {
for (int ix2 = minX2; ix2 <= maxX2; ix2++) {
......@@ -322,7 +321,9 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
(SWT = nodeNumbers(ix1, ix2, ix3 + 1)) >= 0 && (SET = nodeNumbers(ix1 + 1, ix2, ix3 + 1)) >= 0 &&
(NET = nodeNumbers(ix1 + 1, ix2 + 1, ix3 + 1)) >= 0 &&
(NWT = nodeNumbers(ix1, ix2 + 1, ix3 + 1)) >= 0) {
cells.push_back(makeUbTuple(SWB, SEB, NEB, NWB, SWT, SET, NET, NWT));
cells.push_back(makeUbTuple((unsigned int)SWB, (unsigned int)SEB, (unsigned int)NEB,
(unsigned int)NWB, (unsigned int)SWT, (unsigned int)SET,
(unsigned int)NET, (unsigned int)NWT));
}
}
}
......
......@@ -104,8 +104,6 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = 0;
int minX2 = 0;
int minX3 = 0;
......@@ -179,6 +177,9 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
maxX1 -= 1;
maxX2 -= 1;
maxX3 -= 1;
int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
// cell vector erstellen
for (int ix3 = minX3; ix3 <= maxX3; ix3++) {
for (int ix2 = minX2; ix2 <= maxX2; ix2++) {
......@@ -189,7 +190,9 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
(NET = nodeNumbers(ix1 + 1, ix2 + 1, ix3 + 1)) >= 0 &&
(NWT = nodeNumbers(ix1, ix2 + 1, ix3 + 1)) >= 0) {
// for valid points: neighbors are added to cells-vector
cells.push_back(makeUbTuple(SWB, SEB, NEB, NWB, SWT, SET, NET, NWT));
cells.push_back(makeUbTuple((unsigned int)SWB, (unsigned int)SEB, (unsigned int)NEB,
(unsigned int)NWB, (unsigned int)SWT, (unsigned int)SET,
(unsigned int)NET, (unsigned int)NWT));
}
}
}
......
......@@ -252,9 +252,6 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
SPtr<AverageValuesArray3D> at = kernel->getDataSet()->getAverageTriplecorrelations();
// int ghostLayerWidth = kernel->getGhostLayerWidth();
// knotennummerierung faengt immer bei 0 an!
unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = iMinC;
int minX2 = iMinC;
int minX3 = iMinC;
......@@ -335,6 +332,8 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
maxX2 -= 1;
maxX3 -= 1;
int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
// cell vector erstellen
for (int ix3 = minX3; ix3 <= maxX3; ix3++) {
for (int ix2 = minX2; ix2 <= maxX2; ix2++) {
......@@ -344,7 +343,9 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
(SWT = nodeNumbers(ix1, ix2, ix3 + 1)) >= 0 && (SET = nodeNumbers(ix1 + 1, ix2, ix3 + 1)) >= 0 &&
(NET = nodeNumbers(ix1 + 1, ix2 + 1, ix3 + 1)) >= 0 &&
(NWT = nodeNumbers(ix1, ix2 + 1, ix3 + 1)) >= 0) {
cells.push_back(makeUbTuple(SWB, SEB, NEB, NWB, SWT, SET, NET, NWT));
cells.push_back(makeUbTuple((unsigned int)SWB, (unsigned int)SEB, (unsigned int)NEB,
(unsigned int)NWB, (unsigned int)SWT, (unsigned int)SET,
(unsigned int)NET, (unsigned int)NWT));
}
}
}
......
......@@ -114,9 +114,6 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
// int ghostLayerWidth = kernel->getGhostLayerWidth();
// knotennummerierung faengt immer bei 0 an!
unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
int minX1 = 0;
int minX2 = 0;
int minX3 = 0;
......@@ -161,6 +158,9 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
}
}
}
int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
// cell std::vector erstellen
for (int ix3 = minX3; ix3 < maxX3 - 1; ix3++) {
for (int ix2 = minX2; ix2 < maxX2 - 1; ix2++) {
......@@ -170,7 +170,9 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
(SWT = nodeNumbers(ix1, ix2, ix3 + 1)) >= 0 && (SET = nodeNumbers(ix1 + 1, ix2, ix3 + 1)) >= 0 &&
(NET = nodeNumbers(ix1 + 1, ix2 + 1, ix3 + 1)) >= 0 &&
(NWT = nodeNumbers(ix1, ix2 + 1, ix3 + 1)) >= 0) {
cells.push_back(makeUbTuple(SWB, SEB, NEB, NWB, SWT, SET, NET, NWT));
cells.push_back(makeUbTuple((unsigned int)SWB, (unsigned int)SEB, (unsigned int)NEB,
(unsigned int)NWB, (unsigned int)SWT, (unsigned int)SET,
(unsigned int)NET, (unsigned int)NWT));
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment