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

Fixing compile warnings

Browse Source
This commit is contained in:
Mark Berrill 2020-01-22 12:19:04 -05:00
parent 78c2e710b9
commit acb2d30454
3 changed files with 267 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

515
cpu/D3Q19.cpp
View File

@ -243,8 +243,6 @@ extern "C" double ScaLBL_D3Q19_Flux_BC_z(double *disteven, double *distodd, doub
// odd distributions in disteven and even distributions in distodd. // odd distributions in disteven and even distributions in distodd.
int n,N; int n,N;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double din = 0.f; double din = 0.f;
N = Nx*Ny*Nz; N = Nx*Ny*Nz;
@ -256,26 +254,26 @@ extern "C" double ScaLBL_D3Q19_Flux_BC_z(double *disteven, double *distodd, doub
// Read distributions from "opposite" memory convention // Read distributions from "opposite" memory convention
//........................................................................ //........................................................................
//........................................................................ //........................................................................
f1 = distodd[n]; double f1 = distodd[n];
f3 = distodd[N+n]; double f3 = distodd[N+n];
f5 = distodd[2*N+n]; //double f5 = distodd[2*N+n];
f7 = distodd[3*N+n]; double f7 = distodd[3*N+n];
f9 = distodd[4*N+n]; double f9 = distodd[4*N+n];
f11 = distodd[5*N+n]; //double f11 = distodd[5*N+n];
f13 = distodd[6*N+n]; double f13 = distodd[6*N+n];
f15 = distodd[7*N+n]; //double f15 = distodd[7*N+n];
f17 = distodd[8*N+n]; double f17 = distodd[8*N+n];
//........................................................................ //........................................................................
f0 = disteven[n]; double f0 = disteven[n];
f2 = disteven[N+n]; double f2 = disteven[N+n];
f4 = disteven[2*N+n]; double f4 = disteven[2*N+n];
f6 = disteven[3*N+n]; double f6 = disteven[3*N+n];
f8 = disteven[4*N+n]; double f8 = disteven[4*N+n];
f10 = disteven[5*N+n]; double f10 = disteven[5*N+n];
f12 = disteven[6*N+n]; double f12 = disteven[6*N+n];
f14 = disteven[7*N+n]; //double f14 = disteven[7*N+n];
f16 = disteven[8*N+n]; double f16 = disteven[8*N+n];
f18 = disteven[9*N+n]; //double f18 = disteven[9*N+n];
//................................................... //...................................................
// Determine the outlet flow velocity // Determine the outlet flow velocity
@ -288,59 +286,58 @@ extern "C" double ScaLBL_D3Q19_Flux_BC_z(double *disteven, double *distodd, doub
} }
extern "C" double ScaLBL_D3Q19_AAodd_Flux_BC_z(int *d_neighborList, int *list, double *dist, double flux, extern "C" double ScaLBL_D3Q19_AAodd_Flux_BC_z(int *d_neighborList, int *list, double *dist, double flux,
double area, int count, int Np){ double area, int count, int Np)
{
int idx, n; int idx, n;
int nread; int nread;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double factor = 1.f/(area); double factor = 1.f/(area);
double sum = 0.f; double sum = 0.f;
for (idx=0; idx<count; idx++){ for (idx=0; idx<count; idx++){
n = list[idx]; n = list[idx];
f0 = dist[n]; double f0 = dist[n];
nread = d_neighborList[n]; nread = d_neighborList[n];
f1 = dist[nread]; double f1 = dist[nread];
nread = d_neighborList[n+2*Np]; nread = d_neighborList[n+2*Np];
f3 = dist[nread]; double f3 = dist[nread];
nread = d_neighborList[n+6*Np]; nread = d_neighborList[n+6*Np];
f7 = dist[nread]; double f7 = dist[nread];
nread = d_neighborList[n+8*Np]; nread = d_neighborList[n+8*Np];
f9 = dist[nread]; double f9 = dist[nread];
nread = d_neighborList[n+12*Np]; nread = d_neighborList[n+12*Np];
f13 = dist[nread]; double f13 = dist[nread];
nread = d_neighborList[n+16*Np]; nread = d_neighborList[n+16*Np];
f17 = dist[nread]; double f17 = dist[nread];
nread = d_neighborList[n+Np]; nread = d_neighborList[n+Np];
f2 = dist[nread]; double f2 = dist[nread];
nread = d_neighborList[n+3*Np]; nread = d_neighborList[n+3*Np];
f4 = dist[nread]; double f4 = dist[nread];
nread = d_neighborList[n+5*Np]; nread = d_neighborList[n+5*Np];
f6 = dist[nread]; double f6 = dist[nread];
nread = d_neighborList[n+7*Np]; nread = d_neighborList[n+7*Np];
f8 = dist[nread]; double f8 = dist[nread];
nread = d_neighborList[n+9*Np]; nread = d_neighborList[n+9*Np];
f10 = dist[nread]; double f10 = dist[nread];
nread = d_neighborList[n+11*Np]; nread = d_neighborList[n+11*Np];
f12 = dist[nread]; double f12 = dist[nread];
nread = d_neighborList[n+15*Np]; nread = d_neighborList[n+15*Np];
f16 = dist[nread]; double f16 = dist[nread];
sum += factor*(f0+f1+f2+f3+f4+f7+f8+f9+f10 + 2*(f6+f12+f13+f16+f17)); sum += factor*(f0+f1+f2+f3+f4+f7+f8+f9+f10 + 2*(f6+f12+f13+f16+f17));
} }
@ -349,30 +346,29 @@ extern "C" double ScaLBL_D3Q19_AAodd_Flux_BC_z(int *d_neighborList, int *list, d
} }
extern "C" double ScaLBL_D3Q19_AAeven_Flux_BC_z(int *list, double *dist, double flux, double area, extern "C" double ScaLBL_D3Q19_AAeven_Flux_BC_z(int *list, double *dist, double flux, double area,
int count, int Np){ int count, int Np)
{
int idx, n; int idx, n;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double factor = 1.f/(area); double factor = 1.f/(area);
double sum = 0.f; double sum = 0.f;
for (idx=0; idx<count; idx++){ for (idx=0; idx<count; idx++){
n = list[idx]; n = list[idx];
f0 = dist[n]; double f0 = dist[n];
f1 = dist[2*Np+n]; double f1 = dist[2*Np+n];
f2 = dist[1*Np+n]; double f2 = dist[1*Np+n];
f3 = dist[4*Np+n]; double f3 = dist[4*Np+n];
f4 = dist[3*Np+n]; double f4 = dist[3*Np+n];
f6 = dist[5*Np+n]; double f6 = dist[5*Np+n];
f7 = dist[8*Np+n]; double f7 = dist[8*Np+n];
f8 = dist[7*Np+n]; double f8 = dist[7*Np+n];
f9 = dist[10*Np+n]; double f9 = dist[10*Np+n];
f10 = dist[9*Np+n]; double f10 = dist[9*Np+n];
f12 = dist[11*Np+n]; double f12 = dist[11*Np+n];
f13 = dist[14*Np+n]; double f13 = dist[14*Np+n];
f16 = dist[15*Np+n]; double f16 = dist[15*Np+n];
f17 = dist[18*Np+n]; double f17 = dist[18*Np+n];
sum += factor*(f0+f1+f2+f3+f4+f7+f8+f9+f10 + 2*(f6+f12+f13+f16+f17)); sum += factor*(f0+f1+f2+f3+f4+f7+f8+f9+f10 + 2*(f6+f12+f13+f16+f17));
} }
return sum; return sum;
@ -385,8 +381,6 @@ extern "C" double ScaLBL_D3Q19_Flux_BC_Z(double *disteven, double *distodd, doub
// odd distributions in disteven and even distributions in distodd. // odd distributions in disteven and even distributions in distodd.
int n,N; int n,N;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double dout = 0.f; double dout = 0.f;
N = Nx*Ny*Nz; N = Nx*Ny*Nz;
@ -399,26 +393,26 @@ extern "C" double ScaLBL_D3Q19_Flux_BC_Z(double *disteven, double *distodd, doub
//........................................................................ //........................................................................
// Read distributions from "opposite" memory convention // Read distributions from "opposite" memory convention
//........................................................................ //........................................................................
f1 = distodd[n]; double f1 = distodd[n];
f3 = distodd[N+n]; double f3 = distodd[N+n];
f5 = distodd[2*N+n]; double f5 = distodd[2*N+n];
f7 = distodd[3*N+n]; double f7 = distodd[3*N+n];
f9 = distodd[4*N+n]; double f9 = distodd[4*N+n];
f11 = distodd[5*N+n]; double f11 = distodd[5*N+n];
f13 = distodd[6*N+n]; //double f13 = distodd[6*N+n];
f15 = distodd[7*N+n]; double f15 = distodd[7*N+n];
f17 = distodd[8*N+n]; //double f17 = distodd[8*N+n];
//........................................................................ //........................................................................
f0 = disteven[n]; double f0 = disteven[n];
f2 = disteven[N+n]; double f2 = disteven[N+n];
f4 = disteven[2*N+n]; double f4 = disteven[2*N+n];
f6 = disteven[3*N+n]; //double f6 = disteven[3*N+n];
f8 = disteven[4*N+n]; double f8 = disteven[4*N+n];
f10 = disteven[5*N+n]; double f10 = disteven[5*N+n];
f12 = disteven[6*N+n]; //double f12 = disteven[6*N+n];
f14 = disteven[7*N+n]; double f14 = disteven[7*N+n];
f16 = disteven[8*N+n]; //double f16 = disteven[8*N+n];
f18 = disteven[9*N+n]; double f18 = disteven[9*N+n];
sum += (f0+f1+f2+f3+f4+f7+f8+f9+f10 + 2*(f5+f11+f14+f15+f18)); sum += (f0+f1+f2+f3+f4+f7+f8+f9+f10 + 2*(f5+f11+f14+f15+f18));
@ -429,28 +423,25 @@ extern "C" double ScaLBL_D3Q19_Flux_BC_Z(double *disteven, double *distodd, doub
extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_z(int *list, double *dist, double din, int count, int Np) extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_z(int *list, double *dist, double din, int count, int Np)
{ {
int idx, n;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double ux,uy,uz,Cyz,Cxz; double ux,uy,uz,Cyz,Cxz;
ux = uy = 0.0; ux = uy = 0.0;
for (int idx=0; idx<count; idx++){ for (int idx=0; idx<count; idx++){
n = list[idx]; int n = list[idx];
f0 = dist[n]; double f0 = dist[n];
f1 = dist[2*Np+n]; double f1 = dist[2*Np+n];
f2 = dist[1*Np+n]; double f2 = dist[1*Np+n];
f3 = dist[4*Np+n]; double f3 = dist[4*Np+n];
f4 = dist[3*Np+n]; double f4 = dist[3*Np+n];
f6 = dist[5*Np+n]; double f6 = dist[5*Np+n];
f7 = dist[8*Np+n]; double f7 = dist[8*Np+n];
f8 = dist[7*Np+n]; double f8 = dist[7*Np+n];
f9 = dist[10*Np+n]; double f9 = dist[10*Np+n];
f10 = dist[9*Np+n]; double f10 = dist[9*Np+n];
f12 = dist[11*Np+n]; double f12 = dist[11*Np+n];
f13 = dist[14*Np+n]; double f13 = dist[14*Np+n];
f16 = dist[15*Np+n]; double f16 = dist[15*Np+n];
f17 = dist[18*Np+n]; double f17 = dist[18*Np+n];
//................................................... //...................................................
// Determine the inlet flow velocity // Determine the inlet flow velocity
//ux = (f1-f2+f7-f8+f9-f10+f11-f12+f13-f14); //ux = (f1-f2+f7-f8+f9-f10+f11-f12+f13-f14);
@ -460,11 +451,11 @@ extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_z(int *list, double *dist, doubl
Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux; Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux;
Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy; Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy;
f5 = f6 + 0.33333333333333338*uz; double f5 = f6 + 0.33333333333333338*uz;
f11 = f12 + 0.16666666666666678*(uz+ux)-Cxz; double f11 = f12 + 0.16666666666666678*(uz+ux)-Cxz;
f14 = f13 + 0.16666666666666678*(uz-ux)+Cxz; double f14 = f13 + 0.16666666666666678*(uz-ux)+Cxz;
f15 = f16 + 0.16666666666666678*(uy+uz)-Cyz; double f15 = f16 + 0.16666666666666678*(uy+uz)-Cyz;
f18 = f17 + 0.16666666666666678*(uz-uy)+Cyz; double f18 = f17 + 0.16666666666666678*(uz-uy)+Cyz;
dist[6*Np+n] = f5; dist[6*Np+n] = f5;
dist[12*Np+n] = f11; dist[12*Np+n] = f11;
@ -476,31 +467,28 @@ extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_z(int *list, double *dist, doubl
extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_Z(int *list, double *dist, double dout, int count, int Np) extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_Z(int *list, double *dist, double dout, int count, int Np)
{ {
int idx, n;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double ux,uy,uz,Cyz,Cxz; double ux,uy,uz,Cyz,Cxz;
ux = uy = 0.0; ux = uy = 0.0;
for (int idx=0; idx<count; idx++){ for (int idx=0; idx<count; idx++){
n = list[idx]; int n = list[idx];
//........................................................................ //........................................................................
// Read distributions // Read distributions
//........................................................................ //........................................................................
f0 = dist[n]; double f0 = dist[n];
f1 = dist[2*Np+n]; double f1 = dist[2*Np+n];
f2 = dist[1*Np+n]; double f2 = dist[1*Np+n];
f3 = dist[4*Np+n]; double f3 = dist[4*Np+n];
f4 = dist[3*Np+n]; double f4 = dist[3*Np+n];
f5 = dist[6*Np+n]; double f5 = dist[6*Np+n];
f7 = dist[8*Np+n]; double f7 = dist[8*Np+n];
f8 = dist[7*Np+n]; double f8 = dist[7*Np+n];
f9 = dist[10*Np+n]; double f9 = dist[10*Np+n];
f10 = dist[9*Np+n]; double f10 = dist[9*Np+n];
f11 = dist[12*Np+n]; double f11 = dist[12*Np+n];
f14 = dist[13*Np+n]; double f14 = dist[13*Np+n];
f15 = dist[16*Np+n]; double f15 = dist[16*Np+n];
f18 = dist[17*Np+n]; double f18 = dist[17*Np+n];
// Determine the outlet flow velocity // Determine the outlet flow velocity
//ux = f1-f2+f7-f8+f9-f10+f11-f12+f13-f14; //ux = f1-f2+f7-f8+f9-f10+f11-f12+f13-f14;
@ -510,11 +498,11 @@ extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_Z(int *list, double *dist, doubl
Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux; Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux;
Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy; Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy;
f6 = f5 - 0.33333333333333338*uz; double f6 = f5 - 0.33333333333333338*uz;
f12 = f11 - 0.16666666666666678*(uz+ux)+Cxz; double f12 = f11 - 0.16666666666666678*(uz+ux)+Cxz;
f13 = f14 - 0.16666666666666678*(uz-ux)-Cxz; double f13 = f14 - 0.16666666666666678*(uz-ux)-Cxz;
f16 = f15 - 0.16666666666666678*(uy+uz)+Cyz; double f16 = f15 - 0.16666666666666678*(uy+uz)+Cyz;
f17 = f18 - 0.16666666666666678*(uz-uy)-Cyz; double f17 = f18 - 0.16666666666666678*(uz-uy)-Cyz;
dist[5*Np+n] = f6; dist[5*Np+n] = f6;
dist[11*Np+n] = f12; dist[11*Np+n] = f12;
@ -527,57 +515,54 @@ extern "C" void ScaLBL_D3Q19_AAeven_Pressure_BC_Z(int *list, double *dist, doubl
extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_z(int *d_neighborList, int *list, double *dist, double din, int count, int Np) extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_z(int *d_neighborList, int *list, double *dist, double din, int count, int Np)
{ {
int idx, n;
int nread; int nread;
int nr5,nr11,nr14,nr15,nr18; int nr5,nr11,nr14,nr15,nr18;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double ux,uy,uz,Cyz,Cxz; double ux,uy,uz,Cyz,Cxz;
ux = uy = 0.0; ux = uy = 0.0;
for (int idx=0; idx<count; idx++){ for (int idx=0; idx<count; idx++){
n = list[idx]; int n = list[idx];
f0 = dist[n]; double f0 = dist[n];
nread = d_neighborList[n]; nread = d_neighborList[n];
f1 = dist[nread]; double f1 = dist[nread];
nread = d_neighborList[n+2*Np]; nread = d_neighborList[n+2*Np];
f3 = dist[nread]; double f3 = dist[nread];
nread = d_neighborList[n+6*Np]; nread = d_neighborList[n+6*Np];
f7 = dist[nread]; double f7 = dist[nread];
nread = d_neighborList[n+8*Np]; nread = d_neighborList[n+8*Np];
f9 = dist[nread]; double f9 = dist[nread];
nread = d_neighborList[n+12*Np]; nread = d_neighborList[n+12*Np];
f13 = dist[nread]; double f13 = dist[nread];
nread = d_neighborList[n+16*Np]; nread = d_neighborList[n+16*Np];
f17 = dist[nread]; double f17 = dist[nread];
nread = d_neighborList[n+Np]; nread = d_neighborList[n+Np];
f2 = dist[nread]; double f2 = dist[nread];
nread = d_neighborList[n+3*Np]; nread = d_neighborList[n+3*Np];
f4 = dist[nread]; double f4 = dist[nread];
nread = d_neighborList[n+5*Np]; nread = d_neighborList[n+5*Np];
f6 = dist[nread]; double f6 = dist[nread];
nread = d_neighborList[n+7*Np]; nread = d_neighborList[n+7*Np];
f8 = dist[nread]; double f8 = dist[nread];
nread = d_neighborList[n+9*Np]; nread = d_neighborList[n+9*Np];
f10 = dist[nread]; double f10 = dist[nread];
nread = d_neighborList[n+11*Np]; nread = d_neighborList[n+11*Np];
f12 = dist[nread]; double f12 = dist[nread];
nread = d_neighborList[n+15*Np]; nread = d_neighborList[n+15*Np];
f16 = dist[nread]; double f16 = dist[nread];
// Unknown distributions // Unknown distributions
nr5 = d_neighborList[n+4*Np]; nr5 = d_neighborList[n+4*Np];
@ -595,11 +580,11 @@ extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_z(int *d_neighborList, int *list,
Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux; Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux;
Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy; Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy;
f5 = f6 + 0.33333333333333338*uz; double f5 = f6 + 0.33333333333333338*uz;
f11 = f12 + 0.16666666666666678*(uz+ux)-Cxz; double f11 = f12 + 0.16666666666666678*(uz+ux)-Cxz;
f14 = f13 + 0.16666666666666678*(uz-ux)+Cxz; double f14 = f13 + 0.16666666666666678*(uz-ux)+Cxz;
f15 = f16 + 0.16666666666666678*(uy+uz)-Cyz; double f15 = f16 + 0.16666666666666678*(uy+uz)-Cyz;
f18 = f17 + 0.16666666666666678*(uz-uy)+Cyz; double f18 = f17 + 0.16666666666666678*(uz-uy)+Cyz;
dist[nr5] = f5; dist[nr5] = f5;
dist[nr11] = f11; dist[nr11] = f11;
@ -611,60 +596,58 @@ extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_z(int *d_neighborList, int *list,
extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_Z(int *d_neighborList, int *list, double *dist, double dout, int count, int Np) extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_Z(int *d_neighborList, int *list, double *dist, double dout, int count, int Np)
{ {
int idx,n,nread; int nread;
int nr6,nr12,nr13,nr16,nr17; int nr6,nr12,nr13,nr16,nr17;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double ux,uy,uz,Cyz,Cxz; double ux,uy,uz,Cyz,Cxz;
ux = uy = 0.0; ux = uy = 0.0;
for (int idx=0; idx<count; idx++){ for (int idx=0; idx<count; idx++){
n = list[idx]; int n = list[idx];
//........................................................................ //........................................................................
// Read distributions // Read distributions
//........................................................................ //........................................................................
f0 = dist[n]; double f0 = dist[n];
nread = d_neighborList[n]; nread = d_neighborList[n];
f1 = dist[nread]; double f1 = dist[nread];
nread = d_neighborList[n+2*Np]; nread = d_neighborList[n+2*Np];
f3 = dist[nread]; double f3 = dist[nread];
nread = d_neighborList[n+4*Np]; nread = d_neighborList[n+4*Np];
f5 = dist[nread]; double f5 = dist[nread];
nread = d_neighborList[n+6*Np]; nread = d_neighborList[n+6*Np];
f7 = dist[nread]; double f7 = dist[nread];
nread = d_neighborList[n+8*Np]; nread = d_neighborList[n+8*Np];
f9 = dist[nread]; double f9 = dist[nread];
nread = d_neighborList[n+10*Np]; nread = d_neighborList[n+10*Np];
f11 = dist[nread]; double f11 = dist[nread];
nread = d_neighborList[n+14*Np]; nread = d_neighborList[n+14*Np];
f15 = dist[nread]; double f15 = dist[nread];
nread = d_neighborList[n+Np]; nread = d_neighborList[n+Np];
f2 = dist[nread]; double f2 = dist[nread];
nread = d_neighborList[n+3*Np]; nread = d_neighborList[n+3*Np];
f4 = dist[nread]; double f4 = dist[nread];
nread = d_neighborList[n+7*Np]; nread = d_neighborList[n+7*Np];
f8 = dist[nread]; double f8 = dist[nread];
nread = d_neighborList[n+9*Np]; nread = d_neighborList[n+9*Np];
f10 = dist[nread]; double f10 = dist[nread];
nread = d_neighborList[n+13*Np]; nread = d_neighborList[n+13*Np];
f14 = dist[nread]; double f14 = dist[nread];
nread = d_neighborList[n+17*Np]; nread = d_neighborList[n+17*Np];
f18 = dist[nread]; double f18 = dist[nread];
// unknown distributions // unknown distributions
nr6 = d_neighborList[n+5*Np]; nr6 = d_neighborList[n+5*Np];
@ -681,11 +664,11 @@ extern "C" void ScaLBL_D3Q19_AAodd_Pressure_BC_Z(int *d_neighborList, int *list,
Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux; Cxz = 0.5*(f1+f7+f9-f2-f10-f8) - 0.3333333333333333*ux;
Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy; Cyz = 0.5*(f3+f7+f10-f4-f9-f8) - 0.3333333333333333*uy;
f6 = f5 - 0.33333333333333338*uz; double f6 = f5 - 0.33333333333333338*uz;
f12 = f11 - 0.16666666666666678*(uz+ux)+Cxz; double f12 = f11 - 0.16666666666666678*(uz+ux)+Cxz;
f13 = f14 - 0.16666666666666678*(uz-ux)-Cxz; double f13 = f14 - 0.16666666666666678*(uz-ux)-Cxz;
f16 = f15 - 0.16666666666666678*(uy+uz)+Cyz; double f16 = f15 - 0.16666666666666678*(uy+uz)+Cyz;
f17 = f18 - 0.16666666666666678*(uz-uy)-Cyz; double f17 = f18 - 0.16666666666666678*(uz-uy)-Cyz;
//........Store in "opposite" memory location.......... //........Store in "opposite" memory location..........
dist[nr6] = f6; dist[nr6] = f6;
@ -995,35 +978,30 @@ extern "C" void ScaLBL_D3Q19_Momentum(double *dist, double *vel, int Np)
extern "C" void ScaLBL_D3Q19_Pressure(double *dist, double *Pressure, int N) extern "C" void ScaLBL_D3Q19_Pressure(double *dist, double *Pressure, int N)
{ {
int n; for (int n=0; n<N; n++){
// distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
for (n=0; n<N; n++){
//........................................................................ //........................................................................
// Registers to store the distributions // Registers to store the distributions
//........................................................................ //........................................................................
f0 = dist[n]; double f0 = dist[n];
f2 = dist[2*N+n]; double f2 = dist[2*N+n];
f4 = dist[4*N+n]; double f4 = dist[4*N+n];
f6 = dist[6*N+n]; double f6 = dist[6*N+n];
f8 = dist[8*N+n]; double f8 = dist[8*N+n];
f10 = dist[10*N+n]; double f10 = dist[10*N+n];
f12 = dist[12*N+n]; double f12 = dist[12*N+n];
f14 = dist[14*N+n]; double f14 = dist[14*N+n];
f16 = dist[16*N+n]; double f16 = dist[16*N+n];
f18 = dist[18*N+n]; double f18 = dist[18*N+n];
//........................................................................ //........................................................................
f1 = dist[N+n]; double f1 = dist[N+n];
f3 = dist[3*N+n]; double f3 = dist[3*N+n];
f5 = dist[5*N+n]; double f5 = dist[5*N+n];
f7 = dist[7*N+n]; double f7 = dist[7*N+n];
f9 = dist[9*N+n]; double f9 = dist[9*N+n];
f11 = dist[11*N+n]; double f11 = dist[11*N+n];
f13 = dist[13*N+n]; double f13 = dist[13*N+n];
f15 = dist[15*N+n]; double f15 = dist[15*N+n];
f17 = dist[17*N+n]; double f17 = dist[17*N+n];
//.................Compute the velocity................................... //.................Compute the velocity...................................
Pressure[n] = 0.3333333333333333*(f0+f2+f1+f4+f3+f6+f5+f8+f7+f10+ Pressure[n] = 0.3333333333333333*(f0+f2+f1+f4+f3+f6+f5+f8+f7+f10+
f9+f12+f11+f14+f13+f16+f15+f18+f17); f9+f12+f11+f14+f13+f16+f15+f18+f17);
@ -1031,31 +1009,29 @@ extern "C" void ScaLBL_D3Q19_Pressure(double *dist, double *Pressure, int N)
} }
extern "C" void ScaLBL_D3Q19_AAeven_MRT(double *dist, int start, int finish, int Np, double rlx_setA, double rlx_setB, double Fx, extern "C" void ScaLBL_D3Q19_AAeven_MRT(double *dist, int start, int finish, int Np, double rlx_setA, double rlx_setB, double Fx,
double Fy, double Fz){ double Fy, double Fz)
int n; {
double fq,fp;
// conserved momemnts // conserved momemnts
double rho,jx,jy,jz; double rho,jx,jy,jz;
// non-conserved moments // non-conserved moments
double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18; double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18;
const double mrt_V1=0.05263157894736842; constexpr double mrt_V1=0.05263157894736842;
const double mrt_V2=0.012531328320802; constexpr double mrt_V2=0.012531328320802;
const double mrt_V3=0.04761904761904762; constexpr double mrt_V3=0.04761904761904762;
const double mrt_V4=0.004594820384294068; constexpr double mrt_V4=0.004594820384294068;
const double mrt_V5=0.01587301587301587; constexpr double mrt_V5=0.01587301587301587;
const double mrt_V6=0.0555555555555555555555555; constexpr double mrt_V6=0.0555555555555555555555555;
const double mrt_V7=0.02777777777777778; constexpr double mrt_V7=0.02777777777777778;
const double mrt_V8=0.08333333333333333; constexpr double mrt_V8=0.08333333333333333;
const double mrt_V9=0.003341687552213868; constexpr double mrt_V9=0.003341687552213868;
const double mrt_V10=0.003968253968253968; constexpr double mrt_V10=0.003968253968253968;
const double mrt_V11=0.01388888888888889; constexpr double mrt_V11=0.01388888888888889;
const double mrt_V12=0.04166666666666666; constexpr double mrt_V12=0.04166666666666666;
for (int n=start; n<finish; n++){ for (int n=start; n<finish; n++){
// q=0 // q=0
fq = dist[n]; double fq = dist[n];
rho = fq; rho = fq;
m1 = -30.0*fq; m1 = -30.0*fq;
m2 = 12.0*fq; m2 = 12.0*fq;
@ -1462,31 +1438,30 @@ extern "C" void ScaLBL_D3Q19_AAeven_MRT(double *dist, int start, int finish, int
} }
extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist, int start, int finish, int Np, double rlx_setA, double rlx_setB, double Fx, extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist, int start, int finish, int Np, double rlx_setA, double rlx_setB, double Fx,
double Fy, double Fz){ double Fy, double Fz)
int n; {
double fq,fp;
// conserved momemnts // conserved momemnts
double rho,jx,jy,jz; double rho,jx,jy,jz;
// non-conserved moments // non-conserved moments
double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18; double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18;
const double mrt_V1=0.05263157894736842; constexpr double mrt_V1=0.05263157894736842;
const double mrt_V2=0.012531328320802; constexpr double mrt_V2=0.012531328320802;
const double mrt_V3=0.04761904761904762; constexpr double mrt_V3=0.04761904761904762;
const double mrt_V4=0.004594820384294068; constexpr double mrt_V4=0.004594820384294068;
const double mrt_V5=0.01587301587301587; constexpr double mrt_V5=0.01587301587301587;
const double mrt_V6=0.0555555555555555555555555; constexpr double mrt_V6=0.0555555555555555555555555;
const double mrt_V7=0.02777777777777778; constexpr double mrt_V7=0.02777777777777778;
const double mrt_V8=0.08333333333333333; constexpr double mrt_V8=0.08333333333333333;
const double mrt_V9=0.003341687552213868; constexpr double mrt_V9=0.003341687552213868;
const double mrt_V10=0.003968253968253968; constexpr double mrt_V10=0.003968253968253968;
const double mrt_V11=0.01388888888888889; constexpr double mrt_V11=0.01388888888888889;
const double mrt_V12=0.04166666666666666; constexpr double mrt_V12=0.04166666666666666;
int nread; int nread;
for (int n=start; n<finish; n++){ for (int n=start; n<finish; n++){
// q=0 // q=0
fq = dist[n]; double fq = dist[n];
rho = fq; rho = fq;
m1 = -30.0*fq; m1 = -30.0*fq;
m2 = 12.0*fq; m2 = 12.0*fq;
@ -1937,11 +1912,8 @@ extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist, int star
} }
} }
extern "C" void ScaLBL_D3Q19_AAeven_Compact(char * ID, double *dist, int Np) { extern "C" void ScaLBL_D3Q19_AAeven_Compact(char * ID, double *dist, int Np)
{
int n;
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
for (int n=0; n<Np; n++){ for (int n=0; n<Np; n++){
@ -1950,27 +1922,26 @@ extern "C" void ScaLBL_D3Q19_AAeven_Compact(char * ID, double *dist, int Np) {
// (read from opposite array due to previous swap operation) // (read from opposite array due to previous swap operation)
//........................................................................ //........................................................................
// even // even
f2 = dist[10*Np+n]; double f2 = dist[10*Np+n];
f4 = dist[11*Np+n]; double f4 = dist[11*Np+n];
f6 = dist[12*Np+n]; double f6 = dist[12*Np+n];
f8 = dist[13*Np+n]; double f8 = dist[13*Np+n];
f10 = dist[14*Np+n]; double f10 = dist[14*Np+n];
f12 = dist[15*Np+n]; double f12 = dist[15*Np+n];
f14 = dist[16*Np+n]; double f14 = dist[16*Np+n];
f16 = dist[17*Np+n]; double f16 = dist[17*Np+n];
f18 = dist[18*Np+n]; double f18 = dist[18*Np+n];
f0 = dist[n];
// odd // odd
f1 = dist[Np+n]; double f1 = dist[Np+n];
f3 = dist[2*Np+n]; double f3 = dist[2*Np+n];
f5 = dist[3*Np+n]; double f5 = dist[3*Np+n];
f7 = dist[4*Np+n]; double f7 = dist[4*Np+n];
f9 = dist[5*Np+n]; double f9 = dist[5*Np+n];
f11 = dist[6*Np+n]; double f11 = dist[6*Np+n];
f13 = dist[7*Np+n]; double f13 = dist[7*Np+n];
f15 = dist[8*Np+n]; double f15 = dist[8*Np+n];
f17 = dist[9*Np+n]; double f17 = dist[9*Np+n];
//........................................................................ //........................................................................
// WRITE THE DISTRIBUTIONS // WRITE THE DISTRIBUTIONS
@ -2000,71 +1971,69 @@ extern "C" void ScaLBL_D3Q19_AAeven_Compact(char * ID, double *dist, int Np) {
} }
} }
extern "C" void ScaLBL_D3Q19_AAodd_Compact(char * ID, int *neighborList, double *dist, int Np) { extern "C" void ScaLBL_D3Q19_AAodd_Compact(char * ID, int *neighborList, double *dist, int Np)
int n; {
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
int nread; int nread;
for (int n=0; n<Np; n++){ for (int n=0; n<Np; n++){
//........Get 1-D index for this thread.................... //........Get 1-D index for this thread....................
f0 = dist[n]; //double f0 = dist[n];
nread = neighborList[n]; // + 0*Np nread = neighborList[n]; // + 0*Np
f2 = dist[nread]; double f2 = dist[nread];
nread = neighborList[n+2*Np]; nread = neighborList[n+2*Np];
f4 = dist[nread]; double f4 = dist[nread];
nread = neighborList[n+4*Np]; nread = neighborList[n+4*Np];
f6 = dist[nread]; double f6 = dist[nread];
nread = neighborList[n+6*Np]; nread = neighborList[n+6*Np];
f8 = dist[nread]; double f8 = dist[nread];
nread = neighborList[n+8*Np]; nread = neighborList[n+8*Np];
f10 = dist[nread]; double f10 = dist[nread];
nread = neighborList[n+10*Np]; nread = neighborList[n+10*Np];
f12 = dist[nread]; double f12 = dist[nread];
nread = neighborList[n+12*Np]; nread = neighborList[n+12*Np];
f14 = dist[nread]; double f14 = dist[nread];
nread = neighborList[n+14*Np]; nread = neighborList[n+14*Np];
f16 = dist[nread]; double f16 = dist[nread];
nread = neighborList[n+16*Np]; nread = neighborList[n+16*Np];
f18 = dist[nread]; double f18 = dist[nread];
nread = neighborList[n+Np]; nread = neighborList[n+Np];
f1 = dist[nread]; double f1 = dist[nread];
nread = neighborList[n+3*Np]; nread = neighborList[n+3*Np];
f3 = dist[nread]; double f3 = dist[nread];
nread = neighborList[n+5*Np]; nread = neighborList[n+5*Np];
f5 = dist[nread]; double f5 = dist[nread];
nread = neighborList[n+7*Np]; nread = neighborList[n+7*Np];
f7 = dist[nread]; double f7 = dist[nread];
nread = neighborList[n+9*Np]; nread = neighborList[n+9*Np];
f9 = dist[nread]; double f9 = dist[nread];
nread = neighborList[n+11*Np]; nread = neighborList[n+11*Np];
f11 = dist[nread]; double f11 = dist[nread];
nread = neighborList[n+13*Np]; nread = neighborList[n+13*Np];
f13 = dist[nread]; double f13 = dist[nread];
nread = neighborList[n+15*Np]; nread = neighborList[n+15*Np];
f15 = dist[nread]; double f15 = dist[nread];
nread = neighborList[n+17*Np]; nread = neighborList[n+17*Np];
f17 = dist[nread]; double f17 = dist[nread];
nread = neighborList[n]; nread = neighborList[n];

33
cpu/dfh.cpp
View File

@ -23,11 +23,10 @@ extern "C" void ScaLBL_Gradient_Unpack(double weight, double Cqx, double Cqy, do
} }
} }
extern "C" void ScaLBL_DFH_Init(double *Phi, double *Den, double *Aq, double *Bq, int start, int finish, int Np){ extern "C" void ScaLBL_DFH_Init(double *Phi, double *Den, double *Aq, double *Bq, int start, int finish, int Np)
int idx,n; {
double phi,nA,nB; for (int idx=start; idx<finish; idx++){
double phi,nA,nB;
for (idx=start; idx<finish; idx++){
phi = Phi[idx]; phi = Phi[idx];
if (phi > 0.f){ if (phi > 0.f){
nA = 1.0; nB = 0.f; nA = 1.0; nB = 0.f;
@ -60,15 +59,13 @@ extern "C" void ScaLBL_DFH_Init(double *Phi, double *Den, double *Aq, double *Bq
// LBM based on density functional hydrodynamics // LBM based on density functional hydrodynamics
extern "C" void ScaLBL_D3Q19_AAeven_DFH(int *neighborList, double *dist, double *Aq, double *Bq, double *Den, double *Phi, extern "C" void ScaLBL_D3Q19_AAeven_DFH(int *neighborList, double *dist, double *Aq, double *Bq, double *Den, double *Phi,
double *Gradient, double *SolidForce, double rhoA, double rhoB, double tauA, double tauB, double alpha, double beta, double *Gradient, double *SolidForce, double rhoA, double rhoB, double tauA, double tauB, double alpha, double beta,
double Fx, double Fy, double Fz, int start, int finish, int Np){ double Fx, double Fy, double Fz, int start, int finish, int Np)
{
int ijk,nn,n;
double fq; double fq;
// conserved momemnts // conserved momemnts
double rho,jx,jy,jz; double rho,jx,jy,jz;
// non-conserved moments // non-conserved moments
double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18; double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18;
double m3,m5,m7;
double nA,nB; // number density double nA,nB; // number density
double a1,b1,a2,b2,nAB,delta; double a1,b1,a2,b2,nAB,delta;
double C,nx,ny,nz; //color gradient magnitude and direction double C,nx,ny,nz; //color gradient magnitude and direction
@ -586,7 +583,7 @@ extern "C" void ScaLBL_D3Q19_AAodd_DFH(int *neighborList, double *dist, double *
double *Phi, double *Gradient, double *SolidForce, double rhoA, double rhoB, double tauA, double tauB, double alpha, double beta, double *Phi, double *Gradient, double *SolidForce, double rhoA, double rhoB, double tauA, double tauB, double alpha, double beta,
double Fx, double Fy, double Fz, int start, int finish, int Np){ double Fx, double Fy, double Fz, int start, int finish, int Np){
int n,nn,ijk,nread; int nread;
int nr1,nr2,nr3,nr4,nr5,nr6; int nr1,nr2,nr3,nr4,nr5,nr6;
int nr7,nr8,nr9,nr10; int nr7,nr8,nr9,nr10;
int nr11,nr12,nr13,nr14; int nr11,nr12,nr13,nr14;
@ -596,7 +593,6 @@ extern "C" void ScaLBL_D3Q19_AAodd_DFH(int *neighborList, double *dist, double *
double rho,jx,jy,jz; double rho,jx,jy,jz;
// non-conserved moments // non-conserved moments
double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18; double m1,m2,m4,m6,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18;
double m3,m5,m7;
double nA,nB; // number density double nA,nB; // number density
double a1,b1,a2,b2,nAB,delta; double a1,b1,a2,b2,nAB,delta;
double C,nx,ny,nz; //color gradient magnitude and direction double C,nx,ny,nz; //color gradient magnitude and direction
@ -1182,12 +1178,12 @@ extern "C" void ScaLBL_D3Q19_AAodd_DFH(int *neighborList, double *dist, double *
} }
extern "C" void ScaLBL_D3Q7_AAodd_DFH(int *neighborList, double *Aq, double *Bq, extern "C" void ScaLBL_D3Q7_AAodd_DFH(int *neighborList, double *Aq, double *Bq,
double *Den, double *Phi, int start, int finish, int Np){ double *Den, double *Phi, int start, int finish, int Np)
{
int idx,n,nread;
double fq,nA,nB;
for (int n=start; n<finish; n++){ for (int n=start; n<finish; n++){
int nread;
double fq,nA,nB;
//..........Compute the number density for component A............ //..........Compute the number density for component A............
// q=0 // q=0
@ -1270,11 +1266,10 @@ extern "C" void ScaLBL_D3Q7_AAodd_DFH(int *neighborList, double *Aq, double *Bq,
} }
extern "C" void ScaLBL_D3Q7_AAeven_DFH(double *Aq, double *Bq, double *Den, double *Phi, extern "C" void ScaLBL_D3Q7_AAeven_DFH(double *Aq, double *Bq, double *Den, double *Phi,
int start, int finish, int Np){ int start, int finish, int Np)
int idx,n,nread; {
double fq,nA,nB;
for (int n=start; n<finish; n++){ for (int n=start; n<finish; n++){
double fq,nA,nB;
// compute number density for component A // compute number density for component A
// q=0 // q=0
fq = Aq[n]; fq = Aq[n];

34
tests/TestBubbleDFH.cpp
View File

@ -74,11 +74,6 @@ int main(int argc, char **argv)
ScaLBL_DeviceBarrier(); ScaLBL_DeviceBarrier();
MPI_Barrier(comm); MPI_Barrier(comm);
PROFILE_ENABLE(1);
//PROFILE_ENABLE_TRACE();
//PROFILE_ENABLE_MEMORY();
PROFILE_SYNCHRONIZE();
PROFILE_START("Main");
Utilities::setErrorHandlers(); Utilities::setErrorHandlers();
// Variables that specify the computational domain // Variables that specify the computational domain
@ -164,14 +159,14 @@ int main(int argc, char **argv)
pBC=false; pBC=false;
// Full domain used for averaging (do not use mask for analysis) // Full domain used for averaging (do not use mask for analysis)
std::shared_ptr<Domain> Dm(new Domain(domain_db,comm)); auto Dm = std::make_shared<Domain>(domain_db,comm);
for (int i=0; i<Dm->Nx*Dm->Ny*Dm->Nz; i++) Dm->id[i] = 1; for (int i=0; i<Dm->Nx*Dm->Ny*Dm->Nz; i++) Dm->id[i] = 1;
std::shared_ptr<TwoPhase> Averages( new TwoPhase(Dm) ); auto Averages = std::make_shared<TwoPhase>(Dm);
// TwoPhase Averages(Dm); // TwoPhase Averages(Dm);
Dm->CommInit(); Dm->CommInit();
// Mask that excludes the solid phase // Mask that excludes the solid phase
std::shared_ptr<Domain> Mask(new Domain(domain_db,comm)); auto Mask = std::make_shared<Domain>(domain_db,comm);
MPI_Barrier(comm); MPI_Barrier(comm);
Nx+=2; Ny+=2; Nz += 2; Nx+=2; Ny+=2; Nz += 2;
@ -191,8 +186,7 @@ int main(int argc, char **argv)
// printf("Local File Name = %s \n",LocalRankFilename); // printf("Local File Name = %s \n",LocalRankFilename);
// .......... READ THE INPUT FILE ....................................... // .......... READ THE INPUT FILE .......................................
// char value; // char value;
char *id; auto id = new char[N];
id = new char[N];
double sum; double sum;
//........................................................................... //...........................................................................
if (rank == 0) cout << "Setting up bubble..." << endl; if (rank == 0) cout << "Setting up bubble..." << endl;
@ -244,19 +238,17 @@ int main(int argc, char **argv)
// Initialize communication structures in averaging domain // Initialize communication structures in averaging domain
for (i=0; i<Mask->Nx*Mask->Ny*Mask->Nz; i++) Mask->id[i] = id[i]; for (i=0; i<Mask->Nx*Mask->Ny*Mask->Nz; i++) Mask->id[i] = id[i];
Mask->CommInit(); Mask->CommInit();
double *PhaseLabel; auto PhaseLabel = new double[N];
PhaseLabel = new double[N];
//........................................................................... //...........................................................................
if (rank==0) printf ("Create ScaLBL_Communicator \n"); if (rank==0) printf ("Create ScaLBL_Communicator \n");
// Create a communicator for the device (will use optimized layout) // Create a communicator for the device (will use optimized layout)
std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm(new ScaLBL_Communicator(Mask)); auto ScaLBL_Comm = std::make_shared<ScaLBL_Communicator>(Mask);
int Npad=(Np/16 + 2)*16; int Npad=(Np/16 + 2)*16;
if (rank==0) printf ("Set up memory efficient layout Npad=%i \n",Npad); if (rank==0) printf ("Set up memory efficient layout Npad=%i \n",Npad);
int *neighborList;
IntArray Map(Nx,Ny,Nz); IntArray Map(Nx,Ny,Nz);
neighborList= new int[18*Npad]; auto neighborList= new int[18*Npad];
Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Mask->id,Np); Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Mask->id,Np);
MPI_Barrier(comm); MPI_Barrier(comm);
@ -515,9 +507,8 @@ int main(int argc, char **argv)
// Copy back final phase indicator field and convert to regular layout // Copy back final phase indicator field and convert to regular layout
DoubleArray PhaseField(Nx,Ny,Nz); DoubleArray PhaseField(Nx,Ny,Nz);
ScaLBL_Comm->RegularLayout(Map,Phi,PhaseField); ScaLBL_Comm->RegularLayout(Map,Phi,PhaseField);
FILE *OUTFILE;
sprintf(LocalRankFilename,"Phase.raw"); sprintf(LocalRankFilename,"Phase.raw");
OUTFILE = fopen(LocalRankFilename,"wb"); auto OUTFILE = fopen(LocalRankFilename,"wb");
fwrite(PhaseField.data(),8,N,OUTFILE); fwrite(PhaseField.data(),8,N,OUTFILE);
fclose(OUTFILE); fclose(OUTFILE);
@ -535,9 +526,8 @@ int main(int argc, char **argv)
} }
} }
} }
FILE *GFILE;
sprintf(LocalRankFilename,"Gradient.raw"); sprintf(LocalRankFilename,"Gradient.raw");
GFILE = fopen(LocalRankFilename,"wb"); auto GFILE = fopen(LocalRankFilename,"wb");
fwrite(GradNorm.data(),8,N,GFILE); fwrite(GradNorm.data(),8,N,GFILE);
fclose(GFILE); fclose(GFILE);
@ -545,14 +535,12 @@ int main(int argc, char **argv)
DoubleArray Rho2(Nx,Ny,Nz); DoubleArray Rho2(Nx,Ny,Nz);
ScaLBL_Comm->RegularLayout(Map,&Den[0],Rho1); ScaLBL_Comm->RegularLayout(Map,&Den[0],Rho1);
ScaLBL_Comm->RegularLayout(Map,&Den[Np],Rho2); ScaLBL_Comm->RegularLayout(Map,&Den[Np],Rho2);
FILE *RFILE1;
sprintf(LocalRankFilename,"Rho1.raw"); sprintf(LocalRankFilename,"Rho1.raw");
RFILE1 = fopen(LocalRankFilename,"wb"); auto RFILE1 = fopen(LocalRankFilename,"wb");
fwrite(Rho1.data(),8,N,RFILE1); fwrite(Rho1.data(),8,N,RFILE1);
fclose(RFILE1); fclose(RFILE1);
FILE *RFILE2;
sprintf(LocalRankFilename,"Rho2.raw"); sprintf(LocalRankFilename,"Rho2.raw");
RFILE2 = fopen(LocalRankFilename,"wb"); auto RFILE2 = fopen(LocalRankFilename,"wb");
fwrite(Rho2.data(),8,N,RFILE2); fwrite(Rho2.data(),8,N,RFILE2);
fclose(RFILE2); fclose(RFILE2);