Merge pull request #1898 from glotzerlab/allow-spherocylinder

joaander · web-flow · commit 2d9d4dfbd193 · 2024-10-02T14:34:12.000-04:00
Remove restriction that prevents logging spherocylinder shape
diff --git a/hoomd/hpmc/ShapeSpheropolyhedron.h b/hoomd/hpmc/ShapeSpheropolyhedron.h
@@ -189,10 +189,6 @@ template<> inline std::string getShapeSpec(const ShapeSpheropolyhedron& spoly)
         {
         shapedef << "{\"type\": \"Sphere\", " << "\"diameter\": " << verts.diameter << "}";
         }
-    else if (nverts == 2)
-        {
-        throw std::runtime_error("Shape definition not supported for 2-vertex spheropolyhedra");
-        }
     else
         {
         shapedef << "{\"type\": \"ConvexPolyhedron\", \"rounding_radius\": " << verts.sweep_radius

Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,6 @@ template<> inline std::string getShapeSpec(const ShapeSpheropolyhedron& spoly)`
`189`	`189`	`{`
`190`	`190`	`shapedef << "{\"type\": \"Sphere\", " << "\"diameter\": " << verts.diameter << "}";`
`191`	`191`	`}`
`192`		`- else if (nverts == 2)`
`193`		`- {`
`194`		`- throw std::runtime_error("Shape definition not supported for 2-vertex spheropolyhedra");`
`195`		`- }`
`196`	`192`	`else`
`197`	`193`	`{`
`198`	`194`	`shapedef << "{\"type\": \"ConvexPolyhedron\", \"rounding_radius\": " << verts.sweep_radius`