Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

This commit is contained in:
James E McClure
2015-07-19 12:09:15 -04:00
3 changed files with 7 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
0.7
1.0e-2 0.95 0.8
1.0e-2 0.95 -0.8
0.7
0.0 0.0 0.0
0 0 1.05 0.95
1000 20000 1e-5
1005 20000 1e-5

View File

@@ -1,4 +1,4 @@
3 3 3
2 2 2
180 180 180
1896
1.0 1.0 1.0

View File

@@ -496,14 +496,12 @@ extern "C" void ComputePressureD3Q19(char *ID, double *disteven, double *distodd
dvc_ComputePressureD3Q19<<< NBLOCKS,NTHREADS >>>(ID, disteven, distodd, Pressure, Nx, Ny, Nz);
}
extern "C" void ScaLBL_D3Q19_Velocity_BC_z(double *disteven, double *distodd, double uz,
int Nx, int Ny, int Nz){
extern "C" void ScaLBL_D3Q19_Velocity_BC_z(double *disteven, double *distodd, double uz,int Nx, int Ny, int Nz){
int GRID = Nx*Ny / 512 + 1;
dvc_D3Q19_Velocity_BC_z<<<GRID,512>>>(double *disteven, double *distodd, double uz, int Nx, int Ny, int Nz);
dvc_D3Q19_Velocity_BC_z<<<GRID,512>>>(disteven,distodd, uz, Nx, Ny, Nz);
}
extern "C" void ScaLBL_D3Q19_Velocity_BC_Z(double *disteven, double *distodd, double uz,
int Nx, int Ny, int Nz, int outlet){
extern "C" void ScaLBL_D3Q19_Velocity_BC_Z(double *disteven, double *distodd, double uz, int Nx, int Ny, int Nz, int outlet){
int GRID = Nx*Ny / 512 + 1;
dvc_D3Q19_Velocity_BC_Z<<<GRID,512>>>(double *disteven, double *distodd, double uz, int Nx, int Ny, int Nz, int outlet);
dvc_D3Q19_Velocity_BC_Z<<<GRID,512>>>(disteven, distodd, uz, Nx, Ny, Nz, outlet);
}