diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index 5538d578..8a953176 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -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); diff --git a/cpu/Color.cpp b/cpu/Color.cpp index af80d689..a4c78a89 100644 --- a/cpu/Color.cpp +++ b/cpu/Color.cpp @@ -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 diff --git a/gpu/Color.cu b/gpu/Color.cu index 6bd76534..54ace99d 100644 --- a/gpu/Color.cu +++ b/gpu/Color.cu @@ -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