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

Cleaning up warnings, fixin build

Browse Source
This commit is contained in:
James E McClure 2016-01-10 11:30:13 -05:00
parent 193ec2841d
commit fa418c0850
6 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cpu/Color.cpp
View File

@ -4,17 +4,12 @@
extern "C" void InitDenColor(char *ID, double *Den, double *Phi, double das, double dbs, int Nx, int Ny, int Nz)
{
int i,j,k,n,N;
int n,N;
N = Nx*Ny*Nz;
for (n=0; n<N; n++){
//.......Back out the 3-D indices for node n..............
k = n/(Nx*Ny);
j = (n-Nx*Ny*k)/Nx;
i = n-Nx*Ny*k-Nx*j;
if ( ID[n] == 1){
Den[n] = 1.0;
Den[N+n] = 0.0;
@ -35,13 +30,12 @@ extern "C" void InitDenColor(char *ID, double *Den, double *Phi, double das, dou
extern "C" void InitDenColorDistancePacked(char *ID, double *Den, double *Phi, double *Distance,
double das, double dbs, double beta, double xp, int Nx, int Ny, int Nz)
{
int i,j,k,n,N;
int i,j,k,n,N;
double d;
N = Nx*Ny*Nz;
for (n=0; n<N; n++){
//.......Back out the 3-D indices for node n..............
k = n/(Nx*Ny);
j = (n-Nx*Ny*k)/Nx;
@ -79,18 +73,13 @@ extern "C" void InitDenColorDistancePacked(char *ID, double *Den, double *Phi, d
extern "C" void InitDenColorDistance(char *ID, double *Den, double *Phi, double *Distance,
double das, double dbs, double beta, double xp, int Nx, int Ny, int Nz)
{
int i,j,k,n,N;
int n,N;
double d;
N = Nx*Ny*Nz;
for (n=0; n<N; n++){
//.......Back out the 3-D indices for node n..............
k = n/(Nx*Ny);
j = (n-Nx*Ny*k)/Nx;
i = n-Nx*Ny*k-Nx*j;
if ( ID[n] == 1){
Den[n] = 1.0;
Den[N+n] = 0.0;

8
tests/TestBlobAnalyze.cpp
View File

@ -294,9 +294,6 @@ int main(int argc, char **argv)
}
}
double vS;
vS = 0.0;
double beta = 0.95;
if (rank==0) printf("initializing the system \n");
@ -307,11 +304,6 @@ int main(int argc, char **argv)
Averages.Initialize();
Averages.UpdateMeshValues();
// if (rank==0) printf("computing blobs \n");
// int nblobs_global = ComputeGlobalBlobIDs(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,
// Averages.Phase,Averages.SDs,vF,vS,Averages.BlobLabel);
// if (Dm.rank==0) printf("Number of blobs is %i \n",nblobs_global);
if (rank==0) printf("computing local averages \n");
Averages.AssignComponentLabels();
Averages.ComponentAverages();

2
tests/TestTorus.cpp
View File

@ -110,7 +110,7 @@ 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;

3
tests/lbpm_BlobAnalysis.cpp
View File

@ -238,6 +238,7 @@ int main(int argc, char **argv)
MPI_Barrier(comm);
if (Averages.ComponentAverages_NWP(0,b) > 0.0){
double Vn,pn,awn,ans,Jwn,Kwn,lwns,cwns,trawn,trJwn;
NULL_USE(Vn); NULL_USE(ans); NULL_USE(Jwn);
Vn = Averages.ComponentAverages_NWP(1,b);
pn = Averages.ComponentAverages_NWP(2,b)/Averages.ComponentAverages_NWP(0,b);
awn = Averages.ComponentAverages_NWP(3,b);
@ -299,8 +300,6 @@ 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);
// ****************************************************

2
tests/lbpm_segmented_decomp.cpp
View File

@ -102,7 +102,7 @@ int main(int argc, char **argv)
if (SEGDAT==NULL) ERROR("Error reading segmented data");
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);
if (ReadSeg != size_t(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);
}

5
tests/lbpm_segmented_pp.cpp
View File

@ -108,7 +108,7 @@ int main(int argc, char **argv)
sprintf(LocalRankFilename,"ID.%05i",rank);
FILE *ID = fopen(LocalRankFilename,"rb");
readID=fread(Dm.id,1,N,ID);
if (readID != N) printf("lbpm_segmented_pp: Error reading ID \n");
if (readID != size_t(N)) printf("lbpm_segmented_pp: Error reading ID \n");
fclose(ID);
// Initialize the domain and communication
Dm.CommInit(comm);
@ -245,9 +245,6 @@ int main(int argc, char **argv)
// fwrite(Averages.Phase.get(),8,Averages.Phase.length(),PHASE);
// fclose(PHASE);
double vS;
vS = 0.0;
double beta = 0.95;
if (rank==0) printf("initializing the system \n");
Averages.UpdateSolid();