DEME 2.1.1__tar.gz → 2.1.2__tar.gz

{deme-2.1.1/deme.egg-info → deme-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deme
-Version: 2.1.1
+Version: 2.1.2
 Summary: PyBind Wrapper Library for DEM-Engine
 Home-page: UNKNOWN
 Author: Ruochun Zhang

{deme-2.1.1 → deme-2.1.2/deme.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deme
-Version: 2.1.1
+Version: 2.1.2
 Summary: PyBind Wrapper Library for DEM-Engine
 Home-page: UNKNOWN
 Author: Ruochun Zhang

{deme-2.1.1 → deme-2.1.2}/setup.py

@@ -152,7 +152,7 @@ class CMakeBuild(build_ext):
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
     name="deme",
-    version="2.1.1",
+    version="2.1.2",
     author="Ruochun Zhang",
     author_email="ruochunz@gmail.com",
     description="PyBind Wrapper Library for DEM-Engine",

{deme-2.1.1 → deme-2.1.2}/src/DEM/APIPrivate.cpp

@@ -1148,6 +1148,12 @@ void DEMSolver::setSimParams() {
     }
     DEME_DEBUG_PRINTF("%u contact wildcards are in the force model.", nContactWildcards);
 
+    // Error-out velocity should be no smaller than the max velocity we can expect
+    if (threshold_error_out_vel < m_approx_max_vel) {
+        // Silently bring down m_approx_max_vel
+        m_approx_max_vel = threshold_error_out_vel;
+    }
+
     dT->setSimParams(nvXp2, nvYp2, nvZp2, l, m_voxelSize, m_binSize, nbX, nbY, nbZ, m_boxLBF, m_user_box_min,
                      m_user_box_max, G, m_ts_size, m_expand_factor, m_approx_max_vel, m_expand_safety_multi,
                      m_expand_base_vel, m_force_model[DEFAULT_FORCE_MODEL_NAME]->m_contact_wildcards,

{deme-2.1.1 → deme-2.1.2}/src/kernel/DEMMiscKernels.cu

@@ -1,5 +1,6 @@
 // DEM misc. kernels
 #include <DEM/Defines.h>
+#include <DEMHelperKernels.cuh>
 
 __global__ void markOwnerToChange(deme::notStupidBool_t* idBool,
                                   float* ownerFactors,
@@ -42,7 +43,12 @@ __global__ void computeMarginFromAbsv(deme::DEMSimParams* simParams,
     if (ownerID < n) {
         float absv = granData->marginSize[ownerID];
         unsigned int my_family = granData->familyID[ownerID];
-        if (absv > simParams->approxMaxVel || (!isfinite(absv))) {
+        if (!isfinite(absv)) {
+            // May produce messy error messages, but it's still good to know what entities went wrong
+            DEME_ABORT_KERNEL("Absolute velocity for ownerID %llu is not finite. This happened at time %.9g.\n",
+                              static_cast<unsigned long long>(ownerID), simParams->timeElapsed);
+        }
+        if (absv > simParams->approxMaxVel) {
             absv = simParams->approxMaxVel;
         }
         // User-specified extra margin also needs to be added here. This marginSize is used for bin--sph or bin--tri