Context Navigation

-              rb6b3b2
+              r528b3e
   RedoAction.cpp \
   UndoAction.cpp \
+  Values.cpp \
   ValueStorage.cpp
 …
   ${TESSELATIONACTIONHEADER} \
   ${WORLDACTIONHEADER} \
   ValueStorage.hpp \
   Values.hpp
+  Values.hpp \
+  ValueStorage.hpp
 ANALYSISACTIONSOURCE = \

TabularUnified src/Actions/Values.hpp ¶

-              rb6b3b2
+              r528b3e
 #endif
+#include "Helpers/defs.hpp"
+class Box;
+class BoxVector;
+class Vector;
+/** This is just a temporary container for values parsed from the command line.
+ * I.e. this is only used within CommandLineParser, where VectorType and alikes
+ * are registered as VectorValue and lateron inside the CommandLineQuery placed
+ * into the real vector.
+ */
 struct VectorValue
+{
+  double x;
+  double y;
+  double z;
+  double vector[NDIM];
+  Vector toVector() const;
+  BoxVector toBoxVector(Box &_box) const;
 };
+/** This is just a temporary container for values parsed from the command line.
+ * I.e. this is only used within CommandLineParser, where BoxType is registered
+ * as BoxValue and lateron inside the CommandLineQuery placed into the real Box.
+ */
 struct BoxValue
+{
+  double xx;
+  double yx;
+  double yy;
+  double zx;
+  double zy;
+  double zz;
+  double matrix[(NDIM*(NDIM+1))/2];
+  Box toBox() const;
 };

-              rb6b3b2
+              r528b3e
 using namespace std;
+Box::Box()
+{
+  M= new RealSpaceMatrix();
+Box::Box() :
+    M(new RealSpaceMatrix()),
+    Minv(new RealSpaceMatrix())
+{
   M->setIdentity();
-  Minv = new RealSpaceMatrix();
   Minv->setIdentity();
   conditions.resize(3);
 …
+}
+Box::Box(const Box& src){
+  M=new RealSpaceMatrix(*src.M);
+  Minv = new RealSpaceMatrix(*src.Minv);
+  conditions = src.conditions;
+Box::Box(const Box& src) :
+  conditions(src.conditions),
+  M(new RealSpaceMatrix(*src.M)),
+  Minv(new RealSpaceMatrix(*src.Minv))
+{}
+Box::Box(RealSpaceMatrix _M) :
+    M(new RealSpaceMatrix(_M)),
+    Minv(new RealSpaceMatrix())
+{
+  ASSERT(M->determinant()!=0,"Matrix in Box construction was not invertible");
+  *Minv = M->invert();
+}
 …
   return *this;
+}
+ostream & operator << (ostream& ost, const Box &m)
+{
+  ost << m.getM();
+  return ost;
+}

-              rb6b3b2
+              r528b3e
   Box();
   Box(const Box&);
+  Box(RealSpaceMatrix _M);
   virtual ~Box();
 …
 };
+ostream & operator << (ostream& ost, const Box &m);
 #endif /* BOX_HPP_ */

-              rb6b3b2
+              r528b3e
 #endif
+  }
+  VV.x = boost::lexical_cast<double>(components.at(0));
+  VV.y = boost::lexical_cast<double>(components.at(1));
+  VV.z = boost::lexical_cast<double>(components.at(2));
+  for (size_t i=0;i<NDIM;++i)
+    VV.vector[i] = boost::lexical_cast<double>(components.at(i));
   v = boost::any(VectorValue(VV));
+}
 …
 #endif
+  }
+  BV.xx = boost::lexical_cast<double>(components.at(0));
+  BV.yx = boost::lexical_cast<double>(components.at(1));
+  BV.yy = boost::lexical_cast<double>(components.at(2));
+  BV.zx = boost::lexical_cast<double>(components.at(3));
+  BV.zy = boost::lexical_cast<double>(components.at(4));
+  BV.zz = boost::lexical_cast<double>(components.at(5));
+  for (size_t i=0;i<(NDIM*(NDIM+1))/2; ++i)
+    BV.matrix[i] = boost::lexical_cast<double>(components.at(i));
   v = boost::any(BoxValue(BV));
+}

-              rb6b3b2
+              r528b3e
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     temp = CommandLineParser::getInstance().vm[getTitle()].as< BoxValue >();
+    RealSpaceMatrix M;
+    M.set(0,0, temp.xx);
+    M.set(0,1, temp.yx);
+    M.set(0,2, temp.zx);
+    M.set(1,0, temp.yx);
+    M.set(1,1, temp.yy);
+    M.set(1,2, temp.zy);
+    M.set(2,0, temp.zx);
+    M.set(2,1, temp.zy);
+    M.set(2,2, temp.zz);
+    tmp.setM(M);
+    tmp = temp.toBox();
     return true;
   } else {

-              rb6b3b2
+              r528b3e
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     temp = CommandLineParser::getInstance().vm[getTitle()].as< VectorValue >();
+    tmp[0] = temp.x;
+    tmp[1] = temp.y;
+    tmp[2] = temp.z;
+    tmp = temp.toVector();
     if ((check) && (!World::getInstance().getDomain().isInside(tmp))) {
       DoeLog(1) && (eLog() << Verbose(1) << "Vector " << tmp << " would be outside of box domain." << endl);

-              rb6b3b2
+              r528b3e
     temporary = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<VectorValue> >();
     for(std::vector<VectorValue>::iterator iter = temporary.begin(); iter != temporary.end(); ++iter) {
+      temp[0] = (*iter).x;
+      temp[1] = (*iter).y;
+      temp[2] = (*iter).z;
+      temp = (*iter).toVector();
       if ((!check) || (World::getInstance().getDomain().isInside(temp)))
         tmp.push_back(temp);

Note: See TracChangeset for help on using the changeset viewer.