Changeset 25167

Timestamp:

06/26/20 20:49:34 (5 years ago)

Author:

jdquinn

Message:

BUG: Scope of function naturetoint.

File:

• issm/trunk-jpl/src/m/classes/materials.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/materials.py

@@ -271 +271 @@
             return self
     #}}}
-
-    def naturetointeger(strnat): #{{{
-        intnat = np.zeros(len(strnat))
-
-        for i in range(len(intnat)):
-            if strnat[i] == 'damageice':
-                intnat[i] = 1
-            elif strnat[i] == 'estar':
-                intnat[i] = 2
-            elif strnat[i] == 'ice':
-                intnat[i] = 3
-            elif strnat[i] == 'enhancedice':
-                intnat[i] = 4
-            # elif strnat[i] == 'materials':
-            #     intnat[i] = 5 #this case will never happen, kept to ensure equivalent of codes between IoCodeToMeterialsEnum and IoCodeToNatureEnum
-            elif strnat[i] == 'litho':
-                intnat[i] = 6
-            elif strnat[i] == 'hydro':
-                intnat[i] = 7
-            else:
-                raise RuntimeError("materials constructor error message: nature of the material not supported yet! ('ice' or 'litho' or 'hydro')")
-
-        return intnat
-    #}}}
+#}}}
+
+def naturetointeger(strnat): #{{{
+    intnat = np.zeros(len(strnat))
+
+    for i in range(len(intnat)):
+        if strnat[i] == 'damageice':
+            intnat[i] = 1
+        elif strnat[i] == 'estar':
+            intnat[i] = 2
+        elif strnat[i] == 'ice':
+            intnat[i] = 3
+        elif strnat[i] == 'enhancedice':
+            intnat[i] = 4
+        # elif strnat[i] == 'materials':
+        #     intnat[i] = 5 #this case will never happen, kept to ensure equivalent of codes between IoCodeToMeterialsEnum and IoCodeToNatureEnum
+        elif strnat[i] == 'litho':
+            intnat[i] = 6
+        elif strnat[i] == 'hydro':
+            intnat[i] = 7
+        else:
+            raise RuntimeError("materials constructor error message: nature of the material not supported yet! ('ice' or 'litho' or 'hydro')")
+
+    return intnat
+#}}}