Commit ce047a09 authored by Francois Gygi's avatar Francois Gygi
Browse files

Merge branch 'develop'

parents 9a87cfd2 b06d3a34
......@@ -510,7 +510,6 @@ void BOSampleStepper::step(int niter)
}
}
cout << "</atomset>" << endl;
cout << "<rcm> " << atoms.rcm() << "</rcm>" << endl;
cout << setprecision(6);
cout << "<unit_cell_a_norm> " << atoms.cell().a_norm(0)
<< " </unit_cell_a_norm>" << endl;
......
......@@ -196,7 +196,6 @@ void CPSampleStepper::step(int niter)
}
}
cout << "</atomset>" << endl;
cout << "<rcm> " << atoms.rcm() << "</rcm>" << endl;
}
if ( s_.constraints.size() > 0 )
......
......@@ -71,8 +71,11 @@ class StatusCmd : public Cmd
s->wfv->info(cout,"wfv");
if ( ui->onpe0() )
{
cout << "<rcm> " << s->atoms.rcm() << " </rcm>" << endl;
cout << "<vcm> " << s->atoms.vcm() << " </vcm>" << endl;
setprecision(8);
cout << "<rcm> " << setprecision(8) << s->atoms.rcm()
<< " </rcm>" << endl;
cout << "<vcm> " << setprecision(8) << s->atoms.vcm()
<< " </vcm>" << endl;
}
return 0;
}
......
......@@ -19,5 +19,5 @@
#include "release.h"
std::string release(void)
{
return std::string("rel1_74_0");
return std::string("rel1_74_0dev");
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment