From d3dc35c0182930207286be3ad091956b51e4b539 Mon Sep 17 00:00:00 2001 From: James McClure Date: Fri, 22 Apr 2022 14:30:03 -0400 Subject: [PATCH] fix bad ref to D3Q7 --- models/IonModel.cpp | 4 ++-- models/PoissonSolver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/IonModel.cpp b/models/IonModel.cpp index d48e52ff..89416245 100644 --- a/models/IonModel.cpp +++ b/models/IonModel.cpp @@ -809,9 +809,9 @@ void ScaLBL_IonModel::AssignIonConcentrationMembrane( double *Ci, int ic) { int idx = Map(i, j, k); if (!(idx < 0)) { if (MembraneDistance(i,j,k) < 0.0) { - VALUE = MembraneIonConcentration[ic]* (h * h * h * 1.0e-18); + VALUE = MembraneIonConcentration[ic];//* (h * h * h * 1.0e-18); } else { - VALUE = IonConcentration[ic]* (h * h * h * 1.0e-18); + VALUE = IonConcentration[ic];//* (h * h * h * 1.0e-18); } Ci[idx] = VALUE; diff --git a/models/PoissonSolver.cpp b/models/PoissonSolver.cpp index 1c86eed8..5d21d5c4 100644 --- a/models/PoissonSolver.cpp +++ b/models/PoissonSolver.cpp @@ -721,9 +721,9 @@ void ScaLBL_Poisson::SolvePoissonAAodd(double *ChargeDensity, bool UseSlippingVe void ScaLBL_Poisson::SolvePoissonAAeven(double *ChargeDensity, bool UseSlippingVelBC){ ScaLBL_Comm->SendD3Q19AA(fq); //READ FROM NORMAL - ScaLBL_D3Q7_AAeven_Poisson(dvcMap, fq, ChargeDensity, Psi, ElectricField, tau, epsilon_LB, UseSlippingVelBC, ScaLBL_Comm->FirstInterior(), ScaLBL_Comm->LastInterior(), Np); + ScaLBL_D3Q19_AAeven_Poisson(dvcMap, fq, ChargeDensity, Psi, ElectricField, tau, epsilon_LB, UseSlippingVelBC, ScaLBL_Comm->FirstInterior(), ScaLBL_Comm->LastInterior(), Np); ScaLBL_Comm->RecvD3Q19AA(fq); //WRITE INTO OPPOSITE - ScaLBL_D3Q7_AAeven_Poisson(dvcMap, fq, ChargeDensity, Psi, ElectricField, tau, epsilon_LB, UseSlippingVelBC, 0, ScaLBL_Comm->LastExterior(), Np); + ScaLBL_D3Q19_AAeven_Poisson(dvcMap, fq, ChargeDensity, Psi, ElectricField, tau, epsilon_LB, UseSlippingVelBC, 0, ScaLBL_Comm->LastExterior(), Np); ScaLBL_Comm->Barrier(); //ScaLBL_Comm->SolidDirichletAndNeumannD3Q7(fq, Psi, Psi_BCLabel); }