toughanimator 0.1.8__tar.gz → 0.1.10__tar.gz

{toughanimator-0.1.8 → toughanimator-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toughanimator
-Version: 0.1.8
+Version: 0.1.10
 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.8 → toughanimator-0.1.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='toughanimator',  # Package name on PyPI
-    version='0.1.8',
+    version='0.1.10',
     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.8 → toughanimator-0.1.10}/toughanimator/run.py

@@ -3,18 +3,20 @@ import tough_classes as ta
 import pandas as pd
 import matplotlib.pyplot as plt
 
-#dir_name = "unresolved" 
-dir_name = "test_cases"
-case_name = "PetraSim_2D_Conceptual"
+dir_name = "unresolved" 
+#dir_name = "test_cases"
+#case_name = "PetraSim_2D_Conceptual"
+case_name = "2D_Utransport_MINC"
 test_case_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), dir_name) 
 
 case_dir = os.path.join(test_case_dir, case_name)
 
-
+#case_dir = r"D:\Projects\202511\ta-post\0 Base_res_k"
 #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"
-#case_dir = r"D:\Projects\202508\tough_cases\WW\6_TR_MINC_exe"
+#case_dir = r"D:\Projects\202511\case_TRv4\uwc"
+#case_dir = r"D:\Projects\202501\toughanimator\test_cases\2DCCS 100yrs_RC"
 reader = ta.vis_reader(case_dir)
 #reader.write_eleme_conne()
 #reader.write_geometry()

{toughanimator-0.1.8 → toughanimator-0.1.10}/toughanimator/tough_classes.py

@@ -1,3 +1,4 @@
+import math
 import os
 import io
 import sys
@@ -69,7 +70,7 @@ class VisVariable:
         }
 
 class VisSetting:
-    def __init__(self, input_file_paths, out_file_paths, vis_dir, corners_file="unkown", out_format_type=OutType.Unknown, tough_version = ToughVersion.Unknown, vis_types=[VisType.ParaView, VisType.Tecplot], mesh_type=MeshType.RegularGrid, debug=False, eos="ECO2N", minc=False, selected_variables_scalar = [], selected_variables_vector = [] ):
+    def __init__(self, input_file_paths, out_file_paths, vis_dir, corners_file="unkown", out_format_type=OutType.Unknown, tough_version = ToughVersion.Unknown, vis_types=[VisType.ParaView, VisType.Tecplot], mesh_type=MeshType.RegularGrid, debug=False, eos="ECO2N", minc=False, selected_variables_scalar = [], selected_variables_vector = [], ngv=False):
         self.mesh_type = mesh_type
         self.out_format_type = out_format_type
         self.vis_types = vis_types
@@ -87,6 +88,7 @@ class VisSetting:
         self.minc = minc
         self.selected_variables_scalar = selected_variables_scalar
         self.selected_variables_vector = selected_variables_vector
+        self.ngv = ngv
 
 
     def setBounds(self, x_bounds, y_bounds, z_bounds):
@@ -105,7 +107,7 @@ class vis_reader:
         if os.path.isdir(case_dir):
             config_path = os.path.join(case_dir, "config.json")
             if os.path.exists(config_path):
-                with open(config_path, "r") as config_file:
+                with open(config_path, "r", encoding="utf-8") as config_file:
                     config = json.load(config_file)
             else:
                 print(f"Config file:({config_path}) not found. Please create it.")
@@ -130,16 +132,22 @@ class vis_reader:
             vis_dir = config["vis_dir"] if "vis_dir" in config else case_dir,
             corners_file = os.path.join(case_dir, config["corners_file"] if "corners_file" in config else "None"),
             debug = config['debug'] if 'debug' in config else False,
-            eos = config['EOS'] if 'EOS' in config else "ECO2N",
-            minc = config['MINC'] if 'MINC' in config else False,
+            #eos = config['EOS'] if 'EOS' in config else "ECO2N",
+            eos = next((v for k, v in config.items() if k.lower() == "eos"),"ECO2N"),
+            #minc = config['MINC'] if 'MINC' in config else False,
+            minc = next((v for k, v in config.items() if k.lower() == "minc"),False),
             selected_variables_scalar = config['selected_variables_scalar'] if 'selected_variables_scalar' in config else [],
