diff --git a/models/IonModel.cpp b/models/IonModel.cpp index 67887811..136af02f 100644 --- a/models/IonModel.cpp +++ b/models/IonModel.cpp @@ -831,8 +831,8 @@ void ScaLBL_IonModel::Run(double *Velocity, double *ElectricField){ if (BoundaryConditionSolid==1){ //TODO IonSolid may also be species-dependent ScaLBL_Comm->SolidDirichletD3Q7(&fq[ic*Np*7], IonSolid); - ScaLBL_Comm->Barrier(); comm.barrier(); } + ScaLBL_Comm->Barrier(); comm.barrier(); // *************EVEN TIMESTEP*************// timestep++; @@ -875,8 +875,8 @@ void ScaLBL_IonModel::Run(double *Velocity, double *ElectricField){ if (BoundaryConditionSolid==1){ //TODO IonSolid may also be species-dependent ScaLBL_Comm->SolidDirichletD3Q7(&fq[ic*Np*7], IonSolid); - ScaLBL_Comm->Barrier(); comm.barrier(); } + ScaLBL_Comm->Barrier(); comm.barrier(); } } diff --git a/models/PoissonSolver.cpp b/models/PoissonSolver.cpp index b1e99776..7f4d7cdc 100644 --- a/models/PoissonSolver.cpp +++ b/models/PoissonSolver.cpp @@ -99,7 +99,6 @@ void ScaLBL_Poisson::ReadParams(string filename){ } //Re-calcualte model parameters if user updates input - epsilon0_LB = epsilon0*(h*1.0e-6);//unit:[C/(V*lu)] epsilon_LB = epsilon0_LB*epsilonR;//electric permittivity if (rank==0) printf("***********************************************************************************\n");