Merge pull request #2862 from PMEAL/fixing_pickle_problem

Added try/except to getitem in Phase in case some settings are missing #bug
PMEAL · Nov 20, 2023 · e5dd5af · e5dd5af
2 parents 79e81d6 + 03a9638
commit e5dd5af
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/openpnm/phase/_phase.py b/openpnm/phase/_phase.py
@@ -95,13 +95,16 @@ def __getitem__(self, key):
         if element + '.' + prop in self.keys():
             vals = super().__getitem__(element + '.' + prop)
         else:  # If above are not triggered then try to interpolate
-            if self.settings['auto_interpolate']:
-                if (element == 'pore') and ('throat.'+prop not in self.keys()):
+            try:
+                if self.settings['auto_interpolate']:
+                    if (element == 'pore') and ('throat.'+prop not in self.keys()):
+                        raise KeyError(key)
+                    elif (element == 'throat') and ('pore.'+prop not in self.keys()):
+                        raise KeyError(key)
+                    vals = self.interpolate_data(element + '.' + prop)
+                else:
                     raise KeyError(key)
-                elif (element == 'throat') and ('pore.'+prop not in self.keys()):
-                    raise KeyError(key)
-                vals = self.interpolate_data(element + '.' + prop)
-            else:
+            except AttributeError:
                 raise KeyError(key)
 
         # Finally get locs