yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3993
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2014-05-27 13:29:38 +0200
message:
  Better check for DEM-PFV-check.py
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	2014-01-23 18:10:35 +0000
+++ scripts/checks-and-tests/checks/DEM-PFV-check.py	2014-05-27 11:29:38 +0000
@@ -2,11 +2,8 @@
 # Here, we are testing bulk modulus, then permeability, then the consolidation of a specimen.
 # the test is based on examples/FluidCouplingPFV/oedometer.py, only slightly simplified and using less particles
 
-try: FlowEngine
-except NameError:
-	print "skip DEM-PFV check, FlowEngine not available"
-else:
 
+if ('PFVflow' in features):
 	errors=0
 	tolerance=0.01
 
@@ -143,4 +140,6 @@
 		errors+=1
 
 	if (errors):
-		resultStatus +=1	#Test is failed
\ No newline at end of file
+		resultStatus +=1	#Test is failed
+else:
+	print "skip DEM-PFV check, FlowEngine not available"