Merge branch 'develop'

src/BOSampleStepper.cpp

@@ -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;

src/CPSampleStepper.cpp

@@ -196,7 +196,6 @@ void CPSampleStepper::step(int niter)
           }
         }
         cout << "</atomset>" << endl;
-        cout << "<rcm> " << atoms.rcm() << "</rcm>" << endl;
       }
 
       if ( s_.constraints.size() > 0 )

src/StatusCmd.h

@@ -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;
   }

src/release.cpp

@@ -19,5 +19,5 @@
 #include "release.h"
 std::string release(void)
 {
-  return std::string("rel1_74_0");
+  return std::string("rel1_74_0dev");
 }