Merge branch 'FOM_dev' of github.com:JamesEMcClure/LBPM-WIA into FOM_dev

This commit is contained in:
Rex Zhe Li 2021-05-20 09:16:41 -04:00
commit 3de437eddf
2 changed files with 2 additions and 3 deletions

View File

@ -831,8 +831,8 @@ void ScaLBL_IonModel::Run(double *Velocity, double *ElectricField){
if (BoundaryConditionSolid==1){ if (BoundaryConditionSolid==1){
//TODO IonSolid may also be species-dependent //TODO IonSolid may also be species-dependent
ScaLBL_Comm->SolidDirichletD3Q7(&fq[ic*Np*7], IonSolid); ScaLBL_Comm->SolidDirichletD3Q7(&fq[ic*Np*7], IonSolid);
ScaLBL_Comm->Barrier(); comm.barrier();
} }
ScaLBL_Comm->Barrier(); comm.barrier();
// *************EVEN TIMESTEP*************// // *************EVEN TIMESTEP*************//
timestep++; timestep++;
@ -875,8 +875,8 @@ void ScaLBL_IonModel::Run(double *Velocity, double *ElectricField){
if (BoundaryConditionSolid==1){ if (BoundaryConditionSolid==1){
//TODO IonSolid may also be species-dependent //TODO IonSolid may also be species-dependent
ScaLBL_Comm->SolidDirichletD3Q7(&fq[ic*Np*7], IonSolid); ScaLBL_Comm->SolidDirichletD3Q7(&fq[ic*Np*7], IonSolid);
ScaLBL_Comm->Barrier(); comm.barrier();
} }
ScaLBL_Comm->Barrier(); comm.barrier();
} }
} }

View File

@ -99,7 +99,6 @@ void ScaLBL_Poisson::ReadParams(string filename){
} }
//Re-calcualte model parameters if user updates input //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 epsilon_LB = epsilon0_LB*epsilonR;//electric permittivity
if (rank==0) printf("***********************************************************************************\n"); if (rank==0) printf("***********************************************************************************\n");