Changes in src/Actions/FillAction/FillRegularGridAction.cpp [be21fa:f10b0c]

File:

• src/Actions/FillAction/FillRegularGridAction.cpp (modified) (4 diffs)

src/Actions/FillAction/FillRegularGridAction.cpp

@@ -82 +82 @@
   LinkedCell_deprecated * LC = NULL;
   Tesselation * TesselStruct = NULL;
-  if (params.SphereRadius != 0.) {
+  if (params.SphereRadius.get() != 0.) {
     if ( atoms.size() == 0) {
-      ELOG(1, "You have given a sphere radius " << params.SphereRadius
+      ELOG(1, "You have given a sphere radius " << params.SphereRadius.get()
           << " != 0, but have not select any molecules.");
       return Action::failure;
@@ -92 +92 @@
 
     // create tesselation
-    LC = new LinkedCell_deprecated(cloud, 2.*params.SphereRadius);
+    LC = new LinkedCell_deprecated(cloud, 2.*params.SphereRadius.get());
     TesselStruct = new Tesselation;
-    (*TesselStruct)(cloud, params.SphereRadius);
+    (*TesselStruct)(cloud, params.SphereRadius.get());
 
     // and create predicate
@@ -106 +106 @@
     FillPredicate *voidnode_predicate = new FillPredicate(
         IsVoidNode_FillPredicate(
-            Sphere(zeroVec, params.mindistance)
+            Sphere(zeroVec, params.mindistance.get())
             )
         );
@@ -112 +112 @@
     if (surface_predicate != NULL)
       Andpredicate = (Andpredicate) && !(*surface_predicate);
-    Mesh *mesh = new CubeMesh(params.counts, params.offset, World::getInstance().getDomain().getM());
+    Mesh *mesh = new CubeMesh(params.counts.get(), params.offset.get(), World::getInstance().getDomain().getM());
     Inserter *inserter = new Inserter(
         Inserter::impl_ptr(
             new RandomInserter(
-                params.RandAtomDisplacement,
-                params.RandMoleculeDisplacement,
-                params.DoRotate)
+                params.RandAtomDisplacement.get(),
+                params.RandMoleculeDisplacement.get(),
+                params.DoRotate.get())
             )
         );