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

Removing warnings from cdash, deprecating lb2_Color_wia_mpi and BasicSimulator

Browse Source
This commit is contained in:
James E McClure
2016-01-10 11:16:54 -05:00
parent e8b183dd78
commit 193ec2841d
14 changed files with 33 additions and 4572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/TwoPhase.cpp
View File

@@ -67,7 +67,7 @@ TwoPhase::TwoPhase(Domain &dm):
Jwn(0), Jwn_global(0), Kwn(0), Kwn_global(0), KNwns(0), KNwns_global(0),
KGwns(0), KGwns_global(0), trawn(0), trawn_global(0), trJwn(0), trJwn_global(0),
trRwn(0), trRwn_global(0), nwp_volume_global(0), wp_volume_global(0),
As_global(0), dEs(0), dAwn(0), dAns(0), wwndnw(0), wwndnw_global(0)
As_global(0), wwndnw_global(0), wwnsdnwn_global(0), Jwnwwndnw_global(0), dEs(0), dAwn(0), dAns(0)
{
Nx=dm.Nx; Ny=dm.Ny; Nz=dm.Nz;
Volume=(Nx-2)*(Ny-2)*(Nz-2)*Dm.nprocx*Dm.nprocy*Dm.nprocz*1.0;
@@ -179,9 +179,9 @@ TwoPhase::~TwoPhase()
void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, DoubleArray &DistData)
{
double factor,temp,value;
/* double factor,temp,value;
factor=0.5/Beta;
/* // Initialize to -1,1 (segmentation)
// Initialize to -1,1 (segmentation)
for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){

2435
tests/BasicSimulator.cpp
View File

File diff suppressed because it is too large Load Diff

2
tests/CMakeLists.txt
View File

@@ -1,5 +1,4 @@
# Copy files for the tests
ADD_LBPM_EXECUTABLE( lb2_Color_wia_mpi )
ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator )
ADD_LBPM_EXECUTABLE( lbpm_color_simulator )
ADD_LBPM_EXECUTABLE( lbpm_sphere_pp )
@@ -11,7 +10,6 @@ ADD_LBPM_EXECUTABLE( lbpm_captube_pp )
ADD_LBPM_EXECUTABLE( lbpm_squaretube_pp )
ADD_LBPM_EXECUTABLE( lbpm_BlobAnalysis )
ADD_LBPM_EXECUTABLE( TestBubble )
ADD_LBPM_EXECUTABLE( BasicSimulator )
ADD_LBPM_EXECUTABLE( ComponentLabel )
ADD_LBPM_EXECUTABLE( ColorToBinary )
ADD_LBPM_EXECUTABLE( BlobAnalysis )

7
tests/ColorToBinary.cpp
View File

@@ -19,7 +19,6 @@ inline void ReadFromRank(char *FILENAME, DoubleArray &Phase, int nx, int ny, int
double denA,denB;
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18;
double vx,vy,vz;
N = nx*ny*nz;
@@ -87,9 +86,9 @@ inline void ReadFromRank(char *FILENAME, DoubleArray &Phase, int nx, int ny, int
value = 0.3333333333333333*(f0+f2+f1+f4+f3+f6+f5+f8+f7+f10+f9+f12+f11+f14+f13+f16+f15+f18+f17);
//........................................................................
//.................Compute the velocity...................................
vx = f1-f2+f7-f8+f9-f10+f11-f12+f13-f14;
vy = f3-f4+f7-f8-f9+f10+f15-f16+f17-f18;
vz = f5-f6+f11-f12-f13+f14+f15-f16-f17+f18;
//vx = f1-f2+f7-f8+f9-f10+f11-f12+f13-f14;
//vy = f3-f4+f7-f8-f9+f10+f15-f16+f17-f18;
//vz = f5-f6+f11-f12-f13+f14+f15-f16-f17+f18;
//........................................................................
// save values in global arrays
//........................................................................

4
tests/TestBlobAnalyze.cpp
View File

@@ -294,8 +294,8 @@ int main(int argc, char **argv)
}
}
double vF,vS;
vF = vS = 0.0;
double vS;
vS = 0.0;
double beta = 0.95;
if (rank==0) printf("initializing the system \n");

10
tests/TestTorus.cpp
View File

@@ -110,15 +110,15 @@ int main(int argc, char **argv)
// Assign the phase ID field based and the signed distance
//.......................................................................
double R1,R2;
double CX,CY,CZ,CY1,CY2;
double CX,CY,CZ'//CY1,CY2;
CX=Nx*nprocx*0.5;
CY=Ny*nprocy*0.5;
CZ=Nz*nprocz*0.5;
R1 = Nx*nprocx*0.2; // middle radius
R2 = Nx*nprocx*0.1; // donut thickness
//
CY1=Nx*nprocx*0.5+R1;
CY2=Ny*nprocy*0.5-R1;
//CY1=Nx*nprocx*0.5+R1;
//CY2=Ny*nprocy*0.5-R1;
double x,y,z;
if (rank==0) printf("Initializing the system \n");
@@ -168,8 +168,8 @@ int main(int argc, char **argv)
}
}
double vF,vS;
vF = vS = 0.0;
double vS;
vS = 0.0;
double beta = 0.95;
if (rank==0) printf("initializing the system \n");

2111
tests/lb2_Color_wia_mpi.cpp
View File

File diff suppressed because it is too large Load Diff

2
tests/lbpm_BlobAnalysis.cpp
View File

@@ -299,6 +299,8 @@ int main(int argc, char **argv)
double Length=1.0;
if (rank==0) WriteBlobStates(Averages,Length,porosity);
NULL_USE(Vn); NULL_USE(ans); NULL_USE(Jwn);
//MPI_Barrier(comm);
//printf("Exit, rank=%i \n",rank);
// ****************************************************

3
tests/lbpm_captube_pp.cpp
View File

@@ -146,7 +146,7 @@ int main(int argc, char **argv)
double sum_local;
double iVol_global = 1.0/(1.0*(Nx-2)*(Ny-2)*(Nz-2)*nprocs);
//if (pBC) iVol_global = 1.0/(1.0*(Nx-2)*nprocx*(Ny-2)*nprocy*((Nz-2)*nprocz-6));
double porosity, pore_vol;
double pore_vol;
sum=0;
for (k=0;k<Nz;k++){
@@ -176,7 +176,6 @@ int main(int argc, char **argv)
}
}
}
porosity = double(sum)/double(1.0*N);
// Compute the pore volume
sum_local = 0.0;
for ( k=1;k<Nz-1;k++){

6
tests/lbpm_color_simulator.cpp
View File

@@ -385,9 +385,12 @@ int main(int argc, char **argv)
if (rank==0) printf("Initialize from segmented data: solid=0, NWP=1, WP=2 \n");
sprintf(LocalRankFilename,"ID.%05i",rank);
size_t readID;
FILE *IDFILE = fopen(LocalRankFilename,"rb");
if (IDFILE==NULL) ERROR("Error opening file: ID.xxxxx");
fread(id,1,N,IDFILE);
readID=fread(id,1,N,IDFILE);
if (readID != N) printf("lbpm_segmented_pp: Error reading ID (rank=%i) \n",rank);
fclose(IDFILE);
/* for ( k=0;k<Nz;k++){
@@ -625,6 +628,7 @@ int main(int argc, char **argv)
// Set dynamic pressure boundary conditions
double dp, slope;
dp = slope = 0.0;
if (BoundaryCondition==3){
slope = (dout-din)/timestepMax;
dp = din;

4
tests/lbpm_random_pp.cpp
View File

@@ -147,7 +147,9 @@ int main(int argc, char **argv)
// Read the signed distance from file
sprintf(LocalRankFilename,"SignDist.%05i",rank);
FILE *DIST = fopen(LocalRankFilename,"rb");
fread(SignDist.get(),8,N,DIST);
size_t ReadSignDist;
ReadSignDist=fread(SignDist.get(),8,N,DIST);
if (ReadSignDist != N) printf("lbpm_random_pp: Error reading signed distance function (rank=%i)\n",rank);
fclose(DIST);
int count,countGlobal,totalGlobal;

4
tests/lbpm_segmented_decomp.cpp
View File

@@ -100,7 +100,9 @@ int main(int argc, char **argv)
SegData = new char[Nx*Ny*Nz];
FILE *SEGDAT = fopen(Filename,"rb");
if (SEGDAT==NULL) ERROR("Error reading segmented data");
fread(SegData,1,Nx*Ny*Nz,SEGDAT);
size_t ReadSeg;
ReadSeg=fread(SegData,1,Nx*Ny*Nz,SEGDAT);
if (readID != Nx*Ny*Nz) printf("lbpm_segmented_decomp: Error reading segmented data (rank=%i)\n",rank);
fclose(SEGDAT);
printf("Read segmented data from %s \n",Filename);
}

8
tests/lbpm_segmented_pp.cpp
View File

@@ -104,9 +104,11 @@ int main(int argc, char **argv)
int N = (nx+2)*(ny+2)*(nz+2);
Domain Dm(nx,ny,nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC);
// Read the phase ID
size_t readID;
sprintf(LocalRankFilename,"ID.%05i",rank);
FILE *ID = fopen(LocalRankFilename,"rb");
fread(Dm.id,1,N,ID);
readID=fread(Dm.id,1,N,ID);
if (readID != N) printf("lbpm_segmented_pp: Error reading ID \n");
fclose(ID);
// Initialize the domain and communication
Dm.CommInit(comm);
@@ -243,8 +245,8 @@ int main(int argc, char **argv)
// fwrite(Averages.Phase.get(),8,Averages.Phase.length(),PHASE);
// fclose(PHASE);
double vF,vS;
vF = vS = 0.0;
double vS;
vS = 0.0;
double beta = 0.95;
if (rank==0) printf("initializing the system \n");

3
tests/lbpm_squaretube_pp.cpp
View File

@@ -146,7 +146,7 @@ int main(int argc, char **argv)
double sum_local;
double iVol_global = 1.0/(1.0*(Nx-2)*(Ny-2)*(Nz-2)*nprocs);
//if (pBC) iVol_global = 1.0/(1.0*(Nx-2)*nprocx*(Ny-2)*nprocy*((Nz-2)*nprocz-6));
double porosity, pore_vol;
double pore_vol;
sum=0;
for (k=0;k<Nz;k++){
@@ -180,7 +180,6 @@ int main(int argc, char **argv)
}
}
}
porosity = double(sum)/double(1.0*N);
// Compute the pore volume
sum_local = 0.0;
for ( k=1;k<Nz-1;k++){