FEM: Raise exception on use or load of non existing results

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
FreeCAD · Sep 9, 2015 · d52ad7e · d52ad7e
1 parent 2f681ab
commit d52ad7e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/Mod/Fem/FemTools.py b/src/Mod/Fem/FemTools.py
@@ -189,23 +189,25 @@ def setup_ccx(self, ccx_binary=None):
     def load_results(self):
         import ccxFrdReader
         import os
+        self.results_present = False
+        result_file = self.base_name + ".frd"
         if os.path.isfile(self.base_name + ".frd"):
-            ccxFrdReader.importFrd(self.base_name + ".frd", self.analysis)
-            self.results_present = True
+            ccxFrdReader.importFrd(result_file, self.analysis)
             for m in self.analysis.Member:
                 if m.isDerivedFrom("Fem::FemResultObject"):
                     self.result_object = m
+            if self.result_object is not None:
+                self.results_present = True
         else:
-            self.results_present = False
+            raise Exception('FEM: No results found at {}!'.format(result_file))
 
     def use_results(self, results_name=None):
         for m in self.analysis.Member:
             if m.isDerivedFrom("Fem::FemResultObject") and m.Name == results_name:
-                ro = m
-        if not ro:
-            print "{} doesn't exist".format(results_name)
-        else:
-            self.result_object = ro
+                self.result_object = m
+                break
+        if not self.result_object:
+            raise ("{} doesn't exist".format(results_name))
 
     def run(self):
         ret_code = 0