From 7ef18bfea3e1390e506d431e898757728bd2b975 Mon Sep 17 00:00:00 2001 From: Rex Zhe Li Date: Fri, 4 Dec 2020 00:37:02 -0500 Subject: [PATCH] make the WriteLog in PoissonSolver a bool type to facilitate input --- models/PoissonSolver.cpp | 12 +++--------- models/PoissonSolver.h | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/models/PoissonSolver.cpp b/models/PoissonSolver.cpp index 0ef13c84..c50d8816 100644 --- a/models/PoissonSolver.cpp +++ b/models/PoissonSolver.cpp @@ -36,7 +36,7 @@ void ScaLBL_Poisson::ReadParams(string filename){ Vin = 1.0; //Boundary-z (inlet) electric potential Vout = 1.0; //Boundary-Z (outlet) electric potential chargeDen_dummy = 1.0e-3;//For debugging;unit=[C/m^3] - WriteLog = 0; + WriteLog = false; // LB-Poisson Model parameters if (electric_db->keyExists( "timestepMax" )){ @@ -55,13 +55,7 @@ void ScaLBL_Poisson::ReadParams(string filename){ chargeDen_dummy = electric_db->getScalar( "DummyChargeDen" ); } if (electric_db->keyExists( "WriteLog" )){ - auto writelog = electric_db->getScalar( "WriteLog" ); - if (writelog !="True" && writelog !="False"){ - ERROR("Error: LB-Poisson Solver: WriteLog cannot be identified! Uesage: WriteLog is either True or False.\n"); - } - else if (writelog =="True"){ - WriteLog = 1; - } + WriteLog = electric_db->getScalar( "WriteLog" ); } // Read solid boundary condition specific to Poisson equation @@ -466,7 +460,7 @@ void ScaLBL_Poisson::Run(double *ChargeDensity){ psi_avg_previous = psi_avg; } } - if(WriteLog==1){ + if(WriteLog==true){ getConvergenceLog(timestep,error); } diff --git a/models/PoissonSolver.h b/models/PoissonSolver.h index f4d2efd7..241e871a 100644 --- a/models/PoissonSolver.h +++ b/models/PoissonSolver.h @@ -46,7 +46,7 @@ public: double epsilon0,epsilon0_LB,epsilonR,epsilon_LB; double Vin, Vout; double chargeDen_dummy;//for debugging - short WriteLog; + bool WriteLog; int Nx,Ny,Nz,N,Np; int rank,nprocx,nprocy,nprocz,nprocs;