changeset 2:4fc22a63a17e draft

Uploaded
author greg
date Tue, 12 Jul 2016 15:07:15 -0400
parents 696bfb47d45e
children 52b976a35f8c
files icqsol_solve_laplace.py icqsol_solve_laplace.xml icqsol_utils.py tool_dependencies.xml
diffstat 4 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/icqsol_solve_laplace.py	Mon Jan 25 07:53:44 2016 -0500
+++ b/icqsol_solve_laplace.py	Tue Jul 12 15:07:15 2016 -0400
@@ -36,7 +36,7 @@
 surfIntegral = shape_mgr.integrateSurfaceField(solver.getVtkPolyData(), args.output_jump_electric_field_name)
 print 'Surface integral of normal electric field jump: {0}'.format(surfIntegral)
 minVal, maxVal = shape_mgr.getFieldRange(solver.getVtkPolyData(), args.output_jump_electric_field_name)
-print 'min/max values of normal electrc field jump: {0}/{1}'.format(minVal, maxVal)
+print 'min/max values of normal electric field jump: {0}/{1}'.format(minVal, maxVal)
 
 # Define the output file format and type (the output_format can only be 'vtk').
 output_format, output_file_type = icqsol_utils.get_format_and_type(args.output_vtk_type)
--- a/icqsol_solve_laplace.xml	Mon Jan 25 07:53:44 2016 -0500
+++ b/icqsol_solve_laplace.xml	Tue Jul 12 15:07:15 2016 -0400
@@ -25,7 +25,7 @@
                 <validator type="no_options" message="The selected shape has no surface fields." />
             </options>
         </param>
-        <param name="output_jump_electric_field_name" type="text" value="jumpEn" label="Output flux field name" help="Name of the jump of normal electric field name in the output file." />
+        <param name="output_jump_electric_field_name" type="text" value="jumpEn" label="Output flux field name" help="Name of the jump of normal electric field in the output file." />
         <expand macro="output_vtk_type_params" />
     </inputs>
     <outputs>
--- a/icqsol_utils.py	Mon Jan 25 07:53:44 2016 -0500
+++ b/icqsol_utils.py	Tue Jul 12 15:07:15 2016 -0400
@@ -46,12 +46,9 @@
     return LaplaceMatrices(shape_data, max_edge_length=max_edge_length)
 
 
-def get_shape_manager(format, dataset_type):
+def get_shape_manager(format=None, dataset_type=None):
     # Instantiate a ShapeManager.
-    if format == VTK:
-        return ShapeManager(file_format=format, vtk_dataset_type=dataset_type)
-    else:
-        return ShapeManager(file_format=format)
+    return ShapeManager(file_format=format, vtk_dataset_type=dataset_type)
 
 
 def get_temp_dir(prefix='tmp-vtk-', dir=None):
--- a/tool_dependencies.xml	Mon Jan 25 07:53:44 2016 -0500
+++ b/tool_dependencies.xml	Tue Jul 12 15:07:15 2016 -0400
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="icqsol" version="1.0">
-        <repository changeset_revision="789f4e7df861" name="package_icqsol_1_0" owner="greg" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="f830d27a3a29" name="package_icqsol_1_0" owner="greg" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
 </tool_dependency>