Merge pull request #114 from changliao1025/development

typo replace
changliao1025 · Jan 24, 2023 · bdf5740 · bdf5740
2 parents a079205 + f8e7017
commit bdf5740
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/pyflowline/classes/basin.py b/pyflowline/classes/basin.py
@@ -53,21 +53,21 @@ class BasinClassEncoder(JSONEncoder):
         JSONEncoder (_type_): _description_
     """
     def default(self, obj):
-        if isobject(obj, np.integer):
+        if isinstance(obj, np.integer):
             return int(obj)
-        if isobject(obj, np.float32):
+        if isinstance(obj, np.float32):
             return float(obj)
-        if isobject(obj, np.ndarray):
+        if isinstance(obj, np.ndarray):
             return obj.tolist()
-        if isobject(obj, list):
+        if isinstance(obj, list):
             pass  
-        if isobject(obj, pyvertex):
+        if isinstance(obj, pyvertex):
             return json.loads(obj.tojson()) #lVertexID
-        if isobject(obj, pyedge):
+        if isinstance(obj, pyedge):
             return obj.lEdgeID        
-        if isobject(obj, pyflowline):
+        if isinstance(obj, pyflowline):
             return obj.lFlowlineID
-        if isobject(obj, pyconfluence):
+        if isinstance(obj, pyconfluence):
             return obj.dAngle_upstream
 
 

diff --git a/pyflowline/classes/mpas.py b/pyflowline/classes/mpas.py
@@ -12,22 +12,22 @@
 
 class MpasClassEncoder(JSONEncoder):
     def default(self, obj):
-        if isobject(obj, np.integer):
+        if isinstance(obj, np.integer):
             return int(obj)
-        if isobject(obj, np.float32):
+        if isinstance(obj, np.float32):
             return float(obj)
-        if isobject(obj, np.ndarray):
+        if isinstance(obj, np.ndarray):
             return obj.tolist()
-        if isobject(obj, list):
+        if isinstance(obj, list):
             pass  
-        if isobject(obj, pyvertex):
+        if isinstance(obj, pyvertex):
             return json.loads(obj.tojson()) #lVertexID
-        if isobject(obj, pyedge):
+        if isinstance(obj, pyedge):
             return obj.lEdgeID        
-        if isobject(obj, pyflowline):
+        if isinstance(obj, pyflowline):
             return obj.lFlowlineID
 
-        if isobject(obj, pympas):
+        if isinstance(obj, pympas):
             return obj.lCellID
 
         return JSONEncoder.default(self, obj)