cffview 0.3.2__tar.gz → 0.3.3__tar.gz

{cffview-0.3.2/src/cffview.egg-info → cffview-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cffview
-Version: 0.3.2
+Version: 0.3.3
 Summary: A Python CLI tool to inspect Ansys Fluent .cas.h5/.msh.h5 files without opening Fluent
 Author-email: preamer <1524477126@qq.com>
 License-Expression: BSD-3-Clause
@@ -83,6 +83,7 @@ cffview <file> [options]
 | `--iter` | Iteration / time-step settings |
 | `--contours` | Graphics contours settings |
 | `--vectors` | Graphics vectors settings |
+| `--xy`, `--xy-plot` | Graphics xy-plot settings |
 | `--save` | Save the output to `<file>.json` |
 
 Multiple flags can be combined freely. Case settings flags (`--solver`, `--mat`, etc.) apply to `.cas.h5` files only.

{cffview-0.3.2 → cffview-0.3.3}/README.md

@@ -59,6 +59,7 @@ cffview <file> [options]
 | `--iter` | Iteration / time-step settings |
 | `--contours` | Graphics contours settings |
 | `--vectors` | Graphics vectors settings |
+| `--xy`, `--xy-plot` | Graphics xy-plot settings |
 | `--save` | Save the output to `<file>.json` |
 
 Multiple flags can be combined freely. Case settings flags (`--solver`, `--mat`, etc.) apply to `.cas.h5` files only.

{cffview-0.3.2 → cffview-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cffview"
-version = "0.3.2"
+version = "0.3.3"
 description = "A Python CLI tool to inspect Ansys Fluent .cas.h5/.msh.h5 files without opening Fluent"
 readme = "README.md"
 requires-python = ">=3.10"

{cffview-0.3.2 → cffview-0.3.3}/src/cffview/boundary.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 
 class BoundaryConsts:
@@ -79,7 +79,7 @@ class Fluid:
     id_: str
     material: str = ''
     sources: str = ''
-    sources_terms: str = ''
+    source_terms: dict[str, dict[str, str]] = field(default_factory=dict)
     fixed: str = ''
     mrf_motion: str = ''
     mgrid_motion: str = ''
@@ -92,7 +92,7 @@ class Fluid:
         data = self.__dict__.copy()
 
         if data['sources'] == '#f':
-            data.pop('sources_terms', None)
+            data.pop('source_terms', None)
 
         return data
 
@@ -104,7 +104,7 @@ class Solid:
     id_: str
     material: str = ''
     sources: str = ''
-    sources_terms: str = ''
+    source_terms: dict[str, dict[str, str]] = field(default_factory=dict)
     fixed: str = ''
     solid_motion: str = ''
 
@@ -112,7 +112,7 @@ class Solid:
         data = self.__dict__.copy()
 
         if data['sources'] == '#f':
-            data.pop('sources_terms', None)
+            data.pop('source_terms', None)
 
         return data
 
@@ -235,14 +235,11 @@ class PressureInlet:
         data['coordinate_system'] = BoundaryConsts.COORDINATE_SYSTEM.get(self.coordinate_system, 'unknown')
         data['ke_spec'] = BoundaryConsts.KE_SPEC.get(self.ke_spec, 'unknown')
 
-        match data['direction_spec']:
-            case 'Direction Vector':
-                pass
-            case 'Normal to Boundary':
-                data.pop('coordinate_system', None)
-                data.pop('ni', None)
-                data.pop('nj', None)
-                data.pop('nk', None)
+        if data['direction_spec'] == 'Normal to Boundary':
+            data.pop('coordinate_system', None)
+            data.pop('ni', None)
+            data.pop('nj', None)
+            data.pop('nk', None)
 
         match data['ke_spec']:
             case 'Intensity and Length Scale':
@@ -265,6 +262,7 @@ class PressureOutlet:
     id_: str
     p: str = ''
     t0: str = ''
+
     ke_spec: str = ''
     prevent_reverse_flow: str = ''
     radial: str = ''
@@ -333,25 +331,28 @@ class Wall:
     planar_conduction: str = ''
     shell_conduction: str = ''
 
-    _THERMAL_BC_WHITELIST = {
-        '0': {'q_dot'},  # Heat Flux
-        '1': {'t'},  # Temperature
-        '3': set(),  # Coupled
-    }
-
     def to_dict(self) -> dict[str, str]:
         data = self.__dict__.copy()
 
-        allowed_attrs = self._THERMAL_BC_WHITELIST.get(self.thermal_bc, set())
-        all_thermal_attrs = {'t', 'q_dot', 'h', 'q'}
-        attrs_to_remove = all_thermal_attrs - allowed_attrs
-        for attr in attrs_to_remove:
-            data.pop(attr, None)
-
         data['thermal_bc'] = BoundaryConsts.THERMAL_BC.get(self.thermal_bc, 'unknown')
         data['motion_bc'] = BoundaryConsts.MOTION_BC.get(self.motion_bc, 'unknown')
         data['shear_bc'] = BoundaryConsts.SHEAR_BC.get(self.shear_bc, 'unknown')
 
+        match data['thermal_bc']:
+            case 'Heat Flux':
+                data.pop('t', None)
+                data.pop('q', None)
+                data.pop('h', None)
+            case 'Temperature':
+                data.pop('q_dot', None)
+                data.pop('q', None)
+                data.pop('h', None)
+            case 'Coupled':
+                data.pop('q_dot', None)
+                data.pop('t', None)
+                data.pop('q', None)
+                data.pop('h', None)
+
         if data['planar_conduction'] == '#f':
             data.pop('shell_conduction', None)
 
@@ -389,6 +390,13 @@ class Interior:
     id_: str
 
 
+@dataclass
+@BoundaryFactory.register('interface')
+class Interface:
+    name: str
+    id_: str
+
+
 @dataclass
 @BoundaryFactory.register('symmetry')
 class Symmetry:

{cffview-0.3.2 → cffview-0.3.3}/src/cffview/main.py

@@ -205,13 +205,22 @@ def read_case(file_path: str, **kwargs) -> dict[
             new_boundary = BoundaryFactory.create(name, id_, type_)
             b_list = data['boundary'].get(type_, [])
 
-            for property_ in boundary_info[2]:
+            for property_ in filter(lambda x: len(x) > 1, boundary_info[2]):
                 property_name = str(property_[0]).replace('-', '_').replace('?', '').replace('/', '_')
                 if hasattr(new_boundary, property_name):
-                    if len(property_) > 1:
-                        if property_[1] == sexpdata.Symbol('.'):
-                            setattr(new_boundary, property_name, str(property_[2]))
-                        elif isinstance(property_[1], list):
+                    if property_[1] == sexpdata.Symbol('.'):
+                        setattr(new_boundary, property_name, str(property_[2]))
+                    elif isinstance(property_[1], list):
+                        if property_name == 'source_terms':
+                            source_terms_list = property_[1:]
+                            value = {}
+                            for source_term in filter(lambda x: len(x) > 1, source_terms_list):
+                                value[source_term[0]] = {}
+                                source_property = source_term[1]
+                                for source_property_ in filter(lambda x: x[1] == sexpdata.Symbol('.'), source_property):
+                                    value[source_term[0]][source_property_[0]] = str(source_property_[2])
+                            setattr(new_boundary, property_name, value)
+                        else:
                             setattr(new_boundary, property_name, f'{property_[1][0]}/{property_[1][2]}')
 
             b_list.append(new_boundary.to_dict() if hasattr(new_boundary, 'to_dict') else new_boundary.__dict__)
@@ -470,6 +479,27 @@ def read_case(file_path: str, **kwargs) -> dict[
             }
             data['vectors'][vector_dict['name']] = vector_dict
 
+    if kwargs['xy']:
+        data['xy-plot'] = {}
+        xy_plots = re.search(
+            r'(\(graphics/xy-plot.*)',
+            general_info,
+            re.M
+        ).group(1)
+        xy_plots = sexpdata.loads(xy_plots, true=None)[1]
+        for xy_plot in xy_plots:
+            xy_plot_dict = {
+                str(property_[0]): str(property_[2])
+                for property_ in xy_plot
+                if str(property_[0]) not in [
+                    'options', 'x-axis-data', 'y-axis-data',
+                    'surfaces-list', 'location-ids', 'locations',
+                    'option', 'plot-direction', 'axes',
+                ]
+            }
+            xy_plot_dict['surfaces-list'] = xy_plot[7][1]
+            data['xy-plot'][xy_plot_dict['name']] = xy_plot_dict
+
     return data
 
 
@@ -607,7 +637,6 @@ def show_mesh(file_path: str) -> None:
 
 
 def main() -> None:
-    import os
     import argparse
 
     BANNER = r"""
@@ -648,6 +677,7 @@ A Python CLI tool to inspect Ansys Fluent .cas.h5/.msh.h5 files without opening
         (("--iter",), "show iteration settings"),
         (("--contours",), "show graphics contours settings"),
         (("--vectors",), "show graphics vectors settings"),
+        (("--xy", "--xy-plot"), "show graphics xy-plot settings"),
         (("--save",), "save output to file"),
     ]
 
@@ -673,7 +703,8 @@ A Python CLI tool to inspect Ansys Fluent .cas.h5/.msh.h5 files without opening
             from .utils import print_colored_dict
             keys = [
                 'solver', 'mat', 'bd', 'ne', 'disc', 'rd',
-                'plotsets', 'monitorsets', 'residuals', 'iter', 'contours', 'vectors',
+                'plotsets', 'monitorsets', 'residuals', 'iter',
+                'contours', 'vectors', 'xy',
             ]
             kwargs = {k: getattr(args, k) for k in keys}
             output = read_case(args.file_path, **kwargs)

{cffview-0.3.2 → cffview-0.3.3/src/cffview.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cffview
-Version: 0.3.2
+Version: 0.3.3
 Summary: A Python CLI tool to inspect Ansys Fluent .cas.h5/.msh.h5 files without opening Fluent
 Author-email: preamer <1524477126@qq.com>
 License-Expression: BSD-3-Clause
@@ -83,6 +83,7 @@ cffview <file> [options]
 | `--iter` | Iteration / time-step settings |
 | `--contours` | Graphics contours settings |
 | `--vectors` | Graphics vectors settings |
+| `--xy`, `--xy-plot` | Graphics xy-plot settings |
 | `--save` | Save the output to `<file>.json` |
 
 Multiple flags can be combined freely. Case settings flags (`--solver`, `--mat`, etc.) apply to `.cas.h5` files only.