toughanimator 0.1.7__tar.gz → 0.1.9__tar.gz

{toughanimator-0.1.7 → toughanimator-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toughanimator
-Version: 0.1.7
+Version: 0.1.9
 Summary: A tool for visualizing TOUGH simulation outputs.
 Home-page: https://github.com/scarletref/toughanimator
 Author: scarletref
@@ -8,7 +8,7 @@ Author-email: scarletreflection@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.11,<3.14
 Description-Content-Type: text/markdown
 Requires-Dist: numpy
 Requires-Dist: pandas

{toughanimator-0.1.7 → toughanimator-0.1.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='toughanimator',  # Package name on PyPI
-    version='0.1.7',
+    version='0.1.9',
     description='A tool for visualizing TOUGH simulation outputs.',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
@@ -16,7 +16,7 @@ setup(
         'pandas',
         'vtk',
     ],
-    python_requires='>=3.7',
+    python_requires='>=3.11,<3.14',
     classifiers=[
         'Programming Language :: Python :: 3',
         'License :: OSI Approved :: MIT License',

{toughanimator-0.1.7 → toughanimator-0.1.9}/toughanimator/run.py

@@ -10,7 +10,7 @@ test_case_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), dir_nam
 
 case_dir = os.path.join(test_case_dir, case_name)
 
-
+case_dir = r"D:\Projects\202511\dip_left\TRv4"
 #case_dir = r"D:\Projects\202504\polygonal\poly_test"
 #case_dir = r"D:\Projects\202507\tough系列output\tough output format\TR_MINC_exe"
 #case_dir = r"D:\Projects\202508\tough_cases\WW\7_TR_MINC_petrasim2025__5spot"

{toughanimator-0.1.7 → toughanimator-0.1.9}/toughanimator/tough_classes.py

@@ -817,8 +817,18 @@ class vis_reader:
 
             vtr.GetCellData().AddArray(delPArray)
             post_variable_list.append(VisVariable(f'del_{p_name}', ValueType.Scalar, 1))
+        
+      # Put cell-centered data into points
+        filter = vtkCellDataToPointData()
+        filter.SetInputData(vtr)
+        filter.Update()
+        vtr_cell_to_points = filter.GetOutput()
+
+        if vtr.GetCellData().GetArray(f'del_{p_name}') is not None:
+            vtr.GetPointData().AddArray(vtr_cell_to_points.GetPointData().GetArray(f'del_{p_name}'))
 
-            # add toughreact variables
+        
+        # add toughreact variables
         if self.setting.tough_version == ToughVersion.TOUGHReact or self.setting.tough_version == ToughVersion.TOUGH3:
             trapHCO2_array = vtkDoubleArray()
             trapHCO2_array.SetName('trapHCO2')
@@ -1018,6 +1028,9 @@ class vis_reader:
         if os.path.isfile(self.tec_scalar_path):
             firstFile = False
         file = open(self.tec_scalar_path, "a")
+        if len(self.setting.selected_variables_scalar) == 0:
+            self.setting.selected_variables_scalar = headers
+
         if firstFile:
             file.write('TITLE = TECPLOT PLOT \n')
             selected_header_string = '"'+'", "'.join(self.setting.selected_variables_scalar) + '"'
@@ -1028,37 +1041,42 @@ class vis_reader:
         
         #time_statement = f'ZONE T ="{vis_time_step.time_step}, Time = {vis_time_step.time}", N = {vtu_cell_to_points.GetNumberOfPoints()}, E = {vtu_cell_to_points.GetNumberOfCells()}, F = FEPOINT, ET = {tecplot_cell_type}, SOLUTIONTIME = {vis_time_step.time}\n' 
         
-        time_statement = f'ZONE T="{vis_time_step.time_step}, Time = {vis_time_step.time}", I={self.xyz_elem[0] + 1}, J={self.xyz_elem[1] + 1}, K={self.xyz_elem[2] + 1}, SOLUTIONTIME={vis_time_step.time}, DATAPACKING=BLOCK, VARLOCATION=({self.__get_varlocarion_string(headers)})'
+        time_statement = f'ZONE T="{vis_time_step.time_step}, Time = {vis_time_step.time}", I={self.xyz_elem[0] + 1}, J={self.xyz_elem[1] + 1}, K={self.xyz_elem[2] + 1}, SOLUTIONTIME={vis_time_step.time}, DATAPACKING=BLOCK, VARLOCATION=({self.__get_varlocarion_string(self.setting.selected_variables_scalar)})'
         if not firstFile:
             time_statement = f'{time_statement}, D=(1,2,3,FECONNECT)'
         #if self.setting.debug:
             #time_statement = f'ZONE T ="{vis_time_step.time_step}, Time = {vis_time_step.time}", N = {vtu_cell_to_points.GetNumberOfPoints()}, E = {vtu_cell_to_points.GetNumberOfCells()}, F = FEPOINT, ET = {tecplot_cell_type}\n' 
         file.write(f'{time_statement}\n')
-
+        max_line_length = 20000
         # X, Y, Z
         if firstFile:
-            for i in range(0, vtr.GetNumberOfPoints()):
-                point = vtr.GetPoint(i)
-                file.write(str(point[0]) + " ")
-            file.write(" \n")
-
-            for i in range(0, vtr.GetNumberOfPoints()):
-                point = vtr.GetPoint(i)
-                file.write(str(point[1]) + " ")
-            file.write(" \n")
-
-            for i in range(0, vtr.GetNumberOfPoints()):
-                point = vtr.GetPoint(i)
-                file.write(str(point[2]) + " ")
-            file.write(" \n")
+            for point_idx in range(0, 3):
+                line_string = ''
+                for i in range(0, vtr.GetNumberOfPoints()):
+                    point = vtr.GetPoint(i)
+                    #file.write(str(point[0]) + " ")
+                    if len(line_string) + len(str(point[point_idx])) + 1 > max_line_length:
+                        # write the current line to file
+                        file.write(f'{line_string}\n')
+                        # reset the line string
+                        line_string = ''
+                    line_string = f'{line_string}{str(point[point_idx])} '
+               
+                file.write(f'{line_string}\n')
 
         # Other data
         for header in self.setting.selected_variables_scalar:
             array = vtr.GetCellData().GetArray(header)
-
+            line_string = ''
             for e in range(0, vtr.GetNumberOfCells()):
-                file.write(str(array.GetValue(e)) + " ")
-            file.write(" \n")
+                #file.write(f'{str(array.GetComponent(e, 0))} ')
+                if len(line_string) + len(str(array.GetValue(e))) + 1 > max_line_length:
+                    # write the current line to file
+                    file.write(f'{line_string}\n')
+                    # reset the line string
+                    line_string = ''
+                line_string = f'{line_string}{str(array.GetValue(e))} '
+            file.write(f'{line_string}\n')
  
         file.close()
 
@@ -1193,6 +1211,11 @@ class vis_reader:
 
         if VisType.Tecplot not in self.setting.vis_types:
             return
+
+
+        if self.setting.mesh_type == MeshType.PolygonalMesh:
+            print(f'    Tecplot output for polygonal mesh is not supported yet.')
+            return
         
         # Start Tecplot generating
         tec_name = pathlib.Path(self.setting.input_file_paths[0]).stem
@@ -1202,11 +1225,16 @@ class vis_reader:
             firstFile = False
         file = open(self.tec_vector_path, "a")
 
-        vector_headers = self.__get_tec_vector_headers(headers)
+        #selected_header_string = '"'+'", "'.join(self.setting.selected_variables_scalar) + '"'
+        if len(self.setting.selected_variables_vector) == 0:
+            self.setting.selected_variables_vector = headers
+        vector_headers = self.__get_tec_vector_headers(self.setting.selected_variables_vector)
+
         # add header
         if firstFile:
             file.write('TITLE = TECPLOT PLOT \n')
             header_string = '"'+'", "'.join(vector_headers) + '"'
+
             file.write(f'VARIABLES = "X", "Y", "Z", {header_string}\n')
         
         time_statement = f'ZONE T="{vis_time_step.time_step}, Time = {vis_time_step.time}", I={self.xyz_elem[0] + 1}, J={self.xyz_elem[1] + 1}, K={self.xyz_elem[2] + 1}, SOLUTIONTIME={vis_time_step.time}, DATAPACKING=BLOCK, VARLOCATION=({self.__get_varlocarion_string(vector_headers)})'
@@ -1216,38 +1244,40 @@ class vis_reader:
             #time_statement = f'ZONE T ="{vis_time_step.time_step}, Time = {vis_time_step.time}", N = {vtu_cell_to_points.GetNumberOfPoints()}, E = {vtu_cell_to_points.GetNumberOfCells()}, F = FEPOINT, ET = {tecplot_cell_type}\n' 
         file.write(f'{time_statement}\n')
 
+        max_line_length = 20000
         # X, Y, Z
-        if firstFile:
-            for i in range(0, vector_vtr.GetNumberOfPoints()):
-                point = vector_vtr.GetPoint(i)
-                file.write(str(point[0]) + " ")
-            file.write(" \n")
+        if firstFile:   
+            for point_idx in range(0, 3):
+                line_string = ''
+                for i in range(0, vector_vtr.GetNumberOfPoints()):
+                    point = vector_vtr.GetPoint(i)
+                    #file.write(str(point[0]) + " ")
+                    if len(line_string) + len(str(point[point_idx])) + 1 > max_line_length:
+                        # write the current line to file
+                        file.write(f'{line_string}\n')
+                        # reset the line string
+                        line_string = ''
+                    line_string = f'{line_string}{str(point[point_idx])} '
+                file.write(f'{line_string}\n')
 
-            for i in range(0, vector_vtr.GetNumberOfPoints()):
-                point = vector_vtr.GetPoint(i)
-                file.write(str(point[1]) + " ")
-            file.write(" \n")
 
-            for i in range(0, vector_vtr.GetNumberOfPoints()):
-                point = vector_vtr.GetPoint(i)
-                file.write(str(point[2]) + " ")
-            file.write(" \n")
 
         # Other data
-        for header in headers:
-            array = vector_vtr.GetCellData().GetArray(header)
-
-            for e in range(0, vector_vtr.GetNumberOfCells()):
-                file.write(f'{str(array.GetComponent(e, 0))} ')
-            file.write(" \n")
+        for header in self.setting.selected_variables_vector:
 
-            for e in range(0, vector_vtr.GetNumberOfCells()):
-                file.write(f'{str(array.GetComponent(e, 1))} ')
-            file.write(" \n")
+            array = vector_vtr.GetCellData().GetArray(header)
 
-            for e in range(0, vector_vtr.GetNumberOfCells()):
-                file.write(f'{str(array.GetComponent(e, 2))} ')
-            file.write(" \n")
+            for dim_idx in range(0, 3):
+                line_string = ''
+                for e in range(0, vector_vtr.GetNumberOfCells()):
+                    #file.write(f'{str(array.GetComponent(e, 0))} ')
+                    if len(line_string) + len(str(array.GetComponent(e, dim_idx))) + 1 > max_line_length:
+                        # write the current line to file
+                        file.write(f'{line_string}\n')
+                        # reset the line string
+                        line_string = ''
+                    line_string = f'{line_string}{str(array.GetComponent(e, dim_idx))} '
+                file.write(f'{line_string}\n')
 
         file.close()
 

{toughanimator-0.1.7 → toughanimator-0.1.9}/toughanimator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toughanimator
-Version: 0.1.7
+Version: 0.1.9
 Summary: A tool for visualizing TOUGH simulation outputs.
 Home-page: https://github.com/scarletref/toughanimator
 Author: scarletref
@@ -8,7 +8,7 @@ Author-email: scarletreflection@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.11,<3.14
 Description-Content-Type: text/markdown
 Requires-Dist: numpy
 Requires-Dist: pandas