Changes in src/Parser/PcpParser.cpp [84c494:5773a9]

File:

• src/Parser/PcpParser.cpp (modified) (6 diffs)

src/Parser/PcpParser.cpp

@@ -20 +20 @@
 #include "verbose.hpp"
 #include "World.hpp"
-#include "Matrix.hpp"
-#include "Box.hpp"
 
 /** Constructor of PcpParser.
@@ -90 +88 @@
   IsAngstroem = 1;
   RelativeCoord = 0;
+  StructOpt = 0;
   MaxTypes = 0;
 }
@@ -211 +210 @@
   // Unit cell and magnetic field
   ParseForParameter(verbose,FileBuffer, "BoxLength", 0, 3, 3, lower_trigrid, BoxLength, 1, critical); /* Lattice->RealBasis */
-  double *cell_size = new double[6];
+  double * const cell_size = World::getInstance().getDomain();
   cell_size[0] = BoxLength[0];
   cell_size[1] = BoxLength[3];
@@ -218 +217 @@
   cell_size[4] = BoxLength[7];
   cell_size[5] = BoxLength[8];
-  World::getInstance().setDomain(cell_size);
-  delete[] cell_size;
   //if (1) fprintf(stderr,"\n");
 
@@ -330 +327 @@
 void PcpParser::save(std::ostream* file)
 {
-  const Matrix &domain = World::getInstance().getDomain().getM();
+  const double * const cell_size = World::getInstance().getDomain();
   class ThermoStatContainer *Thermostats = World::getInstance().getThermostats();
   if (!file->fail()) {
@@ -415 +412 @@
     *file << endl;
     *file << "BoxLength\t\t\t# (Length of a unit cell)" << endl;
-    *file << domain.at(0,0) << "\t" << endl;
-    *file << domain.at(1,0) << "\t" << domain.at(1,1) << "\t" << endl;
-    *file << domain.at(2,0) << "\t" << domain.at(2,1) << "\t" << domain.at(2,2) << "\t" << endl;
+    *file << cell_size[0] << "\t" << endl;
+    *file << cell_size[1] << "\t" << cell_size[2] << "\t" << endl;
+    *file << cell_size[3] << "\t" << cell_size[4] << "\t" << cell_size[5] << "\t" << endl;
     // FIXME
     *file << endl;