diff --git a/models/IonModel.cpp b/models/IonModel.cpp index 3479bb95..0781eb4e 100644 --- a/models/IonModel.cpp +++ b/models/IonModel.cpp @@ -1453,7 +1453,7 @@ void ScaLBL_IonModel::RunMembrane(double *Velocity, double *ElectricField, doubl ScaLBL_Comm->LastExterior(), Np); } - DoubleArray Charge(Nx,Ny,Nz); + /* DoubleArray Charge(Nx,Ny,Nz); ScaLBL_Comm->RegularLayout(Map, ChargeDensity, Charge); double charge_sum=0.0; double charge_sum_total=0.0; @@ -1467,7 +1467,7 @@ void ScaLBL_IonModel::RunMembrane(double *Velocity, double *ElectricField, doubl printf(" Local charge value = %.8g (rank=%i)\n",charge_sum, rank); ScaLBL_Comm->Barrier(); comm.barrier(); - + */ ScaLBL_Comm->Barrier(); comm.barrier(); //if (rank==0) printf(" IonMembrane: completeted full step \n"); diff --git a/tests/lbpm_cell_simulator.cpp b/tests/lbpm_cell_simulator.cpp index d4f3ef61..18c719c8 100644 --- a/tests/lbpm_cell_simulator.cpp +++ b/tests/lbpm_cell_simulator.cpp @@ -114,17 +114,16 @@ int main(int argc, char **argv) timestep++; PoissonSolver.Run(IonModel.ChargeDensity,SlipBC,timestep);//solve Poisson equtaion to get steady-state electrical potental comm.barrier(); - if (rank == 0) printf(" Poisson step %i \n",timestep); - //StokesModel.Run_Lite(IonModel.ChargeDensity, PoissonSolver.ElectricField);// Solve the N-S equations to get velocity - fflush(stdout); + //if (rank == 0) printf(" Poisson step %i \n",timestep); + StokesModel.Run_Lite(IonModel.ChargeDensity, PoissonSolver.ElectricField);// Solve the N-S equations to get velocity + //fflush(stdout); IonModel.RunMembrane(StokesModel.Velocity,PoissonSolver.ElectricField,PoissonSolver.Psi); //solve for ion transport with membrane comm.barrier(); - if (rank == 0) printf(" Membrane step %i \n",timestep); - fflush(stdout); + //if (rank == 0) printf(" Membrane step %i \n",timestep); + //fflush(stdout); timestep++;//AA operations - if (timestep%Study.analysis_interval==0){ Analysis.Basic(IonModel,PoissonSolver,StokesModel,timestep); @@ -137,7 +136,6 @@ int main(int argc, char **argv) //StokesModel.getVelocity(timestep); } - } if (rank==0) printf("Save simulation raw data at maximum timestep\n");