-            selected_variables_vector = config['selected_variables_vector'] if 'selected_variables_vector' in config else []
+            selected_variables_vector = config['selected_variables_vector'] if 'selected_variables_vector' in config else [],
+            #ngv= config['NGV'] if 'NGV' in config else False
+            ngv = next((v for k, v in config.items() if k.lower() == "ngv"),False)
         )
 
         # check if the project is using MINC
         minc_file = os.path.join(case_dir, 'MINC')
         if os.path.exists(minc_file):
             setting.minc = True
+            self.minc_file = minc_file
+            self.__check_num_of_minc()
         if minc_file in setting.input_file_paths:
             setting.input_file_paths.remove(minc_file)
 
@@ -229,6 +237,8 @@ class vis_reader:
                 # add post calculation
         for timestep in self.time_steps_list:
                 self.__post_process(timestep)
+                if self.setting.ngv:
+                    self.__post_process_ngv(timestep)
         self.__write_json()
         print(f'All files have been created in {self.setting.vis_dir}.')
 
@@ -266,7 +276,7 @@ class vis_reader:
         has_elem = False
         for input_file_path in self.setting.input_file_paths:
             line_counter = 0
-            with open(input_file_path) as f:
+            with open(input_file_path, encoding="utf-8") as f:
                 reading_elem = False
 
                 for line in f:
@@ -289,6 +299,26 @@ class vis_reader:
             sys.exit(1)
         else:
             print(f'    Found ELEME block in {found_path}')
+    def __check_num_of_minc(self):
+        #self.minc_buffer = io.StringIO()
+        minc_num = 0
+        with open(self.minc_file, encoding="utf-8") as f:
+            reading_minc = False
+            for line in f:
+                if line.startswith('ELEME-') or line.startswith('ELEME'):
+                    reading_minc = True
+                    #has_minc = True
+                    continue
+                if reading_minc: 
+                    
+                    if self.__check_if_block_end(line, minc_num):
+                        reading_minc = False
+                        #found_path = input_file_path
+                        break
+                    else:
+                        minc_num += 1
+                        #self.minc_buffer.write(line)
+        self.num_of_minc = minc_num
 
     def __write_conne_buffer(self):
         self.conne_buffer = io.StringIO()
@@ -296,7 +326,7 @@ class vis_reader:
         has_conne = False
         for input_file_path in self.setting.input_file_paths:
             line_counter = 0
-            with open(input_file_path) as f:
+            with open(input_file_path, encoding="utf-8") as f:
                 
                 reading_conne = False
                 for line in f:
@@ -326,7 +356,7 @@ class vis_reader:
         
         for input_file_path in self.setting.input_file_paths:
             line_counter = 0
-            with open(input_file_path) as f:
+            with open(input_file_path, encoding="utf-8") as f:
                 reading_rocks = False
                 for line in f:
                     if line.startswith('ROCKS-'):
@@ -367,7 +397,7 @@ class vis_reader:
         
         for input_file_path in self.setting.input_file_paths:
             line_counter = 0
-            with open(input_file_path) as f:
+            with open(input_file_path, encoding="utf-8") as f:
                 
                 reading_incon = False
                 for line in f:
@@ -385,9 +415,9 @@ class vis_reader:
                         #line = f.readline() # skip first line #self.number_of_elements
                         eos = self.setting.eos
                         num = len(line.split())
-                        if self.setting.eos == "ECO2N" and len(line.split()) == 4:
+                        if self.setting.eos.upper() == "ECO2N" and len(line.split()) == 4:
                             self.incon_buffer.write(line)
-                        elif self.setting.eos == "EOS1":
+                        elif self.setting.eos.upper() == "EOS1":
                             line = f.readline() # skip first line #self.number_of_elements
                             if len(line.split()) == 2:
                                 self.incon_buffer.write(line)
@@ -400,7 +430,7 @@ class vis_reader:
             reading_pram = False
             for input_file_path in self.setting.input_file_paths:
                 line_counter = 0
-                with open(input_file_path) as f:
+                with open(input_file_path, encoding="utf-8") as f:
                     reading_pram = False
                     for line in f:
                         if line.startswith('PARAM-'):
