Skip to content
Snippets Groups Projects
Commit fb9dd66b authored by Martin Schönherr's avatar Martin Schönherr :speech_balloon:
Browse files

delete InitAdvectionDiffusionCompressibleD3Q7

parent 3994e11f
No related branches found
No related tags found
1 merge request!302[GPU] CleanUp inits
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 305 deletions
src/gpu/core/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.cpp
+ 0
− 4
View file @ fb9dd66b
......@@ -32,7 +32,6 @@
#include "PreProcessor/PreProcessorImp.h"
#include "PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionCompressibleD3Q7/InitAdvectionDiffusionCompressibleD3Q7.h"
#include "PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionCompressible/InitAdvectionDiffusionCompressible.h"
#include "PreProcessor/PreProcessorStrategy/InitNavierStokesCompressible/InitNavierStokesCompressible.h"
#include "PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionIncompressible/InitAdvectionDiffusionIncompressible.h"
......@@ -66,9 +65,6 @@ std::shared_ptr<PreProcessorStrategy> PreProcessorFactoryImp::makePreProcessorSt
case InitAdvectionDiffusionIncompressible:
return InitAdvectionDiffusionIncompressible::getNewInstance(para);
break;
case InitAdvectionDiffusionCompressibleD3Q7:
return InitAdvectionDiffusionCompressibleD3Q7::getNewInstance(para);
break;
case InitAdvectionDiffusionCompressible:
return InitAdvectionDiffusionCompressible::getNewInstance(para);
break;
......
src/gpu/core/PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionCompressibleD3Q7/InitAdvectionDiffusionCompressibleD3Q7.cu deleted 100644 → 0
+ 0
− 73
View file @ 3994e11f
//=======================================================================================
// ____ ____ __ ______ __________ __ __ __ __
// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
// \ \ | | | | | |_) | | | | | | | / \ | |
// \ \ | | | | | _ / | | | | | | / /\ \ | |
// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
// \ \ | | ________________________________________________________________
// \ \ | | | ______________________________________________________________|
// \ \| | | | __ __ __ __ ______ _______
// \ | | |_____ | | | | | | | | | _ \ / _____)
// \ | | _____| | | | | | | | | | | \ \ \_______
// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
// \ _____| |__| |________| \_______/ |__| |______/ (_______/
//
// This file is part of VirtualFluids. VirtualFluids is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
//
// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \author Martin Schoenherr
//=======================================================================================
#include "InitAdvectionDiffusionCompressibleD3Q7.h"
#include "InitAdvectionDiffusionCompressibleD3Q7_Device.cuh"
#include "Parameter/Parameter.h"
#include <cuda_helper/CudaGrid.h>
std::shared_ptr<InitAdvectionDiffusionCompressibleD3Q7> InitAdvectionDiffusionCompressibleD3Q7::getNewInstance(std::shared_ptr<Parameter> para)
{
return std::shared_ptr<InitAdvectionDiffusionCompressibleD3Q7>(new InitAdvectionDiffusionCompressibleD3Q7(para));
}
void InitAdvectionDiffusionCompressibleD3Q7::init(int level)
{
vf::cuda::CudaGrid grid = vf::cuda::CudaGrid(para->getParD(level)->numberofthreads, para->getParD(level)->numberOfNodes);
InitAdvectionDiffusionCompressibleD3Q7_Device <<< grid.grid, grid.threads >>>(
para->getParD(level)->neighborX,
para->getParD(level)->neighborY,
para->getParD(level)->neighborZ,
para->getParD(level)->typeOfGridNode,
para->getParD(level)->concentration,
para->getParD(level)->velocityX,
para->getParD(level)->velocityY,
para->getParD(level)->velocityZ,
para->getParD(level)->numberOfNodes,
para->getParD(level)->distributionsAD7.f[0],
para->getParD(level)->isEvenTimestep);
getLastCudaError("InitAdvectionDiffusionCompressibleD3Q7_Device execution failed");
}
bool InitAdvectionDiffusionCompressibleD3Q7::checkParameter()
{
return false;
}
InitAdvectionDiffusionCompressibleD3Q7::InitAdvectionDiffusionCompressibleD3Q7(std::shared_ptr<Parameter> para)
{
this->para = para;
}
InitAdvectionDiffusionCompressibleD3Q7::InitAdvectionDiffusionCompressibleD3Q7()
{
}
src/gpu/core/PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionCompressibleD3Q7/InitAdvectionDiffusionCompressibleD3Q7.h deleted 100644 → 0
+ 0
− 52
View file @ 3994e11f
//=======================================================================================
// ____ ____ __ ______ __________ __ __ __ __
// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
// \ \ | | | | | |_) | | | | | | | / \ | |
// \ \ | | | | | _ / | | | | | | / /\ \ | |
// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
// \ \ | | ________________________________________________________________
// \ \ | | | ______________________________________________________________|
// \ \| | | | __ __ __ __ ______ _______
// \ | | |_____ | | | | | | | | | _ \ / _____)
// \ | | _____| | | | | | | | | | | \ \ \_______
// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
// \ _____| |__| |________| \_______/ |__| |______/ (_______/
//
// This file is part of VirtualFluids. VirtualFluids is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
//
// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \author Martin Schoenherr
//=======================================================================================
#ifndef InitAdvectionDiffusionCompressibleD3Q7_H
#define InitAdvectionDiffusionCompressibleD3Q7_H
#include "PreProcessor/PreProcessorStrategy/PreProcessorStrategy.h"
#include <memory>
class Parameter;
class InitAdvectionDiffusionCompressibleD3Q7 : public PreProcessorStrategy
{
public:
static std::shared_ptr<InitAdvectionDiffusionCompressibleD3Q7> getNewInstance(std::shared_ptr< Parameter> para);
void init(int level);
bool checkParameter();
private:
InitAdvectionDiffusionCompressibleD3Q7();
InitAdvectionDiffusionCompressibleD3Q7(std::shared_ptr< Parameter> para);
std::shared_ptr< Parameter> para;
};
#endif
\ No newline at end of file
src/gpu/core/PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionCompressibleD3Q7/InitAdvectionDiffusionCompressibleD3Q7_Device.cu deleted 100644 → 0
+ 0
− 125
View file @ 3994e11f
//=======================================================================================
// ____ ____ __ ______ __________ __ __ __ __
// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
// \ \ | | | | | |_) | | | | | | | / \ | |
// \ \ | | | | | _ / | | | | | | / /\ \ | |
// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
// \ \ | | ________________________________________________________________
// \ \ | | | ______________________________________________________________|
// \ \| | | | __ __ __ __ ______ _______
// \ | | |_____ | | | | | | | | | _ \ / _____)
// \ | | _____| | | | | | | | | | | \ \ \_______
// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
// \ _____| |__| |________| \_______/ |__| |______/ (_______/
//
// This file is part of VirtualFluids. VirtualFluids is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
//
// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \author Martin Schoenherr
//=======================================================================================
#include "LBM/LB.h"
#include "lbm/constants/D3Q27.h"
#include <basics/constants/NumericConstants.h>
using namespace vf::basics::constant;
using namespace vf::lbm::dir;
#include "math.h"
__global__ void InitAdvectionDiffusionCompressibleD3Q7_Device(unsigned int* neighborX,
unsigned int* neighborY,
unsigned int* neighborZ,
unsigned int* geoD,
real* Conc,
real* ux,
real* uy,
real* uz,
unsigned int size_Mat,
real* DD7,
bool EvenOrOdd)
{
////////////////////////////////////////////////////////////////////////////////
const unsigned x = threadIdx.x; // Globaler x-Index
const unsigned y = blockIdx.x; // Globaler y-Index
const unsigned z = blockIdx.y; // Globaler z-Index
const unsigned nx = blockDim.x;
const unsigned ny = gridDim.x;
const unsigned k = nx*(ny*z + y) + x;
//////////////////////////////////////////////////////////////////////////
if (k<size_Mat)
{
////////////////////////////////////////////////////////////////////////////////
unsigned int BC;
BC = geoD[k];
if (BC != GEO_SOLID && BC != GEO_VOID)
{
Distributions7 D7;
if (EvenOrOdd == true)
{
D7.f[0] = &DD7[0 * size_Mat];
D7.f[1] = &DD7[1 * size_Mat];
D7.f[2] = &DD7[2 * size_Mat];
D7.f[3] = &DD7[3 * size_Mat];
D7.f[4] = &DD7[4 * size_Mat];
D7.f[5] = &DD7[5 * size_Mat];
D7.f[6] = &DD7[6 * size_Mat];
}
else
{
D7.f[0] = &DD7[0 * size_Mat];
D7.f[2] = &DD7[1 * size_Mat];
D7.f[1] = &DD7[2 * size_Mat];
D7.f[4] = &DD7[3 * size_Mat];
D7.f[3] = &DD7[4 * size_Mat];
D7.f[6] = &DD7[5 * size_Mat];
D7.f[5] = &DD7[6 * size_Mat];
}
//////////////////////////////////////////////////////////////////////////
real ConcD = Conc[k];
real vx1 = ux[k];
real vx2 = uy[k];
real vx3 = uz[k];
real lambdaD = -c3o1 + sqrt(c3o1);
real Diffusivity = c1o20;
real Lam = -(c1o2 + c1o1 / lambdaD);
real nue_d = Lam / c3o1;
real ae = Diffusivity / nue_d - c1o1;
real ux_sq = vx1 * vx1;
real uy_sq = vx2 * vx2;
real uz_sq = vx3 * vx3;
//////////////////////////////////////////////////////////////////////////
//index
//////////////////////////////////////////////////////////////////////////
unsigned int kzero = k;
unsigned int ke = k;
unsigned int kw = neighborX[k];
unsigned int kn = k;
unsigned int ks = neighborY[k];
unsigned int kt = k;
unsigned int kb = neighborZ[k];
//////////////////////////////////////////////////////////////////////////
(D7.f[0])[kzero] = ConcD*(c1o3*(ae*(-c3o1)) - (ux_sq + uy_sq + uz_sq));
(D7.f[1])[ke] = ConcD*(c1o6*(ae + c1o1) + c1o2*(ux_sq)+vx1*c1o2);
(D7.f[2])[kw] = ConcD*(c1o6*(ae + c1o1) + c1o2*(ux_sq)-vx1*c1o2);
(D7.f[3])[kn] = ConcD*(c1o6*(ae + c1o1) + c1o2*(uy_sq)+vx2*c1o2);
(D7.f[4])[ks] = ConcD*(c1o6*(ae + c1o1) + c1o2*(uy_sq)-vx2*c1o2);
(D7.f[5])[kt] = ConcD*(c1o6*(ae + c1o1) + c1o2*(uz_sq)+vx3*c1o2);
(D7.f[6])[kb] = ConcD*(c1o6*(ae + c1o1) + c1o2*(uz_sq)-vx3*c1o2);
}
}
}
\ No newline at end of file
src/gpu/core/PreProcessor/PreProcessorStrategy/InitAdvectionDiffusionCompressibleD3Q7/InitAdvectionDiffusionCompressibleD3Q7_Device.cuh deleted 100644 → 0
+ 0
− 50
View file @ 3994e11f
//=======================================================================================
// ____ ____ __ ______ __________ __ __ __ __
// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
// \ \ | | | | | |_) | | | | | | | / \ | |
// \ \ | | | | | _ / | | | | | | / /\ \ | |
// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
// \ \ | | ________________________________________________________________
// \ \ | | | ______________________________________________________________|
// \ \| | | | __ __ __ __ ______ _______
// \ | | |_____ | | | | | | | | | _ \ / _____)
// \ | | _____| | | | | | | | | | | \ \ \_______
// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
// \ _____| |__| |________| \_______/ |__| |______/ (_______/
//
// This file is part of VirtualFluids. VirtualFluids is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
//
// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \author Martin Schoenherr
//=======================================================================================
#ifndef InitAdvectionDiffusionCompressibleD3Q7_Device_H
#define InitAdvectionDiffusionCompressibleD3Q7_Device_H
#include <DataTypes.h>
#include <curand.h>
__global__ void InitAdvectionDiffusionCompressibleD3Q7_Device(
unsigned int* neighborX,
unsigned int* neighborY,
unsigned int* neighborZ,
unsigned int* geoD,
real* Conc,
real* ux,
real* uy,
real* uz,
unsigned int size_Mat,
real* DD7,
bool EvenOrOdd);
#endif
\ No newline at end of file
src/gpu/core/PreProcessor/PreProcessorType.h
+ 0
− 1
View file @ fb9dd66b
......@@ -37,7 +37,6 @@ enum PreProcessorType
InitNavierStokesCompressible,
InitAdvectionDiffusionIncompressibleD3Q7,
InitAdvectionDiffusionIncompressible,
InitAdvectionDiffusionCompressibleD3Q7,
InitAdvectionDiffusionCompressible
};
#endif
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment