DEME 2.0.7__tar.gz → 2.1.1__tar.gz

{deme-2.0.7 → deme-2.1.1}/CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.18)
 
 # Version information
 set(DEME_VERSION_MAJOR   2)
-set(DEME_VERSION_MINOR   0)
+set(DEME_VERSION_MINOR   1)
 set(DEME_VERSION_PATCH   0)
 
 project(

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

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

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

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

{deme-2.0.7 → deme-2.1.1}/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.0.7",
+    version="2.1.1",
     author="Ruochun Zhang",
     author_email="ruochunz@gmail.com",
     description="PyBind Wrapper Library for DEM-Engine",

{deme-2.0.7 → deme-2.1.1}/src/DEM/kT.cpp

@@ -134,7 +134,7 @@ inline void DEMKinematicThread::unpackMyBuffer() {
                         solverScratchSpace);
     // Get the reduced maxVel value
     stateParams.maxVel.toHost();
-    if (*(stateParams.maxVel) > simParams->errOutVel) {
+    if (*(stateParams.maxVel) > simParams->errOutVel || (!std::isfinite(*(stateParams.maxVel)))) {
         DEME_ERROR(
             "System max velocity is %.7g, exceeded max allowance (%.7g).\nIf this velocity is not abnormal and you "
             "want to increase this allowance, use SetErrorOutVelocity before initializing simulation.\nOtherwise, the "

{deme-2.0.7 → deme-2.1.1}/src/algorithms/DEMCubContactDetection.cu

@@ -387,7 +387,9 @@ void contactDetection(std::shared_ptr<jitify::Program>& bin_sphere_kernels,
             cubDEMMax<trianglesBinTouches_t>(numTrianglesBinTouches, pMaxGeoInBin, *pNumActiveBinsForTri, this_stream,
                                              scratchPad);
             scratchPad.syncDualStructDeviceToHost("maxGeoInBin");
-            stateParams.maxSphFoundInBin = *((trianglesBinTouches_t*)scratchPad.getDualStructHost("maxGeoInBin"));
+            // Find the max tri number. Hmm... this only works in little-endian systems... I don't use undefined
+            // behavior that often but this one...
+            stateParams.maxTriFoundInBin = *((trianglesBinTouches_t*)scratchPad.getDualStructHost("maxGeoInBin"));
             scratchPad.finishUsingDualStruct("maxGeoInBin");
 
             // 6th step: map activeBinIDsForTri to activeBinIDs, so that when we are processing the bins in

{deme-2.0.7 → deme-2.1.1}/src/demo/DEMdemo_SingleSphereCollide.cpp

@@ -112,7 +112,7 @@ int main() {
     // Testing modifying jitify options and force model prerequisites
     auto jitify_options = DEMSim.GetJitifyOptions();
     jitify_options.pop_back();  // Remove a warning suppression option
-    DEMSim.SetJitifyOptions(jitify_options);
+    // DEMSim.SetJitifyOptions(jitify_options);
     my_force_model->DefineCustomModelPrerequisites(
         "float3 __device__ GetContactForce(float3 AOwner, float3 BOwner, float3 ALinVel, float3 BLinVel, "
         "float3 ARotVel, float3 BRotVel, float delta_time, float delta_tan_x, float delta_tan_y, "

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

@@ -42,7 +42,7 @@ __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) {
+        if (absv > simParams->approxMaxVel || (!isfinite(absv))) {
             absv = simParams->approxMaxVel;
         }
         // User-specified extra margin also needs to be added here. This marginSize is used for bin--sph or bin--tri