nearly workinh version on hokiespeed (wp avg is nan)

This commit is contained in:
James McClure 2015-06-26 19:44:45 -04:00
parent 10fd1cd8ff
commit 68a59e8ea3
2 changed files with 3 additions and 5 deletions

View File

@ -1084,7 +1084,6 @@ __global__ void dvc_ColorCollideOpt( char *ID, double *disteven, double *distod
}// check if n is in the solid
}
} // loop over n
}
@ -1384,13 +1383,13 @@ __global__ void dvc_ComputePhi(char *ID, double *Phi, double *Den, int N)
//........Get 1-D index for this thread....................
n = S*blockIdx.x*blockDim.x + s*blockDim.x + threadIdx.x;
if (n<N){
// id=ID[n];
// if (id != 0){
id=ID[n];
if (id != 0){
// Get the density value (Streaming already performed)
Na = Den[n];
Nb = Den[N+n];
Phi[n] = (Na-Nb)/(Na+Nb);
// }
}
}
}
//...................................................................

View File

@ -1558,7 +1558,6 @@ int main(int argc, char **argv)
MPI_Barrier(MPI_COMM_WORLD);
//
// Timestep completed!
timestep++;
//...................................................................