Merge pull request #210 from changliao1025/development

fix function call missing
changliao1025 · Apr 16, 2024 · 8b714e1 · 8b714e1
2 parents 4d320f0 + 5bcf35f
commit 8b714e1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
@@ -23,7 +23,7 @@ metadata:
   # Package name
   name: pyflowline
   # Package version
-  version: "0.3.5"
+  version: "0.3.6"
   # Package summary
   summary: A mesh-independent river network generator for hydrologic models.
   # Package homepage

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "hexwatershed" %}
 {% set git_rev = "main" %}
-{% set version = "0.3.5" %}
+{% set version = "0.3.6" %}
 
 package:
   name: {{ name|lower }}

diff --git a/pyflowline/algorithms/auxiliary/calculate_area_of_difference.py b/pyflowline/algorithms/auxiliary/calculate_area_of_difference.py
@@ -6,6 +6,7 @@
 from pyflowline.algorithms.auxiliary.find_index_in_list import find_list_in_list 
 
 from pyearth.gis.geometry.calculate_polygon_area import calculate_polygon_area
+from pyearth.gis.geometry.calculate_angle_between_vertex_normal import calculate_angle_between_vertex_normal
 
 iFlag_cython = importlib.util.find_spec("cython") 
 if iFlag_cython is not None:
@@ -107,7 +108,7 @@ def get_next_branch(iFlag_rightleft, iFlag_reverse, pFlowline_in):
                     #calculate angle              
                     x3 = pVertex_dummy.dLongitude_degree
                     y3 = pVertex_dummy.dLatitude_degree
-                    angle_dummy = calculate_angle_betwen_vertex_normal( x1, y1, x2, y2, x3, y3  )                    
+                    angle_dummy = calculate_angle_between_vertex_normal( x1, y1, x2, y2, x3, y3  )                    
                     aAngle.append(angle_dummy)
                 for i in pFlowline_in.aFlowlineID_end_end:
                     pFlowline_dummy = aFlowline_in[i]
@@ -123,7 +124,7 @@ def get_next_branch(iFlag_rightleft, iFlag_reverse, pFlowline_in):
                     #calculate angle              
                     x3 = pVertex_dummy.dLongitude_degree
                     y3 = pVertex_dummy.dLatitude_degree
-                    angle_dummy = calculate_angle_betwen_vertex_normal( x1, y1, x2, y2, x3, y3  )                    
+                    angle_dummy = calculate_angle_between_vertex_normal( x1, y1, x2, y2, x3, y3  )                    
                     aAngle.append(angle_dummy)
 
                 #mini
@@ -181,7 +182,7 @@ def get_next_branch(iFlag_rightleft, iFlag_reverse, pFlowline_in):
 
                     x3 = pVertex_dummy.dLongitude_degree
                     y3 = pVertex_dummy.dLatitude_degree
-                    angle_dummy = calculate_angle_betwen_vertex_normal( x1, y1, x2, y2, x3, y3  )
+                    angle_dummy = calculate_angle_between_vertex_normal( x1, y1, x2, y2, x3, y3  )
                     aAngle.append(angle_dummy)
                 for i in pFlowline_in.aFlowlineID_start_end:
                     pFlowline_dummy = aFlowline_in[i]
@@ -196,7 +197,7 @@ def get_next_branch(iFlag_rightleft, iFlag_reverse, pFlowline_in):
 
                     x3 = pVertex_dummy.dLongitude_degree
                     y3 = pVertex_dummy.dLatitude_degree
-                    angle_dummy = calculate_angle_betwen_vertex_normal( x1, y1, x2, y2, x3, y3  )
+                    angle_dummy = calculate_angle_between_vertex_normal( x1, y1, x2, y2, x3, y3  )
                     aAngle.append(angle_dummy)
 
                 #mini

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 AUTHOR = "Chang Liao"
 AUTHOR_EMAIL = "chang.liao@pnnl.gov"
 URL = "https://github.com/changliao1025/pyflowline"
-VERSION = "0.3.5"
+VERSION = "0.3.6"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = "Earth Science"