DEME 0.3.4__tar.gz → 0.3.5__tar.gz

{DEME-0.3.4 → DEME-0.3.5/DEME.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DEME
-Version: 0.3.4
+Version: 0.3.5
 Summary: PyBind Wrapper Library for DEM-Engine
 Home-page: UNKNOWN
 Author: Rouchun Zhang

{DEME-0.3.4/DEME.egg-info → DEME-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DEME
-Version: 0.3.4
+Version: 0.3.5
 Summary: PyBind Wrapper Library for DEM-Engine
 Home-page: UNKNOWN
 Author: Rouchun Zhang

{DEME-0.3.4 → DEME-0.3.5}/setup.py

@@ -148,7 +148,7 @@ class CMakeBuild(build_ext):
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
     name="DEME",
-    version="0.3.4",
+    version="0.3.5",
     author="Rouchun Zhang",
     author_email="rzhang294@wisc.edu",
     description="PyBind Wrapper Library for DEM-Engine",

{DEME-0.3.4 → DEME-0.3.5}/src/DEM/BdrsAndObjs.h

@@ -95,6 +95,12 @@ class DEMExternObj : public DEMInitializer {
     // Obj's MOI (huge by default)
     float3 MOI = make_float3(1e6);
 
+    float GetMass() { return mass; }
+    std::vector<float> GetMOI() {
+        std::vector<float> res = {MOI.x, MOI.y, MOI.z};
+        return res;
+    }
+
     union DEMAnalEntParams {
         DEMPlateParams_t plate;
         DEMPlaneParams_t plane;
@@ -384,6 +390,12 @@ class DEMMeshConnected : public DEMInitializer {
     // Mesh's MOI
     float3 MOI = make_float3(1.f);
 
+    float GetMass() { return mass; }
+    std::vector<float> GetMOI() {
+        std::vector<float> res = {MOI.x, MOI.y, MOI.z};
+        return res;
+    }
+
     std::string filename;  ///< file string if loading an obj file
 
     // If true, when the mesh is initialized into the system, it will re-order the nodes of each triangle so that the
@@ -557,7 +569,7 @@ class DEMMeshConnected : public DEMInitializer {
         // Never let mass become negative.
         double prod = std::abs((double)s.x * (double)s.y * (double)s.z);
         mass *= prod;
-        MOI.x *= prod * s.x * s.x; // Square, so always positive
+        MOI.x *= prod * s.x * s.x;  // Square, so always positive
         MOI.y *= prod * s.y * s.y;
         MOI.z *= prod * s.z * s.z;
     }

{DEME-0.3.4 → DEME-0.3.5}/src/DEM/PyDEME.cpp

@@ -44,7 +44,9 @@ PYBIND11_MODULE(DEME, obj) {
     // To define methods independent of a class, use obj.def() syntax to wrap them!
     obj.def("FrameTransformGlobalToLocal", &deme::FrameTransformGlobalToLocal,
             "Translating the inverse of the provided vec then applying a local inverse rotation of the provided rot_Q, "
-            "then return the result");
+            "then return the result.");
+    obj.def("FrameTransformLocalToGlobal", &deme::FrameTransformLocalToGlobal,
+            "Apply a local rotation then a translation, then return the result.");
     obj.def("GetDEMEDataFile", &deme::GetDEMEDataFile);
     obj.def("DEMBoxGridSampler",
             static_cast<std::vector<std::vector<float>> (*)(const std::vector<float>&, const std::vector<float>&, float,
@@ -639,6 +641,8 @@ PYBIND11_MODULE(DEME, obj) {
 
     py::class_<deme::DEMClumpTemplate, std::shared_ptr<deme::DEMClumpTemplate>>(obj, "DEMClumpTemplate")
         .def(py::init<>())
+        .def("Mass", &deme::DEMClumpTemplate::GetMass)
+        .def("MOI", &deme::DEMClumpTemplate::GetMOI)
         .def("SetMass", &deme::DEMClumpTemplate::SetMass)
         .def("SetMOI",
              static_cast<void (deme::DEMClumpTemplate::*)(const std::vector<float>&)>(&deme::DEMClumpTemplate::SetMOI))
@@ -701,6 +705,8 @@ PYBIND11_MODULE(DEME, obj) {
 
     py::class_<deme::DEMExternObj, deme::DEMInitializer, std::shared_ptr<deme::DEMExternObj>>(obj, "DEMExternObj")
         .def(py::init<>())
+        .def("Mass", &deme::DEMExternObj::GetMass)
+        .def("MOI", &deme::DEMExternObj::GetMOI)
         .def("SetFamily", &deme::DEMExternObj::SetFamily, "Defines an object contact family number")
         .def("SetMass", &deme::DEMExternObj::SetMass, "Sets the mass of this object")
         .def("SetMOI",
@@ -745,6 +751,8 @@ PYBIND11_MODULE(DEME, obj) {
         .def(py::init<>())
         .def(py::init<std::string&>())
         .def(py::init<std::string, const std::shared_ptr<deme::DEMMaterial>&>())
+        .def("Mass", &deme::DEMMeshConnected::GetMass)
+        .def("MOI", &deme::DEMMeshConnected::GetMOI)
         .def("Clear", &deme::DEMMeshConnected::Clear, "Clears everything from memory")
         .def("LoadWavefrontMesh", &deme::DEMMeshConnected::LoadWavefrontMesh,
              "Load a triangle mesh saved as a Wavefront .obj file", py::arg("input_file"),

{DEME-0.3.4 → DEME-0.3.5}/src/DEM/Structs.h

@@ -609,6 +609,12 @@ class DEMClumpTemplate {
     std::vector<std::shared_ptr<DEMMaterial>> materials;
     unsigned int nComp = 0;  // Number of components
 
+    float GetMass() { return mass; }
+    std::vector<float> GetMOI() {
+        std::vector<float> res = {MOI.x, MOI.y, MOI.z};
+        return res;
+    }
+
     /// Set mass.
     void SetMass(float mass) { this->mass = mass; }
     /// Set MOI (in principal frame).

{DEME-0.3.4 → DEME-0.3.5}/src/demo/pyDEME_ConePenetration.py

@@ -235,7 +235,7 @@ if __name__ == "__main__":
         # terrain_max_z = max_z_finder.GetValue()
         forces = tip_tracker.ContactAcc()
         # Note cone_mass is not the true mass, b/c we scaled the the cone tip! So we use true mass by using cone_mass
-        forces = np.array(forces) * cone_mass
+        forces = np.array(forces) * cone_tip.Mass()
         # forces[2] is the z dir force
         pressure = np.abs(forces[2]) / cone_surf_area
         if ((pressure > 1e-4) and not (hit_terrain)):
@@ -245,7 +245,7 @@ if __name__ == "__main__":
         penetration = tip_z_when_first_hit - tip_z if hit_terrain else 0.
         print(f"Time: {t}", flush=True)
         print(f"Z coord of tip: {tip_z}", flush=True)
-        print(f"Penetration: {penetration}, flush=True")
+        print(f"Penetration: {penetration}", flush=True)
         print(
             f"Force on cone: {forces[0]}, {forces[1]}, {forces[2]}", flush=True)
         print(f"Pressure: {pressure}", flush=True)

{DEME-0.3.4 → DEME-0.3.5}/src/demo/pyDEME_FlexibleMesh.py

@@ -226,7 +226,7 @@ if __name__ == "__main__":
                 flex_mesh_tracker.GetMeshNodesGlobal())
             # If you need the current RELATIVE (to the CoM) locations of the mesh nodes instead of global coordinates,
             # you can get it like the following:
-            # std::vector<float3> node_current_location(mesh_handle->GetCoordsVertices());
+            # node_current_location = mesh_handle.GetCoordsVertices()
 
             # Now calculate how much each node should `wave' and update the node location array. Remember z = 1 is
             # where the highest (relative) mesh node is. Again, this is artificial and only for showcasing this
@@ -243,11 +243,11 @@ if __name__ == "__main__":
 
             # 1. We should respect the actual CoM location of the mesh. We get the global coords of mesh nodes using
             # GetMeshNodesGlobal, but UpdateMesh works with mesh's local or say relative coordinates, and that is why
-            # we do applyFrameTransformGlobalToLocal first. And depending on your setup, the CoM and coord frame of
+            # we do FrameTransformGlobalToLocal first. And depending on your setup, the CoM and coord frame of
             # your mesh might be moving, and if it moves and rotates then you probably need to move and rotate the
             # points you got to offset the influence of CoM and local frame first. That said, if you use
-            # mesh_handle->GetCoordsVertices() as I mentioned above to get the relative node positions of the mesh,
-            # then no need to applyFrameTransformGlobalToLocal the CoM and rotate the frame.
+            # mesh_handle.GetCoordsVertices() as I mentioned above to get the relative node positions of the mesh,
+            # then no need to FrameTransformGlobalToLocal the CoM and rotate the frame.
 
             # 2. UpdateMesh will update the relative locations of mesh nodes to your specified locations. But if you
             # just have the information on the amount of mesh deformation, then you can use UpdateMeshByIncrement
@@ -255,9 +255,9 @@ if __name__ == "__main__":
 
             mesh_CoM_pos = flex_mesh_tracker.Pos()
             mesh_frame_oriQ = flex_mesh_tracker.OriQ()
-            for node in node_current_location:
-                node = DEME.FrameTransformGlobalToLocal(
-                    node, mesh_CoM_pos, mesh_frame_oriQ)
+            for i in range(node_current_location.shape[0]):
+                node_current_location[i, :] = DEME.FrameTransformGlobalToLocal(
+                    node_current_location[i, :], mesh_CoM_pos, mesh_frame_oriQ)
             flex_mesh_tracker.UpdateMesh(node_current_location)
 
             # Forces need to be extracted, if you want to use an external solver to solve the mesh's deformation. You