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

fix compiler warnings

Browse Source
This commit is contained in:
James McClure 2022-07-06 21:33:59 -04:00
parent 5a37f7865f
commit b7910dbefe
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
analysis/ElectroChemistry.cpp
View File

@ -123,7 +123,7 @@ ElectroChemistryAnalyzer::ElectroChemistryAnalyzer(ScaLBL_IonModel &IonModel)
if (Dm->rank() == 0) { if (Dm->rank() == 0) {
printf("Set up analysis routines for %i ions \n",IonModel.number_ion_species); printf("Set up analysis routines for %lu ions \n",IonModel.number_ion_species);
bool WriteHeader = false; bool WriteHeader = false;
TIMELOG = fopen("electrokinetic.csv", "r"); TIMELOG = fopen("electrokinetic.csv", "r");

8
cpu/Ion.cpp
View File

@ -44,8 +44,8 @@ extern "C" void ScaLBL_D3Q7_Membrane_AssignLinkCoef_halo(
// swap rule means that the distributions in recvbuf are OPPOSITE of q // swap rule means that the distributions in recvbuf are OPPOSITE of q
// dist may be even or odd distributions stored by stream layout // dist may be even or odd distributions stored by stream layout
//.................................................................................... //....................................................................................
int n, idx, link, label, nqm, npm, i, j, k; int n, idx, label, nqm, npm, i, j, k;
double distanceLocal, distanceNonlocal; double distanceLocal;//, distanceNonlocal;
double psiLocal, psiNonlocal, membranePotential; double psiLocal, psiNonlocal, membranePotential;
double ap,aq; // coefficient double ap,aq; // coefficient
@ -65,7 +65,7 @@ extern "C" void ScaLBL_D3Q7_Membrane_AssignLinkCoef_halo(
// Streaming link the non-local distribution // Streaming link the non-local distribution
i -= Cqx; j -= Cqy; k -= Cqz; i -= Cqx; j -= Cqy; k -= Cqz;
npm = k*Nx*Ny + j*Nx + i; npm = k*Nx*Ny + j*Nx + i;
distanceNonlocal = Distance[npm]; //distanceNonlocal = Distance[npm];
psiNonlocal = Psi[npm]; psiNonlocal = Psi[npm];
membranePotential = psiLocal - psiNonlocal; membranePotential = psiLocal - psiNonlocal;
@ -103,7 +103,7 @@ extern "C" void ScaLBL_D3Q7_Membrane_Unpack(int q,
// swap rule means that the distributions in recvbuf are OPPOSITE of q // swap rule means that the distributions in recvbuf are OPPOSITE of q
// dist may be even or odd distributions stored by stream layout // dist may be even or odd distributions stored by stream layout
//.................................................................................... //....................................................................................
int n, idx, link; int n, idx;
double fq,fp,fqq,ap,aq; // coefficient double fq,fp,fqq,ap,aq; // coefficient
/* First unpack the regular links */ /* First unpack the regular links */
for (idx = 0; idx < count; idx++) { for (idx = 0; idx < count; idx++) {

14
cpu/Poisson.cpp
View File

@ -447,7 +447,7 @@ extern "C" void ScaLBL_D3Q7_PoissonResidualError(
extern "C" void ScaLBL_D3Q19_Poisson_getElectricField(double *dist, double *ElectricField, double tau, int Np){ extern "C" void ScaLBL_D3Q19_Poisson_getElectricField(double *dist, double *ElectricField, double tau, int Np){
int n; int n;
double f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, double f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15,
f16, f17, f18; f16, f17, f18;
double Ex,Ey,Ez; double Ex,Ey,Ez;
double rlx=1.0/tau; double rlx=1.0/tau;
@ -492,9 +492,9 @@ ScaLBL_D3Q19_AAodd_Poisson_ElectricPotential(int *neighborList, int *Map,
double epsilon_LB, bool UseSlippingVelBC, double epsilon_LB, bool UseSlippingVelBC,
int start, int finish, int Np) { int start, int finish, int Np) {
int n; int n;
double psi,sum; //electric potential double psi; //electric potential
double rho_e; //local charge density double rho_e; //local charge density
double Gs; //double Gs;
double f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, double f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15,
f16, f17, f18; f16, f17, f18;
int nr1, nr2, nr3, nr4, nr5, nr6, nr7, nr8, nr9, nr10, nr11, nr12, nr13, int nr1, nr2, nr3, nr4, nr5, nr6, nr7, nr8, nr9, nr10, nr11, nr12, nr13,
@ -590,11 +590,11 @@ ScaLBL_D3Q19_AAodd_Poisson_ElectricPotential(int *neighborList, int *Map,
extern "C" void ScaLBL_D3Q19_AAeven_Poisson_ElectricPotential( extern "C" void ScaLBL_D3Q19_AAeven_Poisson_ElectricPotential(
int *Map, double *dist, double *Den_charge, double *Psi, double epsilon_LB, bool UseSlippingVelBC, int start, int finish, int Np) { int *Map, double *dist, double *Den_charge, double *Psi, double epsilon_LB, bool UseSlippingVelBC, int start, int finish, int Np) {
int n; int n;
double psi,sum; //electric potential double psi; //electric potential
double rho_e; //local charge density double rho_e; //local charge density
double f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, double f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15,
f16, f17, f18; f16, f17, f18;
double Gs; //double Gs;
int idx; int idx;
for (n = start; n < finish; n++) { for (n = start; n < finish; n++) {
@ -644,7 +644,7 @@ extern "C" void ScaLBL_D3Q19_AAodd_Poisson(int *neighborList, int *Map,
f16, f17, f18; f16, f17, f18;
int nr1, nr2, nr3, nr4, nr5, nr6, nr7, nr8, nr9, nr10, nr11, nr12, nr13, int nr1, nr2, nr3, nr4, nr5, nr6, nr7, nr8, nr9, nr10, nr11, nr12, nr13,
nr14, nr15, nr16, nr17, nr18; nr14, nr15, nr16, nr17, nr18;
double error,sum_q; double sum_q;
double rlx = 1.0 / tau; double rlx = 1.0 / tau;
int idx; int idx;
@ -734,7 +734,7 @@ extern "C" void ScaLBL_D3Q19_AAodd_Poisson(int *neighborList, int *Map,
f18 = dist[nr18]; f18 = dist[nr18];
sum_q = f1+f2+f3+f4+f5+f6+f7+f8+f9+f10+f11+f12+f13+f14+f15+f16+f17+f18; sum_q = f1+f2+f3+f4+f5+f6+f7+f8+f9+f10+f11+f12+f13+f14+f15+f16+f17+f18;
error = 8.0*(sum_q - f0) + rho_e; //error = 8.0*(sum_q - f0) + rho_e;
psi = 2.0*(f0*(1.0 - rlx) + rlx*(sum_q + 0.125*rho_e)); psi = 2.0*(f0*(1.0 - rlx) + rlx*(sum_q + 0.125*rho_e));

2
tests/TestCommD3Q19.cpp
View File

@ -439,7 +439,7 @@ int main(int argc, char **argv)
} }
// **************************************************** // ****************************************************
cout << fflush; //cout << fflush;
comm.barrier(); comm.barrier();
Utilities::shutdown(); Utilities::shutdown();
// **************************************************** // ****************************************************

2
tests/lbpm_nernst_planck_cell_simulator.cpp
View File

@ -103,7 +103,7 @@ int main(int argc, char **argv)
//----------------------------------- print out for debugging ------------------------------------------// //----------------------------------- print out for debugging ------------------------------------------//
if (rank==0){ if (rank==0){
for (size_t i=0;i<IonModel.timestepMax.size();i++){ for (size_t i=0;i<IonModel.timestepMax.size();i++){
printf("Main loop time_conv computed from ion %i: %.5g[s/lt]\n",i+1,IonModel.timestepMax[i]*IonModel.time_conv[i]); printf("Main loop time_conv computed from ion %lu: %.5g[s/lt]\n",i+1,IonModel.timestepMax[i]*IonModel.time_conv[i]);
} }
} }
//----------------------------------- print out for debugging ------------------------------------------// //----------------------------------- print out for debugging ------------------------------------------//

4
tests/lbpm_nernst_planck_simulator.cpp
View File

@ -74,7 +74,7 @@ int main(int argc, char **argv)
//----------------------------------- print out for debugging ------------------------------------------// //----------------------------------- print out for debugging ------------------------------------------//
if (rank==0){ if (rank==0){
for (size_t i=0;i<IonModel.timestepMax.size();i++){ for (size_t i=0;i<IonModel.timestepMax.size();i++){
printf("Main loop time_conv computed from ion %i: %.5g[s/lt]\n",i+1,IonModel.timestepMax[i]*IonModel.time_conv[i]); printf("Main loop time_conv computed from ion %lu: %.5g[s/lt]\n",i+1,IonModel.timestepMax[i]*IonModel.time_conv[i]);
} }
} }
//----------------------------------- print out for debugging ------------------------------------------// //----------------------------------- print out for debugging ------------------------------------------//
@ -90,7 +90,7 @@ int main(int argc, char **argv)
if (rank == 0){ if (rank == 0){
printf("********************************************************\n"); printf("********************************************************\n");
printf("Key Summary of LBPM electrokinetic single-fluid solver \n"); printf("Key Summary of LBPM electrokinetic single-fluid solver \n");
printf(" 1. Max LB Timestep: %li [lt]\n", Study.timestepMax); printf(" 1. Max LB Timestep: %i [lt]\n", Study.timestepMax);
printf(" 2. Time conversion factor per LB Timestep: %.6g [sec/lt]\n",Study.time_conv_MainLoop); printf(" 2. Time conversion factor per LB Timestep: %.6g [sec/lt]\n",Study.time_conv_MainLoop);
printf(" 3. Max Physical Time: %.6g [sec]\n",Study.timestepMax*Study.time_conv_MainLoop); printf(" 3. Max Physical Time: %.6g [sec]\n",Study.timestepMax*Study.time_conv_MainLoop);
printf("********************************************************\n"); printf("********************************************************\n");