yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3708
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Thu 2013-08-29 12:30:31 +0200
message:
  - increase verbosity of DEM-PFV checkTest
modified:
  scripts/checks-and-tests/checks/DEM-PFV-check.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/DEM-PFV-check.py'
--- scripts/checks-and-tests/checks/DEM-PFV-check.py	2013-08-28 10:40:30 +0000
+++ scripts/checks-and-tests/checks/DEM-PFV-check.py	2013-08-29 10:30:31 +0000
@@ -75,8 +75,9 @@
 e22=e22-triax.strain[1]
 modulus = 1000./abs(e22)
 
-if abs((modulus-263673.1423)/263673.1423)>tolerance :
-	print "DEM-PFV: difference in bulk modulus"
+target=263673.1423
+if abs((modulus-target)/target)>tolerance :
+	print "DEM-PFV: difference in bulk modulus:", modulus, "vs. target ",target
 	errors+=1
 
 #B. Activate flow engine and set boundary conditions in order to get permeability
@@ -99,9 +100,10 @@
 if abs(Qin+Qout)>1e-15 :
 	print "DEM-PFV: unbalanced Qin vs. Qout"
 	errors+=1
-
-if abs((permeability-0.0512650663801)/0.0512650663801)>tolerance :
-	print "DEM-PFV: difference in permeability"
+	
+target=0.0512650663801
+if abs((permeability-target)/target)>tolerance :
+	print "DEM-PFV: difference in permeability:",permeability," vs. target ",target
 	errors+=1
 
 #C. now the oedometer test, drained at the top, impermeable at the bottom plate
@@ -117,16 +119,17 @@
 from yade import timing
 O.run(3000,1)
 
-if abs((flow.getPorePressure((0.5,0.1,0.5))-528.554831762)/528.554831762)>tolerance :
-	print "DEM-PFV: difference in final pressure"
+target=528.554831762
+if abs((flow.getPorePressure((0.5,0.1,0.5))-target)/target)>tolerance :
+	print "DEM-PFV: difference in final pressure:",flow.getPorePressure((0.5,0.1,0.5))," vs. target ",target
 	errors+=1
-
-if abs((triax.strain[1]-zeroe22-0.00265188596144)/0.00265188596144)>tolerance :
-	print "DEM-PFV: difference in final deformation"
+target=0.00265188596144
+if abs((triax.strain[1]-zeroe22-target)/target)>tolerance :
+	print "DEM-PFV: difference in final deformation",triax.strain[1]-zeroe22," vs. target ",target
 	errors+=1
 
 if (float(flow.execTime)/float(sum([e.execTime for e in O.engines])))>0.6 :
-	print "DEM-PFV: More than 60\% of cpu time in FlowEngine. Should not happen with efficient libraries (check blas/lapack/cholmod implementations)"
+	print "DEM-PFV: More than 60\% of cpu time in FlowEngine (",100.*(float(flow.execTime)/float(sum([e.execTime for e in O.engines]))) ,"%). Should not happen with efficient libraries (check blas/lapack/cholmod implementations)"
 	errors+=1
 
 if (errors):