yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3830
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Wed 2016-03-30 22:03:36 +0200
message:
  Fix checkPolyhedraCrush
modified:
  scripts/checks-and-tests/checks/checkList.py
  scripts/checks-and-tests/checks/checkPolyhedraCrush.py


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'scripts/checks-and-tests/checks/checkList.py'
--- scripts/checks-and-tests/checks/checkList.py	2016-03-28 19:26:49 +0000
+++ scripts/checks-and-tests/checks/checkList.py	2016-03-30 20:03:36 +0000
@@ -6,7 +6,7 @@
 resultStatus = 0
 nFailed=0
 
-skipScripts = ['checkList.py', 'checkPolyhedraCrush']
+skipScripts = ['checkList.py']
 
 for script in scriptsToRun:
 	if (script[len(script)-3:]==".py" and script not in skipScripts):

=== modified file 'scripts/checks-and-tests/checks/checkPolyhedraCrush.py'
--- scripts/checks-and-tests/checks/checkPolyhedraCrush.py	2016-03-24 22:08:26 +0000
+++ scripts/checks-and-tests/checks/checkPolyhedraCrush.py	2016-03-30 20:03:36 +0000
@@ -77,14 +77,14 @@
 else:
    printSuccess()
    
-O.run(280, True)
-if (abs(f[2] - 34.540740)/f[2] >  tolerance or len(O.bodies) <> 7):
-   printWarning (34.540740, f[2], 7, len(O.bodies))
+O.run(250, True)
+if (abs(f[2] - 32.7028)/f[2] >  tolerance or len(O.bodies) <> 4):
+   printWarning (32.7028, f[2], 4, len(O.bodies))
    resultStatus += 1
 else:
    printSuccess()
 
-O.run(200, True)
+O.run(130, True)
 if (f.norm() == 0 >  tolerance or len(O.bodies) <> 7):
    printWarning (0.0, f[2], 7, len(O.bodies))
    resultStatus += 1