From cc7f4d5f21a3d5f29b3e2a3f6215a0f451eba200 Mon Sep 17 00:00:00 2001
From: Francois Gygi <fgygi@ucdavis.edu>
Date: Fri, 23 Sep 2016 18:43:12 +0000
Subject: [PATCH] Fix alignment of timing information
git-svn-id: http://qboxcode.org/svn/qb/trunk@1899 cba15fb0-1239-40c8-b417-11db7ca47a34
---
src/BOSampleStepper.C | 7 ++++---
src/Bisection.C | 4 ++--
src/CPSampleStepper.C | 7 ++++---
src/ChargeDensity.C | 4 ++--
src/ElectricEnthalpy.C | 4 ++--
src/EnergyFunctional.C | 4 ++--
src/NonLocalPotential.C | 4 ++--
src/SampleStepper.C | 4 ++--
src/SlaterDet.C | 4 ++--
9 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/BOSampleStepper.C b/src/BOSampleStepper.C
index 58ec490..d651fdb 100644
--- a/src/BOSampleStepper.C
+++ b/src/BOSampleStepper.C
@@ -60,8 +60,8 @@ BOSampleStepper::~BOSampleStepper()
s_.ctxt_.dmax(1,1,&tmax,1);
if ( s_.ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
@@ -1191,7 +1191,8 @@ void BOSampleStepper::step(int niter)
s_.ctxt_.dmax(1,1,&tmax,1);
if ( onpe0 )
{
- cout << " <timing name=\"iteration\""
+ string s = "name=\"iteration\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/Bisection.C b/src/Bisection.C
index 92e0db6..c9d8dc2 100644
--- a/src/Bisection.C
+++ b/src/Bisection.C
@@ -434,8 +434,8 @@ void Bisection::compute_transform(const SlaterDet& sd, int maxsweep, double tol)
ctxt_.dmax(1,1,&tmax,1);
if ( ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/CPSampleStepper.C b/src/CPSampleStepper.C
index 1cb2649..2fdccda 100644
--- a/src/CPSampleStepper.C
+++ b/src/CPSampleStepper.C
@@ -69,8 +69,8 @@ CPSampleStepper::~CPSampleStepper(void)
s_.ctxt_.dmax(1,1,&tmax,1);
if ( s_.ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
@@ -268,7 +268,8 @@ void CPSampleStepper::step(int niter)
s_.ctxt_.dmax(1,1,&tmax,1);
if ( s_.ctxt_.myproc()==0 )
{
- cout << " <timing name=\"iteration\""
+ string s = "name=\"iteration\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/ChargeDensity.C b/src/ChargeDensity.C
index ce64ce0..b4bb87d 100644
--- a/src/ChargeDensity.C
+++ b/src/ChargeDensity.C
@@ -109,8 +109,8 @@ ChargeDensity::~ChargeDensity(void)
ctxt_.dmax(1,1,&tmax,1);
if ( ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/ElectricEnthalpy.C b/src/ElectricEnthalpy.C
index 630cd97..a90853e 100644
--- a/src/ElectricEnthalpy.C
+++ b/src/ElectricEnthalpy.C
@@ -162,8 +162,8 @@ ElectricEnthalpy::~ElectricEnthalpy(void)
s_.ctxt_.dmax(1,1,&tmax,1);
if ( pol_type_ != off && s_.ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/EnergyFunctional.C b/src/EnergyFunctional.C
index e95faa2..c8aefbd 100644
--- a/src/EnergyFunctional.C
+++ b/src/EnergyFunctional.C
@@ -209,8 +209,8 @@ EnergyFunctional::~EnergyFunctional(void)
s_.ctxt_.dmax(1,1,&tmax,1);
if ( s_.ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/NonLocalPotential.C b/src/NonLocalPotential.C
index 968a82d..358c610 100644
--- a/src/NonLocalPotential.C
+++ b/src/NonLocalPotential.C
@@ -40,8 +40,8 @@ NonLocalPotential::~NonLocalPotential(void)
ctxt_.dmax(1,1,&tmax,1);
if ( ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/SampleStepper.C b/src/SampleStepper.C
index 623918d..d3a30fe 100644
--- a/src/SampleStepper.C
+++ b/src/SampleStepper.C
@@ -54,8 +54,8 @@ SampleStepper::~SampleStepper(void)
s_.ctxt_.dmax(1,1,&tmax,1);
if ( s_.ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
diff --git a/src/SlaterDet.C b/src/SlaterDet.C
index 76b923c..00e4112 100644
--- a/src/SlaterDet.C
+++ b/src/SlaterDet.C
@@ -95,8 +95,8 @@ SlaterDet::~SlaterDet()
ctxt_.dmax(1,1,&tmax,1);
if ( ctxt_.myproc()==0 )
{
- cout << "<timing name=\""
- << (*i).first << "\""
+ string s = "name=\"" + (*i).first + "\"";
+ cout << "<timing " << left << setw(22) << s
<< " min=\"" << setprecision(3) << tmin << "\""
<< " max=\"" << setprecision(3) << tmax << "\"/>"
<< endl;
--
GitLab