@@ -430,14 +460,14 @@ class vis_reader:
         
         self.incon_buffer.seek(0)
         incon_df = pd.DataFrame()
-        if self.setting.eos == "ECO2N":
+        if self.setting.eos.upper() == "ECO2N":
             # read incon
             incon_colspecs = [(0, 20), (20, 40), (40, 60), (60, 80)]  # define column widths
             incon_names = ['Pressure', 'NaCl', 'CO2', 'Temperature']
             incon_df = pd.read_fwf(self.incon_buffer, colspecs=incon_colspecs, header=None,
                                 names=incon_names,
                                 dtype={'Pressure':float, 'NaCl':float, 'CO2':float, 'Temperature':float})
-        elif self.setting.eos == "EOS1":
+        elif self.setting.eos.upper() == "EOS1":
             # read incon
             incon_colspecs = [(0, 20), (20, 40)]
             incon_names = ['Temperature', 'Pressure']
@@ -501,7 +531,7 @@ class vis_reader:
             buffer.flush()
             buffer.close()
 
-        with open(self.current_out_file) as f:
+        with open(self.current_out_file, encoding="utf-8") as f:
             for line in f:
                 line_number = line_number + 1
                 values = line.strip().split(',')
@@ -557,7 +587,7 @@ class vis_reader:
         start_index = -1
         self.time_steps_list = []
         
-        with open(self.current_out_file) as f:
+        with open(self.current_out_file, encoding="utf-8") as f:
             for line in f:
                 line_number = line_number + 1
                 values = line.strip().split(',')
@@ -644,7 +674,7 @@ class vis_reader:
         start_index = -1
         self.time_steps_list = []
         
-        with open(self.current_out_file) as f:
+        with open(self.current_out_file, encoding="utf-8") as f:
             for line in f:
                 line_number = line_number + 1
                 values = line.strip().split(',')
@@ -729,7 +759,8 @@ class vis_reader:
         reading_scalar = False
         scalar_headers = []
         self.time_steps_list = []
-        with open(self.current_out_file) as f:
+
+        with open(self.current_out_file, encoding="utf-8") as f:
             for line in f:
                 if line.strip().lower().startswith('Variables'.lower()):
                     headers_value = line.strip().split('=')[1]
@@ -929,6 +960,172 @@ class vis_reader:
             self.variable_list["post"] = post_variable_list
             self.__write_vtk_file(vtr, vtr_path)
 
