From bb205b2976788ae3cbe6942743adb68e29eb24b6 Mon Sep 17 00:00:00 2001
From: "LEGOLAS\\lenz" <lenz@irmb.tu-bs.de>
Date: Fri, 19 Jul 2019 22:26:31 +0200
Subject: [PATCH] changes to room fire target
---
src/GksGpu/Definitions/PassiveScalar.h | 2 +-
src/GksMeshAdapter/GksMeshAdapter.cpp | 16 ++++-----
.../GKS/RoomFireExtended/RoomFireExtended.cpp | 35 ++++++++++---------
3 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/GksGpu/Definitions/PassiveScalar.h b/src/GksGpu/Definitions/PassiveScalar.h
index b71ada48a..97fca44e5 100644
--- a/src/GksGpu/Definitions/PassiveScalar.h
+++ b/src/GksGpu/Definitions/PassiveScalar.h
@@ -1,6 +1,6 @@
#ifndef PassiveScalar_H
#define PassiveScalar_H
-//#define USE_PASSIVE_SCALAR
+#define USE_PASSIVE_SCALAR
#endif
diff --git a/src/GksMeshAdapter/GksMeshAdapter.cpp b/src/GksMeshAdapter/GksMeshAdapter.cpp
index 76611538c..2d2641e36 100644
--- a/src/GksMeshAdapter/GksMeshAdapter.cpp
+++ b/src/GksMeshAdapter/GksMeshAdapter.cpp
@@ -914,15 +914,15 @@ void GksMeshAdapter::getCommunicationIndices()
this->communicationIndices.resize( this->gridBuilder->getNumberOfLevels() );
- int rank = 0;
- MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+ //int rank = 0;
+ //MPI_Comm_rank(MPI_COMM_WORLD, &rank);
- int mpiWorldSize = 1;
- MPI_Comm_size(MPI_COMM_WORLD, &mpiWorldSize);
+ //int mpiWorldSize = 1;
+ //MPI_Comm_size(MPI_COMM_WORLD, &mpiWorldSize);
- MPI_Barrier(MPI_COMM_WORLD);
+ //MPI_Barrier(MPI_COMM_WORLD);
- for( int i = 0; i < rank; i++ ) MPI_Barrier(MPI_COMM_WORLD);
+ //for( int i = 0; i < rank; i++ ) MPI_Barrier(MPI_COMM_WORLD);
for( uint level = 0; level < this->gridBuilder->getNumberOfLevels(); level++ )
{
@@ -947,7 +947,7 @@ void GksMeshAdapter::getCommunicationIndices()
std::stringstream msg;
- msg << "Rank " << rank << " | Level " << level << " | dir " << direction << " | ";
+ msg << "Rank " << /*rank <<*/ " | Level " << level << " | dir " << direction << " | ";
msg << "Send " << this->communicationIndices[level].sendIndices[direction].size() << " | ";
msg << "Recv " << this->communicationIndices[level].recvIndices[direction].size() << std::endl;
@@ -957,7 +957,7 @@ void GksMeshAdapter::getCommunicationIndices()
//////////////////////////////////////////////////////////////////////////
}
- for( int i = rank; i < mpiWorldSize; i++ ) MPI_Barrier(MPI_COMM_WORLD);
+ //for( int i = rank; i < mpiWorldSize; i++ ) MPI_Barrier(MPI_COMM_WORLD);
}
void GksMeshAdapter::writeMeshVTK(std::string filename)
diff --git a/targets/apps/GKS/RoomFireExtended/RoomFireExtended.cpp b/targets/apps/GKS/RoomFireExtended/RoomFireExtended.cpp
index 072e129a3..a78e603a4 100644
--- a/targets/apps/GKS/RoomFireExtended/RoomFireExtended.cpp
+++ b/targets/apps/GKS/RoomFireExtended/RoomFireExtended.cpp
@@ -64,8 +64,10 @@ void thermalCavity( std::string path, std::string simulationName, uint restartIt
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- real LBurner = 1.0;
+ real L = 4.0;
+ real B = 3.0;
+ real LBurner = 1.0;
real HBurner = 0.5;
real Pr = 0.71;
@@ -80,7 +82,8 @@ void thermalCavity( std::string path, std::string simulationName, uint restartIt
real cs = sqrt( ( ( K + 5.0 ) / ( K + 3.0 ) ) / ( 2.0 * prim.lambda ) );
real mu = 1.8e-5;
- real U = 0.015; // 900 kW on top
+ real U = 0.0125; // 900 kW on top
+ //real U = 0.015; // 900 kW on top
//real U = 0.005; // 900 kW all around
real rhoFuel = 0.5405;
@@ -142,32 +145,32 @@ void thermalCavity( std::string path, std::string simulationName, uint restartIt
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- gridBuilder->addCoarseGrid(-2.1, -6.0, -0.1,
- 2.1, 6.0, 3.1, dx);
+ gridBuilder->addCoarseGrid(-2.1, -1.6, -0.1,
+ 2.1, 6.0, 3.0, dx);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#ifdef _WIN32
//TriangularMesh* stl = TriangularMesh::make("F:/Work/Computations/inp/Unterzug.stl");
- TriangularMesh* stl = TriangularMesh::make("F:/Work/Computations/inp/RoomExtended2.stl");
+ TriangularMesh* stl = TriangularMesh::make("F:/Work/Computations/inp/RoomExtended4.stl");
//TriangularMesh* stl = TriangularMesh::make("F:/Work/Computations/inp/RoomExtended3.stl");
#else
//TriangularMesh* stl = TriangularMesh::make("inp/Unterzug.stl");
- TriangularMesh* stl = TriangularMesh::make("inp/RoomExtended2.stl");
+ TriangularMesh* stl = TriangularMesh::make("inp/RoomExtended4.stl");
#endif
gridBuilder->addGeometry(stl);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Cuboid boxCoarse ( -3.0, -3.0, -0.5,
+ Cuboid boxCoarse ( -2.0, -3.0, -0.5,
3.0, 3.0, 3.5 );
gridBuilder->addGrid( &boxCoarse, 1 );
Cuboid boxRef ( -0.6 * LBurner, -0.6 * LBurner, -1.0,
- 0.6 * LBurner, 0.6 * LBurner, 2.0 );
- Cuboid beamRef( -10.0, -0.15, 2.6, 10.0, 0.15, 10.0 );
+ 0.6 * LBurner, 0.6 * LBurner, 10.0 );
+ Cuboid beamRef( -10.0, -0.25, 2.4, 10.0, 0.25, 10.0 );
//boxRef.scale (0.5);
//beamRef.scale(0.5);
@@ -175,11 +178,11 @@ void thermalCavity( std::string path, std::string simulationName, uint restartIt
Conglomerate refRegion1;
refRegion1.add( &boxRef );
- //refRegion1.add( &beamRef );
+ refRegion1.add( &beamRef );
gridBuilder->setNumberOfLayers(0,22);
- gridBuilder->addGrid( &refRegion1, 3 );
+ gridBuilder->addGrid( &refRegion1, 2 );
uint maxLevel = gridBuilder->getNumberOfGridLevels() - 1;
@@ -220,21 +223,21 @@ void thermalCavity( std::string path, std::string simulationName, uint restartIt
////////////////////////////////////////////////////////////////////////////
- SPtr<BoundaryCondition> bcTop = std::make_shared<AdiabaticWall>( dataBase, Vec3(0.0, 0.0, 0.0), true );
+ //SPtr<BoundaryCondition> bcTop = std::make_shared<AdiabaticWall>( dataBase, Vec3(0.0, 0.0, 0.0), true );
- bcTop->findBoundaryCells( meshAdapter, true, [&](Vec3 center){ return center.z > 3.0 || center.z < 0.0; } );
+ //bcTop->findBoundaryCells( meshAdapter, true, [&](Vec3 center){ return center.z > 3.0 || center.z < 0.0; } );
////////////////////////////////////////////////////////////////////////////
SPtr<BoundaryCondition> bcOpen = std::make_shared<Open>( dataBase, prim, 1.0 );
- bcOpen->findBoundaryCells( meshAdapter, false, [&](Vec3 center){ return center.y < -6.0 || center.y > 2.2; } );
+ bcOpen->findBoundaryCells( meshAdapter, false, [&](Vec3 center){ return center.y < -6.0 || center.y > 1.7; } );
////////////////////////////////////////////////////////////////////////////
SPtr<BoundaryCondition> bcPressure = std::make_shared<Pressure2>( dataBase, c1o2 * prim.rho / prim.lambda );
- bcPressure->findBoundaryCells( meshAdapter, false, [&](Vec3 center){ return center.y > 2.2 && center.z > 3.0; } );
+ bcPressure->findBoundaryCells( meshAdapter, false, [&](Vec3 center){ return center.y > 1.7 && center.z > 3.0; } );
//////////////////////////////////////////////////////////////////////////
@@ -254,7 +257,7 @@ void thermalCavity( std::string path, std::string simulationName, uint restartIt
dataBase->boundaryConditions.push_back( bcWall );
- dataBase->boundaryConditions.push_back( bcTop );
+ //dataBase->boundaryConditions.push_back( bcTop );
dataBase->boundaryConditions.push_back( bcOpen );
--
GitLab