Changes in src/Actions/WorldAction/ScaleBoxAction.cpp [623e89:3dcb1f]

File:

• src/Actions/WorldAction/ScaleBoxAction.cpp (modified) (4 diffs)

src/Actions/WorldAction/ScaleBoxAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/WorldAction/ScaleBoxAction.hpp"
 #include "atom.hpp"
@@ -12 +14 @@
 #include "verbose.hpp"
 #include "World.hpp"
+#include "Box.hpp"
+#include "Matrix.hpp"
 
 #include <iostream>
@@ -35 +39 @@
   Vector Scaler;
   double x[NDIM];
-  int j=0;
 
-  dialog->queryVector(NAME, &Scaler, World::getInstance().getDomain(), false, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryVector(NAME, &Scaler, false, MapOfActions::getInstance().getDescription(NAME));
 
   if(dialog->display()) {
@@ -47 +50 @@
       (*AtomRunner)->x.ScaleAll(x);
     }
-    j = -1;
-    double * const cell_size = World::getInstance().getDomain();
+
+    Matrix M = World::getInstance().getDomain().getM();
+    Matrix scale;
+
     for (int i=0;i<NDIM;i++) {
-      j += i+1;
-      cell_size[j]*=x[i];
+      scale.at(i,i) = x[i];
     }
+    M *= scale;
+    World::getInstance().setDomain(M);
 
     delete dialog;