+    def __post_process_ngv(self, vis_time_step):
+
+        #self.rock_dict
+        post_variable_list = []
+        if self.setting.mesh_type != MeshType.RegularGrid:
+            print('    NGV post-processing is only available for RegularGrid mesh.')
+            return
+        
+        
+        time_index = self.time_steps_list.index(vis_time_step)
+        #vtr_path = os.path.join(self.setting.vis_dir, 'paraview', f'time_step_{vis_time_step.time_step}.vtr')
+
+        extension = os.path.splitext(self.main_geometry)[1]
+        vtr_path = os.path.join(self.setting.vis_dir, 'paraview', f'time_step_{vis_time_step.time_step}{extension}')
+        self.time_steps_list[time_index].vtu_file_name = vtr_path
+        scalar_vtr = self.__read_vtk_file(vtr_path)
+        vtr = scalar_vtr
+
+        
+        vtr_dimemsion = scalar_vtr.GetDimensions()
+        cell_index = 0 
+        matIDArray = vtr.GetCellData().GetArray('Material_ID')
+        
+        G = 9.81
+        Pc = 3000
+        # creare vtk double array 'ut','delta_p','Ncv_k1','Ncv_k2','Ncv_k3','Ngv_k1','Ngv_k2','Ngv_k3','Nb','R1'
+
+        Ncv_k1_array = vtkDoubleArray()
+        Ncv_k1_array.SetName('Ncv_k1') 
+        vtr.GetCellData().AddArray(Ncv_k1_array)
+        Ncv_k2_array = vtkDoubleArray()
+        Ncv_k2_array.SetName('Ncv_k2')  
+        vtr.GetCellData().AddArray(Ncv_k2_array)
+        Ncv_k3_array = vtkDoubleArray()
+        Ncv_k3_array.SetName('Ncv_k3')
+        vtr.GetCellData().AddArray(Ncv_k3_array)
+        Ngv_k1_array = vtkDoubleArray()
+        Ngv_k1_array.SetName('Ngv_k1')
+        vtr.GetCellData().AddArray(Ngv_k1_array)
+        Ngv_k2_array = vtkDoubleArray()
+        Ngv_k2_array.SetName('Ngv_k2')
+        vtr.GetCellData().AddArray(Ngv_k2_array)
+        Ngv_k3_array = vtkDoubleArray()
+        Ngv_k3_array.SetName('Ngv_k3')
+        vtr.GetCellData().AddArray(Ngv_k3_array)
+        Nb_array = vtkDoubleArray()
+        Nb_array.SetName('Nb')
+        vtr.GetCellData().AddArray(Nb_array)
+        R1_array = vtkDoubleArray()
+        R1_array.SetName('R1')
+        vtr.GetCellData().AddArray(R1_array)
+
+        post_variable_list.append(VisVariable('Ncv_k1', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('Ncv_k2', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('Ncv_k3', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('Ngv_k1', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('Ngv_k2', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('Ngv_k3', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('Nb', ValueType.Scalar, 1))
+        post_variable_list.append(VisVariable('R1', ValueType.Scalar, 1))
+    
+    
+        # check if the required arrays are in the vtk file
+        vis_gas_array = vtkDoubleArray()
+        vis_gas_name = 'VIS(gas)'
+        if vtr.GetCellData().GetArray(vis_gas_name) is not None:
+            vis_gas_array = vtr.GetCellData().GetArray(vis_gas_name)
+        else:
+            print(f'    Can\'t find {vis_gas_name} array in the vtk file for NGV post-processing.')
+            return
+        
+        dl_array = vtkDoubleArray()
+        dl_name = 'DL (kg/m^3)'
+        if vtr.GetCellData().GetArray(dl_name) is not None:
+            dl_array = vtr.GetCellData().GetArray(dl_name)
+        else:
+            print(f'    Can\'t find {dl_name} array in the vtk file for NGV post-processing.')
+            return
+        
+        dg_array = vtkDoubleArray()
+        dg_name = 'DG (kg/m^3)'
+        if vtr.GetCellData().GetArray(dg_name) is not None:
+            dg_array = vtr.GetCellData().GetArray(dg_name)
+        else:   
+            print(f'    Can\'t find {dg_name} array in the vtk file for NGV post-processing.')
+            return
+        
+        flof_array = vtkDoubleArray()
+        flof_name = 'FLOF (kg/s)'
+        if vtr.GetCellData().GetArray(flof_name) is not None:
+            flof_array = vtr.GetCellData().GetArray(flof_name)
+        else:
+            print(f'    Can\'t find {flof_name} array in the vtk file for NGV post-processing.')
+            return
+        
+
+
+        for z_index in range(0, vtr_dimemsion[2]-1):
+            for y_index in range(0, vtr_dimemsion[1]-1):
+                for x_index in range(0, vtr_dimemsion[0]-1):
+                    dx = vtr.GetXCoordinates().GetValue(x_index+1) - vtr.GetXCoordinates().GetValue(x_index)
+                    dy = vtr.GetYCoordinates().GetValue(y_index+1) - vtr.GetYCoordinates().GetValue(y_index)
+                    #dz = vtr.GetZCoordinates().GetValue(z_index+1) - vtr.GetZCoordinates().GetValue(z_index)
+                    
+
+                    #elemID = self..GetValue(cell_index)
+                    matID = matIDArray.GetValue(cell_index)
+                    # find rock from self.rock_dict with id = matID
+                    #rock = [obj for obj in self.rock_dict if obj.id == matID]
+
+                    rock = next((o for o in self.rock_dict if o["id"] == matID), None)
+                    per_1 = rock["per_1"] if rock else 0
+                    per_2 = rock["per_2"] if rock else 0
+                    per_3 = rock["per_3"] if rock else 0
+
+                    #df['μCO2'] = df['VIS(gas)']
+                    μCO2 = vis_gas_array.GetValue(cell_index)
+                    #df['delta_p'] = df['DL (kg/m^3)'] - df['DG (kg/m^3)'] 
+                    delta_p = dl_array.GetValue(cell_index) - dg_array.GetValue(cell_index)
+                    #df['ut'] = np.sqrt(df['FLOF (kg/s)_x']**2 + df['FLOF (kg/s)_y']**2 + df['FLOF (kg/s)_z']**2)
+                    FLOF = flof_array.GetTuple(cell_index)
+                    
+                    ut = math.sqrt(FLOF[0]**2 + FLOF[1]**2 + FLOF[2]**2)
+
+                    #df['Ncv_k1']  = (df['k1'] * df[L] * df['Pc'] )/(df[H]**2 * df['μCO2'] * df['ut'])
+                    #df['Ncv_k2']  = (df['k2'] * df[L] * df['Pc'] )/(df[H]**2 * df['μCO2'] * df['ut'])
+                    #df['Ncv_k3']  = (df['k3'] * df[L] * df['Pc'] )/(df[H]**2 * df['μCO2'] * df['ut'])
+                    #df['Ngv_k1']  = (df['delta_p'] * df['G'] * df['k1'] * df['d_x'])/(df[H] * df['μCO2'] * df['ut'])
+                    #df['Ngv_k2']  = (df['delta_p'] * df['G'] * df['k2'] * df['d_x'])/(df[H] * df['μCO2'] * df['ut'])
+                    #df['Ngv_k3']  = (df['delta_p'] * df['G'] * df['k3'] * df['d_x'])/(df[H] * df['μCO2'] * df['ut'])
+
+                    L = dx
+                    H = dy
+                    k1 = per_1
+                    k2 = per_2
+                    k3 = per_3
+                    Ncv_k1  = (k1 * L * Pc )/(H**2 * μCO2 * ut) if (H**2 * μCO2 * ut) !=0 else 0
+                    Ncv_k2  = (k2 * L * Pc )/(H**2 * μCO2 * ut) if (H**2 * μCO2 * ut) !=0 else 0
+                    Ncv_k3  = (k3 * L * Pc )/(H**2  * μCO2 * ut) if (H**2 * μCO2 * ut) !=0 else 0
+                    Ngv_k1  = (delta_p * G * k1 * dx)/(H * μCO2 * ut) if (H * μCO2 * ut) !=0 else 0
+                    Ngv_k2  = (delta_p * G * k2 * dx)/(H * μCO2 * ut) if (H * μCO2 * ut) !=0 else 0
+                    Ngv_k3  = (delta_p * G * k3 * dx)/(H    * μCO2 * ut) if (H * μCO2 * ut) !=0 else 0
+
+                    #df['Nb']  =(df['delta_p']  * df['G'] * df[H])/df['Pc'] 
+                    Nb  =(delta_p  * G * H)/Pc if Pc !=0 else 0
+                    #df['R1']  = df[L]/df[H]
+                    R1  = L/H if H !=0 else 0
+                    Ncv_k1_array.InsertNextValue(Ncv_k1)
+                    Ncv_k2_array.InsertNextValue(Ncv_k2)
+                    Ncv_k3_array.InsertNextValue(Ncv_k3)
+                    Ngv_k1_array.InsertNextValue(Ngv_k1)
+                    Ngv_k2_array.InsertNextValue(Ngv_k2)
+                    Ngv_k3_array.InsertNextValue(Ngv_k3)
+                    Nb_array.InsertNextValue(Nb)
+                    R1_array.InsertNextValue(R1)
+                    cell_index += 1
+
+                #for z_index in range(0, scalar_vtr.GetZCoordinates().GetNumberOfTuples()):
+            
+
+        #if len(post_variable_list) > 0:
+            #self.variable_list["post"].append(post_variable_list)
+        self.__write_vtk_file(vtr, vtr_path)
+
+        
+
         
     def __write_scalar_result(self, vis_time_step, dataframe, csv_headers):
 
@@ -981,9 +1178,13 @@ class vis_reader:
 
         #if self.setting.minc:
             #print(f'    MinC is enabled. Adding MinC values to the result.')
+        minc_ratio = 1
+        if self.setting.minc:
+            minc_ratio = self.num_of_minc / self.number_of_elements
             
         for i in range(0, vtr.GetNumberOfCells()):
             elemID = self.elemIDArray.GetValue(i)
+            
             index = self.sequence_dist[i]
             if 'ELEM' in dataframe.columns:
                 index = dataframe['ELEM'].tolist().index(elemID)
@@ -991,7 +1192,8 @@ class vis_reader:
                 #target_row = dataframe.iloc[index]
                 #print(f'    Processing ELEM {elem_string} at index {index}')
             for header in headers:
-                value = float(self.__parse_float(dataframe[header].iloc[index]))
+                minc_index = int(index * minc_ratio)
+                value = float(self.__parse_float(dataframe[header].iloc[minc_index]))
                 vtr.GetCellData().GetArray(header).InsertNextValue(value)
 
 
@@ -1027,7 +1229,10 @@ class vis_reader:
         firstFile = True
         if os.path.isfile(self.tec_scalar_path):
             firstFile = False
-        file = open(self.tec_scalar_path, "a")
+        file = open(self.tec_scalar_path, "a", encoding="utf-8")
+        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) + '"'
@@ -1038,37 +1243,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()
 
@@ -1203,6 +1413,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
@@ -1210,13 +1425,18 @@ class vis_reader:
         firstFile = True
         if os.path.isfile(self.tec_vector_path):
             firstFile = False
-        file = open(self.tec_vector_path, "a")
+        file = open(self.tec_vector_path, "a", encoding="utf-8")
+
+        #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)
 
-        vector_headers = self.__get_tec_vector_headers(headers)
         # 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)})'
@@ -1226,38 +1446,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()
 
@@ -1530,7 +1752,7 @@ class vis_reader:
             corners_buffer = io.StringIO()
             csv_headers = []
             line_number = -1
-            with open(self.setting.corners_file) as f:
+            with open(self.setting.corners_file, encoding="utf-8") as f:
                 for line in f:
                     line_number = line_number + 1
                     values = line.strip().split(',')
@@ -2321,7 +2543,7 @@ class vis_reader:
         elif extension == '.csv':
             self.setting.out_format_type = OutType.CSV
             line_number = 0
-            with open(out_file_path) as f:
+            with open(out_file_path, encoding="utf-8") as f:
                 for line in f:
                     if line_number == 0:
                         first_col = line.split(',')[0].strip().lower()
@@ -2372,7 +2594,7 @@ class vis_reader:
 
         # Write to JSON file
         path = os.path.join(self.setting.vis_dir, "variable_list.json")
-        with open(path, "w") as f:
+        with open(path, "w", encoding="utf-8") as f:
             json.dump(variable_list_dicts, f, indent=2)
 
         timestep_list_dicts = [timestep.__dict__ for timestep in self.time_steps_list]
@@ -2380,7 +2602,7 @@ class vis_reader:
 
         # Write to JSON file
         path = os.path.join(self.setting.vis_dir, "timestep_list.json")
-        with open(path, "w") as f:
+        with open(path, "w", encoding="utf-8") as f:
             json.dump(timestep_list_dicts, f, indent=2)
 
     def __fix_negative_zero(self, x):
@@ -2401,7 +2623,7 @@ class vis_charting:
 
         variable_list_path = os.path.join(case_dir, "tough_vis", "variable_list.json")
         if os.path.isfile(variable_list_path):
-            with open(variable_list_path, "r") as f:
+            with open(variable_list_path, "r", encoding="utf-8") as f:
                 self.variable_list = json.load(f)
         else:
             print(f'Case variable_list.json({variable_list_path}) not found.')
@@ -2409,7 +2631,7 @@ class vis_charting:
 
         timestep_list_path = os.path.join(case_dir, "tough_vis", "timestep_list.json")
         if os.path.isfile(timestep_list_path):
-            with open(timestep_list_path, "r") as f:
+            with open(timestep_list_path, "r", encoding="utf-8") as f:
                 self.time_steps_list = json.load(f)
         else:
             print(f'Case timestep_list.json({timestep_list_path}) not found.')

{toughanimator-0.1.8 → toughanimator-0.1.10}/toughanimator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toughanimator
-Version: 0.1.8
+Version: 0.1.10
 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