Skip to content

Commit

Permalink
update some dep issue
Browse files Browse the repository at this point in the history
  • Loading branch information
changliao1025 committed Oct 16, 2023
1 parent d3468a7 commit f94e18d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
13 changes: 7 additions & 6 deletions pyflowline/algorithms/auxiliary/calculate_area_of_difference.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,20 @@
else:
from pyflowline.algorithms.auxiliary.find_vertex_in_list import find_vertex_in_list

iFlag_shapely = importlib.util.find_spec("shapely")
if iFlag_shapely is not None:
from shapely.ops import polygonize
else:
print('shapely is required for this function')
pass



def calculate_area_of_difference_raw(sFilename_a, sFilename_b):
#not yet supported
return

def calculate_area_of_difference_simplified(aFlowline_in, aVertex_all_in, sFilename_output_in):
iFlag_shapely = importlib.util.find_spec("shapely")
if iFlag_shapely is not None:
from shapely.ops import polygonize
else:
print('shapely is required for this function')
pass
if os.path.exists(sFilename_output_in):
os.remove(sFilename_output_in)
pass
Expand Down
10 changes: 7 additions & 3 deletions pyflowline/classes/pycase.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ def __init__(self, aConfig_in,
self.iFlag_intersect = int(aConfig_in['iFlag_intersect'])
else:
self.iFlag_intersect=1

if self.iFlag_flowline == 1:
pass
else:
self.iFlag_intersect=0

if 'iFlag_break_by_distance' in aConfig_in:
self.iFlag_break_by_distance = int(aConfig_in['iFlag_break_by_distance'])
Expand Down Expand Up @@ -441,6 +446,7 @@ def __init__(self, aConfig_in,
else:
pass
else:

pass


Expand Down Expand Up @@ -507,7 +513,7 @@ def mesh_generation(self, iFlag_antarctic_in=None):
#create a polygon based on real boundary
pBoundary_wkt, aExtent = read_mesh_boundary(self.sFilename_mesh_boundary)

if iMesh_type != 4: #mpas
if iMesh_type != 4: #not mpas
spatial_reference_target = osr.SpatialReference()
spatial_reference_target.ImportFromEPSG(4326)

Expand Down Expand Up @@ -1044,8 +1050,6 @@ def change_model_parameter(self, sVariable_in, dValue, iFlag_basin_in = None):
print("This model parameter is unknown, please check the full parameter list in the documentation: " + sVariable_in)
return False



def run(self):
"""
Run the flowlinecase simulation
Expand Down

0 comments on commit f94e18d

Please sign in to comment.