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

Updated Color BC compiles cleanly

Browse Source
This commit is contained in:
James E McClure
2017-11-27 07:45:51 -05:00
parent ea21a7ff86
commit 1dd592d48a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/Color.cpp
View File

@@ -108,6 +108,7 @@ extern "C" void ScaLBL_Color_BC_z(double *Phi, double *Den, double *Velocity, do
{
int i,j,k,n,N;
double na,nb,ux,uy,uz;
double a1,b1,a2,b2;
N = Nx*Ny*Nz;
// Fill the inlet with component a
@@ -211,6 +212,7 @@ extern "C" void ScaLBL_Color_BC_Z(double *Phi, double *Den, double *Velocity, do
{
int i,j,k,n,N;
double na,nb,ux,uy,uz;
double a1,b1,a2,b2;
N = Nx*Ny*Nz;
// Fill the outlet with component b

8
tests/TestBubble.cpp
View File

@@ -601,12 +601,12 @@ int main(int argc, char **argv)
}
if (pBC && kproc == 0) {
ScaLBL_D3Q19_Pressure_BC_z(f_even,f_odd,din,Nx,Ny,Nz);
ScaLBL_Color_BC_z(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
ScaLBL_Color_BC_z(Phi,Den,Velocity,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
}
if (pBC && kproc == nprocz-1){
ScaLBL_D3Q19_Pressure_BC_Z(f_even,f_odd,dout,Nx,Ny,Nz,Nx*Ny*(Nz-2));
ScaLBL_Color_BC_Z(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
ScaLBL_Color_BC_Z(Phi,Den,Velocity,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
}
//...........................................................................
@@ -710,12 +710,12 @@ int main(int argc, char **argv)
// Pressure boundary conditions
if (pBC && kproc == 0) {
ScaLBL_D3Q19_Pressure_BC_z(f_even,f_odd,din,Nx,Ny,Nz);
ScaLBL_Color_BC_z(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
ScaLBL_Color_BC_z(Phi,Den,Velocity,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
}
if (pBC && kproc == nprocz-1){
ScaLBL_D3Q19_Pressure_BC_Z(f_even,f_odd,dout,Nx,Ny,Nz,Nx*Ny*(Nz-2));
ScaLBL_Color_BC_Z(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
ScaLBL_Color_BC_Z(Phi,Den,Velocity,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz);
}
//...................................................................................