diff --git a/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp b/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp index e709bf0970a373d6a43e781fe4674b32a04523f3..219914cf784baa74c11397ebed20eda03266ac98 100644 --- a/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp +++ b/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp @@ -50,8 +50,8 @@ void calcDragLift(Parameter* para, CudaMemoryManager* cudaManager, int lev) //double A = 110.0 * 28.0; //Ship width times height in fine nodes //double delta_x = 0.0045;//[m] fine //double delta_t = para->getVelocity() * delta_x / 15.96; - //double LBtoSI = 1.204 * (pow(delta_x, 4))/(pow(delta_t,2));//rho_SI * delta_x^4 / delta_t^2 = 1.204 kg/m� * (0.0045m)^4 / (0.00000757s)^2 ... LB to kg*m/s� - //double LBtoSI = 1000 * (pow(delta_x, 4))/(pow(delta_t,2));//rho_SI * delta_x^4 / delta_t^2 = 1000 kg/m� * (0.1m)^4 / (0.00187s)^2 ... LB to kg*m/s� + //double LBtoSI = 1.204 * (pow(delta_x, 4))/(pow(delta_t,2));//rho_SI * delta_x^4 / delta_t^2 = 1.204 kg/m^3 * (0.0045m)^4 / (0.00000757s)^2 ... LB to kg*m/s^2 + //double LBtoSI = 1000 * (pow(delta_x, 4))/(pow(delta_t,2));//rho_SI * delta_x^4 / delta_t^2 = 1000 kg/m^3 * (0.1m)^4 / (0.00187s)^2 ... LB to kg*m/s^2 for (int it = 0; it < para->getParH(lev)->QGeom.kQ; it++) { diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp index 0415003d2df051cd22157ecf2c4a43fd89695a5f..a8928462f9832b44b419cd831d1e1e95f6541c85 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp +++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp @@ -654,9 +654,9 @@ void Parameter::initParameter() parH[i]->mTtoWx = (real)pow(0.5f,i); parH[i]->mTtoWy = (real)pow(0.5f,i); parH[i]->mTtoWz = (real)pow(0.5f,i); - parH[i]->cTtoWx = (real)(STARTOFFX/2.f + (parH[i]->gridNX+1.f)/4.f); //funzt nur f�r zwei level - parH[i]->cTtoWy = (real)(STARTOFFY/2.f + (parH[i]->gridNY+1.f)/4.f); //funzt nur f�r zwei level - parH[i]->cTtoWz = (real)(STARTOFFZ/2.f + (parH[i]->gridNZ+1.f)/4.f); //funzt nur f�r zwei level + parH[i]->cTtoWx = (real)(STARTOFFX/2.f + (parH[i]->gridNX+1.f)/4.f); //funzt nur fuer zwei level + parH[i]->cTtoWy = (real)(STARTOFFY/2.f + (parH[i]->gridNY+1.f)/4.f); //funzt nur fuer zwei level + parH[i]->cTtoWz = (real)(STARTOFFZ/2.f + (parH[i]->gridNZ+1.f)/4.f); //funzt nur fuer zwei level ////MGs Trafo/////////////////////////////////////////////////////////////// //parH[i]->cStartx = (real)parH[i]->XdistKn; //parH[i]->cStarty = (real)parH[i]->XdistKn; @@ -896,21 +896,21 @@ void Parameter::fillSparse(int level) //parH[level]->vx_SP[parH[level]->k[m]] = (real)((32. * 32. * 3.) / (1000.*(real)parH[level]->gridNX));//(real)parH[level]->gridNX / (real)1000 * 3.0; //parH[level]->vy_SP[parH[level]->k[m]] = (real)((getVelocity() * sin(2.0 * i / parH[level]->gridNX * PI) * cos(2.0 * k / parH[level]->gridNZ * PI)) * (32. / (real)parH[level]->gridNX)); //parH[level]->vz_SP[parH[level]->k[m]] = (real)0.0f; - //schr�g x + //schraeg x // parH[level]->vx_SP[parH[level]->k[m]] = (real)((32. * 32. * 3.)/(1000.*(real)parH[level]->gridNX) + (getVelocity() * cos((2.0 * k / parH[level]->gridNZ * PI) + (2.0 * i / parH[level]->gridNX * PI)))); // parH[level]->vy_SP[parH[level]->k[m]] = (real)0.0; // parH[level]->vz_SP[parH[level]->k[m]] = (real)(getVelocity() * cos((2.0 * k / parH[level]->gridNZ * PI) + (2.0 * i / parH[level]->gridNX * PI))); - //schr�g z + //schraeg z //parH[level]->vx_SP[parH[level]->k[m]] = (real)(getVelocity() * std::cos((2.0 * k / parH[level]->gridNZ * PI) + (2.0 * i / parH[level]->gridNX * PI))); //parH[level]->vy_SP[parH[level]->k[m]] = (real)0.0; //parH[level]->vz_SP[parH[level]->k[m]] = (real)((32. * 32. * 3.)/(1000.*(real)parH[level]->gridNZ) + (getVelocity() * std::cos((2.0 * k / parH[level]->gridNZ * PI) + (2.0 * i / parH[level]->gridNX * PI)))); //Taylor Green Vortex uniform parH[level]->rho_SP[parH[level]->k[m]] = (real)((getVelocity()*getVelocity())*3.0/4.0*(cos((i)*4.0*PI/(real)parH[level]->gridNX)+cos((k)*4.0*PI/(real)parH[level]->gridNZ)))*(real)(parH[level]->gridNZ)/(real)(parH[level]->gridNX); - //inkl. �berlagerter Geschwindigkeit + //inkl. ueberlagerter Geschwindigkeit // parH[level]->vx_SP[parH[level]->k[m]] = (real)((32. * 32. * 3.)/(1000.*(real)parH[level]->gridNX) + getVelocity()*sin(((i)*2.0*PI/(real)parH[level]->gridNX))*cos((k)*2.0*PI/(real)parH[level]->gridNZ)); parH[level]->vx_SP[parH[level]->k[m]] = (real)((32. * 32. * 3.)/(1000. * 32.) * getVelocity() / 0.001 + getVelocity()*sin(((i)*2.0*PI/(real)parH[level]->gridNX))*cos((k)*2.0*PI/(real)parH[level]->gridNZ)); - //ohne �berlagerter Geschwindigkeit + //ohne ueberlagerter Geschwindigkeit // parH[level]->vx_SP[parH[level]->k[m]] = (real)(getVelocity()*sin(((i)*2.0*PI/(real)parH[level]->gridNX))*cos((k)*2.0*PI/(real)parH[level]->gridNZ)); parH[level]->vy_SP[parH[level]->k[m]] = (real)0.0; parH[level]->vz_SP[parH[level]->k[m]] = (real)(-getVelocity()*cos(((i)*2.0*PI/(real)parH[level]->gridNX))*sin((k)*2.0*PI/(real)parH[level]->gridNZ))*(real)(parH[level]->gridNZ)/(real)(parH[level]->gridNX); @@ -1708,7 +1708,7 @@ void Parameter::cudaFreeGeomValuesBC(int lev) checkCudaErrors( cudaFreeHost(parH[lev]->QGeom.Vy)); checkCudaErrors( cudaFreeHost(parH[lev]->QGeom.Vz)); } -//Geometrie inkl. Normale f�r Slip +//Geometrie inkl. Normale fuer Slip void Parameter::cudaAllocGeomNormals(int lev) { unsigned int mem_size_Q_k = sizeof(int)*parH[lev]->QGeomNormalX.kQ; @@ -1755,7 +1755,7 @@ void Parameter::cudaFreeGeomNormals(int lev) checkCudaErrors( cudaFreeHost(parH[lev]->QGeomNormalZ.q27[0])); checkCudaErrors( cudaFreeHost(parH[lev]->QGeomNormalZ.k)); } -//Geometrie inkl. Normale f�r Inflow +//Geometrie inkl. Normale fuer Inflow void Parameter::cudaAllocInflowNormals(int lev) { unsigned int mem_size_Q_k = sizeof(int)*parH[lev]->QInflowNormalX.kQ; @@ -1802,7 +1802,7 @@ void Parameter::cudaFreeInflowNormals(int lev) checkCudaErrors( cudaFreeHost(parH[lev]->QInflowNormalZ.q27[0])); checkCudaErrors( cudaFreeHost(parH[lev]->QInflowNormalZ.k)); } -//Geometrie inkl. Normale f�r Outflow +//Geometrie inkl. Normale fuer Outflow void Parameter::cudaAllocOutflowNormals(int lev) { unsigned int mem_size_Q_k = sizeof(int)*parH[lev]->QOutflowNormalX.kQ;