fix charge density (i think)

This commit is contained in:
James E McClure
2022-04-24 16:48:12 -04:00
parent 3642a6ae9b
commit 429413ce3b
2 changed files with 7 additions and 9 deletions

View File

@@ -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");

View File

@@ -114,18 +114,17 @@ 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");