From 308ffe5287b13136848576f3b5d80643ab856de7 Mon Sep 17 00:00:00 2001
From: alena <akaranchuk@list.ru>
Date: Wed, 14 Jul 2021 11:00:58 +0200
Subject: [PATCH] Delete lodi-variables from BoundaryCondition-structure in
Restart/MigrationCoprocessor
---
.../CoProcessors/MPIIOCoProcessor.cpp | 2 +-
.../CoProcessors/MPIIOMigrationBECoProcessor.cpp | 10 ----------
.../CoProcessors/MPIIOMigrationCoProcessor.cpp | 10 ----------
.../CoProcessors/MPIIORestartCoProcessor.cpp | 10 ----------
.../VirtualFluidsCore/Parallel/MPIIODataStructures.h | 6 ------
5 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
index fa5ab41b7..bc25bf37f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
@@ -55,7 +55,7 @@ MPIIOCoProcessor::MPIIOCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const
//-----------------------------------------------------------------------
MPI_Datatype typesBC[3] = { MPI_LONG_LONG_INT, MPI_FLOAT, MPI_CHAR };
- int blocksBC[3] = { 5, 38, 1 };
+ int blocksBC[3] = { 5, 33, 1 };
MPI_Aint offsetsBC[3], lbBC, extentBC;
offsetsBC[0] = 0;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
index ef0abd06f..ef2c9d07a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
@@ -691,11 +691,6 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
bouCond->bcVelocityX2 = (float)bcArr->bcvector[bc]->getBoundaryVelocityX2();
bouCond->bcVelocityX3 = (float)bcArr->bcvector[bc]->getBoundaryVelocityX3();
bouCond->bcDensity = (float)bcArr->bcvector[bc]->getBoundaryDensity();
- bouCond->bcLodiDensity = (float)bcArr->bcvector[bc]->getDensityLodiDensity();
- bouCond->bcLodiVelocityX1 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX1();
- bouCond->bcLodiVelocityX2 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX2();
- bouCond->bcLodiVelocityX3 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX3();
- bouCond->bcLodiLentgh = (float)bcArr->bcvector[bc]->getDensityLodiLength();
bouCond->nx1 = (float)bcArr->bcvector[bc]->nx1;
bouCond->nx2 = (float)bcArr->bcvector[bc]->nx2;
bouCond->nx3 = (float)bcArr->bcvector[bc]->nx3;
@@ -1643,11 +1638,6 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
bc->bcVelocityX2 = bcArray[ibc].bcVelocityX2;
bc->bcVelocityX3 = bcArray[ibc].bcVelocityX3;
bc->bcDensity = bcArray[ibc].bcDensity;
- bc->bcLodiDensity = bcArray[ibc].bcLodiDensity;
- bc->bcLodiVelocityX1 = bcArray[ibc].bcLodiVelocityX1;
- bc->bcLodiVelocityX2 = bcArray[ibc].bcLodiVelocityX2;
- bc->bcLodiVelocityX3 = bcArray[ibc].bcLodiVelocityX3;
- bc->bcLodiLentgh = bcArray[ibc].bcLodiLentgh;
bc->nx1 = bcArray[ibc].nx1;
bc->nx2 = bcArray[ibc].nx2;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
index a34e1b4ca..c7f0b8cd1 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
@@ -1482,11 +1482,6 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
bouCond->bcVelocityX2 = (float)bcArr->bcvector[bc]->getBoundaryVelocityX2();
bouCond->bcVelocityX3 = (float)bcArr->bcvector[bc]->getBoundaryVelocityX3();
bouCond->bcDensity = (float)bcArr->bcvector[bc]->getBoundaryDensity();
- bouCond->bcLodiDensity = (float)bcArr->bcvector[bc]->getDensityLodiDensity();
- bouCond->bcLodiVelocityX1 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX1();
- bouCond->bcLodiVelocityX2 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX2();
- bouCond->bcLodiVelocityX3 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX3();
- bouCond->bcLodiLentgh = (float)bcArr->bcvector[bc]->getDensityLodiLength();
bouCond->nx1 = (float)bcArr->bcvector[bc]->nx1;
bouCond->nx2 = (float)bcArr->bcvector[bc]->nx2;
bouCond->nx3 = (float)bcArr->bcvector[bc]->nx3;
@@ -2794,11 +2789,6 @@ void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
bc->bcVelocityX2 = bcArray[ibc].bcVelocityX2;
bc->bcVelocityX3 = bcArray[ibc].bcVelocityX3;
bc->bcDensity = bcArray[ibc].bcDensity;
- bc->bcLodiDensity = bcArray[ibc].bcLodiDensity;
- bc->bcLodiVelocityX1 = bcArray[ibc].bcLodiVelocityX1;
- bc->bcLodiVelocityX2 = bcArray[ibc].bcLodiVelocityX2;
- bc->bcLodiVelocityX3 = bcArray[ibc].bcLodiVelocityX3;
- bc->bcLodiLentgh = bcArray[ibc].bcLodiLentgh;
bc->nx1 = bcArray[ibc].nx1;
bc->nx2 = bcArray[ibc].nx2;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
index f75aaa58f..567e46b6e 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
@@ -1489,11 +1489,6 @@ void MPIIORestartCoProcessor::writeBoundaryConds(int step)
bouCond->bcVelocityX2 = (float)bcArr->bcvector[bc]->getBoundaryVelocityX2();
bouCond->bcVelocityX3 = (float)bcArr->bcvector[bc]->getBoundaryVelocityX3();
bouCond->bcDensity = (float)bcArr->bcvector[bc]->getBoundaryDensity();
- bouCond->bcLodiDensity = (float)bcArr->bcvector[bc]->getDensityLodiDensity();
- bouCond->bcLodiVelocityX1 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX1();
- bouCond->bcLodiVelocityX2 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX2();
- bouCond->bcLodiVelocityX3 = (float)bcArr->bcvector[bc]->getDensityLodiVelocityX3();
- bouCond->bcLodiLentgh = (float)bcArr->bcvector[bc]->getDensityLodiLength();
bouCond->nx1 = (float)bcArr->bcvector[bc]->nx1;
bouCond->nx2 = (float)bcArr->bcvector[bc]->nx2;
bouCond->nx3 = (float)bcArr->bcvector[bc]->nx3;
@@ -2704,11 +2699,6 @@ void MPIIORestartCoProcessor::readBoundaryConds(int step)
bc->bcVelocityX2 = bcArray[index].bcVelocityX2;
bc->bcVelocityX3 = bcArray[index].bcVelocityX3;
bc->bcDensity = bcArray[index].bcDensity;
- bc->bcLodiDensity = bcArray[index].bcLodiDensity;
- bc->bcLodiVelocityX1 = bcArray[index].bcLodiVelocityX1;
- bc->bcLodiVelocityX2 = bcArray[index].bcLodiVelocityX2;
- bc->bcLodiVelocityX3 = bcArray[index].bcLodiVelocityX3;
- bc->bcLodiLentgh = bcArray[index].bcLodiLentgh;
bc->nx1 = bcArray[index].nx1;
bc->nx2 = bcArray[index].nx2;
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
index c8bd2d079..a7272a307 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
@@ -118,12 +118,6 @@ struct BoundaryCondition {
float bcVelocityX3;
float bcDensity;
- float bcLodiDensity;
- float bcLodiVelocityX1;
- float bcLodiVelocityX2;
- float bcLodiVelocityX3;
- float bcLodiLentgh;
-
float nx1, nx2, nx3;
float q[26];
--
GitLab