OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor color

Browse Source
This commit is contained in:
James E McClure
2018-08-03 14:52:39 -04:00
parent 90eacdd634
commit 37541278c9
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
analysis/runAnalysis.cpp
View File

@@ -582,7 +582,7 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
// Copy the members of Averages to the cpu (phase was copied above)
PROFILE_START("Copy-Pressure",1);
ScaLBL_D3Q19_Pressure(fq,Pressure,d_Np);
ScaLBL_D3Q19_Momentum(fq,Velocity,d_Np);
//ScaLBL_D3Q19_Momentum(fq,Velocity,d_Np);
ScaLBL_DeviceBarrier();
PROFILE_STOP("Copy-Pressure",1);
PROFILE_START("Copy-Wait",1);

12
cpu/Color.cpp
View File

@@ -1770,9 +1770,9 @@ extern "C" void ScaLBL_D3Q19_AAeven_Color(int *Map, double *dist, double *Aq, do
ux = jx / rho0;
uy = jy / rho0;
uz = jz / rho0;
//Velocity[n] = ux;
//Velocity[Np+n] = uy;
//Velocity[2*Np+n] = uz;
Velocity[n] = ux;
Velocity[Np+n] = uy;
Velocity[2*Np+n] = uz;
// Instantiate mass transport distributions
// Stationary value - distribution 0
@@ -2418,9 +2418,9 @@ extern "C" void ScaLBL_D3Q19_AAodd_Color(int *neighborList, int *Map, double *di
ux = jx / rho0;
uy = jy / rho0;
uz = jz / rho0;
//Velocity[n] = ux;
//Velocity[Np+n] = uy;
//Velocity[2*Np+n] = uz;
Velocity[n] = ux;
Velocity[Np+n] = uy;
Velocity[2*Np+n] = uz;
// Instantiate mass transport distributions
// Stationary value - distribution 0

12
gpu/Color.cu
View File

@@ -1762,9 +1762,9 @@ __global__ void dvc_ScaLBL_D3Q19_AAeven_Color(int *Map, double *dist, double *A
ux = jx / rho0;
uy = jy / rho0;
uz = jz / rho0;
//Velocity[n] = ux;
//Velocity[Np+n] = uy;
//Velocity[2*Np+n] = uz;
Velocity[n] = ux;
Velocity[Np+n] = uy;
Velocity[2*Np+n] = uz;
// Instantiate mass transport distributions
// Stationary value - distribution 0
@@ -2411,9 +2411,9 @@ __global__ void dvc_ScaLBL_D3Q19_AAodd_Color(int *neighborList, int *Map, double
ux = jx / rho0;
uy = jy / rho0;
uz = jz / rho0;
//Velocity[n] = ux;
//Velocity[Np+n] = uy;
//Velocity[2*Np+n] = uz;
Velocity[n] = ux;
Velocity[Np+n] = uy;
Velocity[2*Np+n] = uz;
// Instantiate mass transport distributions
// Stationary value - distribution 0