Skip to content

Commit

Permalink
Update python/pumapy/io/input.py, python/pumapy/materialproperties/co…
Browse files Browse the repository at this point in the history
…nductivity.py, python/pumapy/materialproperties/tortuosity.py
  • Loading branch information
Federico Semeraro committed Nov 24, 2021
1 parent 8a357e4 commit ba80266
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/pumapy/io/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def import_weave_vtu(filename, from_texgen_gui=False):
yarn_index = vtk_to_numpy(vtkobject.GetCellData().GetArray(0)) + 1
ws = Workspace.from_array(yarn_index.reshape(int(dims[0]), int(dims[1]), int(dims[2]), order="F"))

if vtkobject.GetCellData().GetNumberOfArrays() >= 2:
if vtkobject.GetCellData().GetNumberOfArrays() > 2:
if from_texgen_gui:
# ORIGINAL TEXGEN (GUI in Windows)
# Number Of Arrays: 6
Expand Down
4 changes: 2 additions & 2 deletions python/pumapy/materialproperties/conductivity.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def compute_thermal_conductivity(workspace, cond_map, direction, side_bc='s', pr
:type tolerance: float
:param maxiter: maximum Iterations for solver
:type maxiter: int
:param solver_type: solver type, options: 'bicgstab', 'cg', 'gmres', 'direct'
:param solver_type: solver type, options: 'bicgstab' (default), 'cg', 'gmres', 'direct'
:type solver_type: string
:param display_iter: display iterations and residual
:type display_iter: bool
Expand Down Expand Up @@ -85,7 +85,7 @@ def compute_electrical_conductivity(workspace, cond_map, direction, side_bc='p',
:type tolerance: float
:param maxiter: maximum Iterations for solver
:type maxiter: int
:param solver_type: solver type, options: 'bicgstab', 'cg', 'gmres', 'direct'
:param solver_type: solver type, options: 'bicgstab' (default), 'cg', 'gmres', 'direct'
:type solver_type: string
:param display_iter: display iterations and residual
:type display_iter: bool
Expand Down
2 changes: 1 addition & 1 deletion python/pumapy/materialproperties/tortuosity.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def compute_continuum_tortuosity(workspace, cutoff, direction, side_bc='p', pres
:type tolerance: float
:param maxiter: maximum Iterations for solver
:type maxiter: int
:param solver_type: solver type, options: 'cg', 'bicgstab', 'direct'
:param solver_type: solver type, options: 'cg' (default), 'bicgstab', 'direct'
:type solver_type: string
:param display_iter: display iterations and residual
:type display_iter: bool
Expand Down

0 comments on commit ba80266

Please sign in to comment.