Mercurial > repos > greg > icqsol_refine_shape

changeset 14:56c8da4e2f9d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Tue, 12 Jul 2016 14:44:30 -0400
parents 0f9045d2f336
children 3453c0dc27f2
files icqsol_utils.py test-data/box_refined.vtkascii test-data/box_with_surface_field.vtkascii tool_dependencies.xml
diffstat 4 files changed, 129 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/icqsol_utils.py	Mon Jan 11 09:36:39 2016 -0500
+++ b/icqsol_utils.py	Tue Jul 12 14:44:30 2016 -0400
@@ -48,12 +48,7 @@
 
 def get_shape_manager(format=None, dataset_type=None):
     # Instantiate a ShapeManager.
-    if format is None and dataset_type is None:
-        return 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/test-data/box_refined.vtkascii	Mon Jan 11 09:36:39 2016 -0500
+++ b/test-data/box_refined.vtkascii	Tue Jul 12 14:44:30 2016 -0400
@@ -2589,3 +2589,124 @@
 0 0 1 0 0 1 0 0 1 
 0 0 1 0 0 1 0 0 1 
 
+FIELD FieldData 1
+surface_field 1 1062 double
+0 1.10517 1.10517 0 0 1.35344e-16 1.10517 1.10517 0 
+0 1.10517 1.10517 1.10517 1.10517 0 0 0 0 
+1.35344e-16 1.35344e-16 1.10517 1.10517 1.10517 1.10517 0 0 0 
+0 0 0 0 0 0 0.110517 0.221034 0.331551 
+0.442068 0.552585 0.663102 0.773619 0.884136 0.994653 1.03149 0.957814 0.884136 
+0.810458 0.73678 0.663102 0.589424 0.515746 0.442068 0.36839 0.294712 0.221034 
+0.147356 0.073678 0.0644683 0.202614 0.429788 0.0552585 0.74292 0.939394 0.835861 
+0.261327 0.123913 0.101578 0.093772 0.214336 0.386809 0.591343 0.443987 0.801609 
+0.697686 0.607844 0.71836 0.885856 0.331856 0.0496354 0.189447 0.200275 0.148789 
+0.148193 0.100045 0.386809 0.276293 0.160205 0.65189 0.547938 0.504534 0.422927 
+0.607844 0.66684 0.497327 0.366581 0.270487 0.148193 0.0638287 0.15719 0.221139 
+0.0821207 0.470078 0.530271 0.219429 0.308898 0.384916 0.312458 0.380556 0.338584 
+0.15719 0.137863 0.0739857 0.603334 0.511076 0.459904 0.260155 0.262812 0.236411 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+0.994653 0.884136 0.773619 0.663102 0.552585 0.442068 0.331551 0.221034 0.110517 
+1.0407 0.902556 0.675382 1.04991 0.257873 0.165775 0.466627 0.843843 0.981257 
+1.00359 1.0114 0.890834 0.718361 0.573691 0.276293 0.38681 0.394066 0.497327 
+0.773314 1.05553 0.915723 0.904895 0.956381 0.956977 1.00513 0.718361 0.828877 
+0.944965 0.51914 0.621454 0.499613 0.385662 0.594851 0.627842 0.738589 0.834683 
+0.681926 0.761709 0.742614 0.850313 0.956977 1.04134 0.94798 0.884031 1.02305 
+0.447857 0.588 0.304657 0.526525 0.539959 0.67499 0.836216 0.785098 0.885741 
+0.796272 0.720254 0.94798 0.967307 1.03118 0.323313 0.715657 0.861594 0.994653 
+0.884136 0.773619 0.663102 0.552585 0.442068 0.331551 0.221034 0.110517 1.35344e-17 
+2.70688e-17 4.06032e-17 5.41376e-17 6.7672e-17 8.12064e-17 9.47408e-17 1.08275e-16 1.2181e-16 0.073678 
+0.147356 0.221034 0.294712 0.36839 0.442068 0.515746 0.589424 0.663102 0.73678 
+0.810458 0.884136 0.957814 1.03149 0.939394 0.607844 0.282432 0.0552585 0.153496 
+0.0644683 0.0972946 0.703395 0.718361 0.830864 0.607844 0.386809 0.139081 0.296631 
+0.443987 0.212185 0.25742 0.126235 0.0687661 0.149076 0.594244 0.718361 0.681748 
+0.781169 0.885569 0.49413 0.386809 0.0585628 0.102473 0.104946 0.357178 0.400582 
+0.504534 0.558498 0.051023 0.182188 0.099401 0.661293 0.631952 0.564009 0.497326 
+0.425632 0.239373 0.165776 0.360293 0.20472 0.159124 0.197361 0.217767 0.317462 
+0.378298 0.482297 0.310298 0.228579 0.286832 0.222417 0.28372 0.168919 0.533759 
+0.452313 0.313953 0.110517 0.221034 0.331551 0.442068 0.552585 0.663102 0.773619 
+0.884136 0.994653 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 0.165775 0.497327 0.822738 1.04991 0.994653 1.0407 0.908695 
+0.401775 0.38681 0.274306 0.497327 0.718361 0.966089 0.721047 1.06219 0.99849 
+0.836134 1.01231 0.510926 0.38681 0.423422 0.324001 0.219601 0.61104 0.718361 
+1.04661 1.0027 1.00022 0.666496 0.621454 0.803148 0.917099 0.927056 1.01655 
+0.443877 0.473218 0.53457 0.654508 0.580705 0.592213 0.541161 0.607844 0.679538 
+0.865797 0.939394 0.742569 0.808428 0.894081 0.947301 0.870204 0.708379 0.666323 
+0.774657 0.946046 0.907809 0.887403 0.794872 0.876591 0.818338 0.963927 0.76542 
+0.790886 0.994653 0.884136 0.773619 0.663102 0.552585 0.442068 0.331551 0.221034 
+0.110517 0 0 0 0 0 0 0 0 
+0 0.073678 0.147356 0.221034 0.294712 0.36839 0.442068 0.515746 0.589424 
+0.663102 0.73678 0.810458 0.884136 0.957814 1.03149 0.939394 0.607844 0.282432 
+0.0552585 0.153496 0.0644683 0.0972946 0.703395 0.718361 0.830864 0.607844 0.386809 
+0.139081 0.296631 0.443987 0.212185 0.25742 0.126235 0.0687661 0.149076 0.594244 
+0.718361 0.681748 0.781169 0.885569 0.49413 0.386809 0.0585628 0.102473 0.104946 
+0.357178 0.400582 0.504534 0.558498 0.051023 0.182188 0.099401 0.661293 0.631952 
+0.564009 0.497326 0.425632 0.239373 0.165776 0.360293 0.20472 0.159124 0.197361 
+0.217767 0.317462 0.378298 0.482297 0.310298 0.228579 0.286832 0.222417 0.28372 
+0.168919 0.533759 0.452313 0.313953 0.110517 0.221034 0.331551 0.442068 0.552585 
+0.663102 0.773619 0.884136 0.994653 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 0.165775 0.497326 0.822738 1.04991 0.994653 
+1.0407 0.908695 0.401775 0.386809 0.274306 0.497327 0.718361 0.966089 0.721047 
+1.06219 0.99849 0.836134 1.01231 0.510926 0.38681 0.423422 0.324001 0.219601 
+0.61104 0.718361 1.04661 1.0027 1.00022 0.666496 0.621454 0.803148 0.917099 
+0.927056 1.01655 0.443877 0.473218 0.53457 0.654508 0.580705 0.592213 0.541161 
+0.607844 0.679538 0.865797 0.939394 0.742569 0.808428 0.894081 0.947301 0.870204 
+0.708379 0.666323 0.774657 0.946046 0.907809 0.887403 0.794872 0.876591 0.818338 
+0.963927 0.76542 0.790886 1.2181e-16 1.08275e-16 9.47408e-17 8.12064e-17 6.7672e-17 5.41376e-17 
+4.06032e-17 2.70688e-17 1.35344e-17 0.110517 0.221034 0.331551 0.442068 0.552585 0.663102 
+0.773619 0.884136 0.994653 1.03149 0.957814 0.884136 0.810458 0.73678 0.663102 
+0.589424 0.515746 0.442068 0.36839 0.294712 0.221034 0.147356 0.073678 0.0644683 
+0.202614 0.429788 0.0552585 0.74292 0.939394 0.835861 0.261327 0.123913 0.101578 
+0.093772 0.214336 0.386809 0.591343 0.443987 0.801609 0.697686 0.607844 0.71836 
+0.885856 0.331856 0.0496354 0.189447 0.200275 0.148789 0.148193 0.100045 0.386809 
+0.276293 0.160205 0.65189 0.547938 0.504534 0.422927 0.607844 0.66684 0.497327 
+0.366581 0.270487 0.148193 0.0638287 0.15719 0.221139 0.0821207 0.470078 0.530271 
+0.219429 0.308898 0.384916 0.312458 0.380556 0.338584 0.15719 0.137863 0.0739857 
+0.603334 0.511076 0.459904 0.260155 0.262812 0.236411 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 0.994653 0.884136 0.773619 
+0.663102 0.552585 0.442068 0.331551 0.221034 0.110517 1.0407 0.902556 0.675382 
+1.04991 0.257873 0.165775 0.466627 0.843843 0.981257 1.00359 1.0114 0.890834 
+0.718361 0.573691 0.276293 0.38681 0.394066 0.497327 0.773314 1.05553 0.915723 
+0.904895 0.956381 0.956977 1.00513 0.718361 0.828877 0.944965 0.51914 0.621454 
+0.499613 0.385662 0.594851 0.627842 0.738589 0.834683 0.681926 0.761709 0.742614 
+0.850313 0.956977 1.04134 0.94798 0.884031 1.02305 0.447857 0.588 0.304657 
+0.526525 0.539959 0.67499 0.836216 0.785098 0.885741 0.796272 0.720254 0.94798 
+0.967307 1.03118 0.323313 0.715657 0.861594 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 1.35344e-17 
+2.70688e-17 4.06032e-17 5.41376e-17 6.7672e-17 8.12064e-17 9.47408e-17 1.08275e-16 1.2181e-16 1.2181e-16 
+1.08275e-16 9.47408e-17 8.12064e-17 6.7672e-17 5.41376e-17 4.06032e-17 2.70688e-17 1.35344e-17 1.24065e-17 
+3.60917e-17 4.81223e-17 1.2181e-16 1.80459e-17 1.24065e-17 3.30841e-17 1.72e-17 3.21955e-17 2.1153e-17 
+4.94211e-17 6.17251e-17 7.09412e-17 2.32153e-17 2.85726e-17 3.43059e-17 1.53116e-17 4.95321e-17 2.19298e-17 
+4.12918e-17 2.86536e-17 1.5152e-17 8.67203e-18 5.66823e-17 7.57217e-17 8.08017e-17 8.89587e-17 1.02872e-16 
+9.85418e-18 1.6868e-17 2.41979e-17 2.41979e-17 5.10354e-17 6.60352e-17 9.46592e-18 2.48273e-17 1.36334e-17 
+3.80922e-17 2.67155e-17 4.13142e-17 4.81246e-17 6.66225e-17 6.39689e-17 7.89476e-17 1.04986e-16 1.04408e-17 
+3.56688e-17 1.14587e-17 4.51473e-17 3.73508e-17 3.40695e-17 4.86636e-17 5.56705e-17 8.89847e-17 7.33453e-17 
+6.15368e-17 7.80933e-17 9.04679e-17 9.11567e-17 2.2297e-17 4.60352e-17 6.7026e-17 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 1.10517 
+
--- a/test-data/box_with_surface_field.vtkascii	Mon Jan 11 09:36:39 2016 -0500
+++ b/test-data/box_with_surface_field.vtkascii	Tue Jul 12 14:44:30 2016 -0400
@@ -1,4 +1,4 @@
-# vtk DataFile Version 3.0
+# vtk DataFile Version 4.0
 vtk output
 ASCII
 DATASET POLYDATA
@@ -26,12 +26,12 @@
 3 13 11 23 
 3 23 21 13 
 
+CELL_DATA 12
+FIELD FieldData 1
+surface_field 1 12 double
+0.0136441 0.218305 0.97075 1.17541 0.0136441 0.218305 0.0136441 0.218305 0.106345 
+0.42538 1.21152 1.53055 
 POINT_DATA 24
-SCALARS surface_field double
-LOOKUP_TABLE default
-0 1.10517 1.10517 0 0 1.35344e-16 1.10517 1.10517 0 
-0 1.10517 1.10517 1.10517 1.10517 0 0 0 0 
-1.35344e-16 1.35344e-16 1.10517 1.10517 1.10517 1.10517 
 NORMALS Normals float
 -1 0 0 -1 0 0 -1 0 0 
 -1 0 0 1 0 0 1 0 0 
--- a/tool_dependencies.xml	Mon Jan 11 09:36:39 2016 -0500
+++ b/tool_dependencies.xml	Tue Jul 12 14:44:30 2016 -0400
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="icqsol" version="1.0">
-        <repository changeset_revision="a357536fb363" 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>