plot3d 1.7.1__tar.gz → 1.7.3__tar.gz

{plot3d-1.7.1 → plot3d-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: plot3d
-Version: 1.7.1
+Version: 1.7.3
 Summary: Plot3D python utilities for reading and writing and also finding connectivity between blocks
 Author: Paht Juangphanich
 Author-email: paht.juangphanich@nasa.gov
@@ -8,7 +8,6 @@ Requires-Python: >=3.10.12,<4.0.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: networkx
 Requires-Dist: numpy
 Requires-Dist: pandas

{plot3d-1.7.1 → plot3d-1.7.3}/plot3d/glennht/class_definitions.py

@@ -114,12 +114,12 @@ class OutletBC(BoundaryCondition):
 
 @dataclass
 class SymmetricSlipBC(BoundaryCondition):
-    slip_subtype: Optional[SymmetricSlipSubtype] = None
+    slip_subType: Optional[SymmetricSlipSubtype] = None
     slip_omega: Optional[float] = None
 
 @dataclass
 class WallBC(BoundaryCondition):
-    wall_subtype: Optional[int] = None
+    wall_subType: Optional[int] = None
     Twall_const: Optional[float] = None
     have_Twall_prof: bool = False
     filen_Twall_prof: Optional[str] = None

{plot3d-1.7.1 → plot3d-1.7.3}/plot3d/glennht/export_functions.py

@@ -1,5 +1,6 @@
 # glennht_export_functions.py
 from __future__ import annotations
+from collections import defaultdict
 import math
 import json
 import pathlib
@@ -406,15 +407,34 @@ def export_to_boundary_condition(
             else:
                 w.write(_export_namelist_block("VZConditions", vz)); w.write("\n")
 
+        # keep the *first* object for each unique obj.subtype
+        def first_by_subtype(objs: Iterable[T], subtype_attr: str, *, include_none=False) -> List[T]:
+            seen = set()
+            out: List[T] = []
+            for o in objs:
+                # works for both objects and dicts
+                st = getattr(o, subtype_attr, None) if not isinstance(o, dict) else o.get(subtype_attr)
+                if st is None and not include_none:
+                    continue
+                if st not in seen:
+                    seen.add(st)
+                    out.append(o)
+            return out
+        
+        inlet_bc = first_by_subtype(bc_group.Inlets,'inlet_subType')
+        outlet_bc = first_by_subtype(bc_group.Outlets,'outlet_subType')
+        slip_bc = first_by_subtype(bc_group.SymmetricSlips,'slip_subType')
+        wall_bc = first_by_subtype(bc_group.Walls,'wall_subType')
+        
         # Detailed BC blocks (skip meta + *_unit)
         exclude = {"Name", "SurfaceID", "BCType"}
-        for inlet in bc_group.Inlets:
+        for inlet in inlet_bc:
             w.write(_export_namelist_block("INLET_BC", inlet, exclude_names=exclude)); w.write("\n")
-        for outlet in bc_group.Outlets:
+        for outlet in outlet_bc:
             w.write(_export_namelist_block("OUTLET_BC", outlet, exclude_names=exclude)); w.write("\n")
-        for slip in bc_group.SymmetricSlips:
+        for slip in slip_bc:
             w.write(_export_namelist_block("SLIP_BC", slip, exclude_names=exclude)); w.write("\n")
-        for wall in bc_group.Walls:
+        for wall in wall_bc:
             w.write(_export_namelist_block("WALL_BC", wall, exclude_names=exclude)); w.write("\n")
 
 # ============================================================
@@ -472,6 +492,31 @@ def export_to_job_file(
         if exec_mpi:
             w.write(f'execFILE="{exec_mpi}"\n')
 
+def summarize_contiguous(records: List[Dict[str, Any]]) -> Dict[str, Any]:
+    """
+    Given a list of dicts with keys: 'block_index', 'zone_type', 'contiguous_id',
+    return:
+      - num_unique_contiguous_ids: int
+      - zone_types_by_id: {contiguous_id: [unique zone types]}
+      - ids_with_multiple_zone_types: [ids that have >1 zone type]
+    """
+    id_to_zone_types = defaultdict(set)
+
+    for r in records:
+        # will raise KeyError if required keys are missing (helpful fail)
+        cid = r["contiguous_id"]
+        zt = r["zone_type"]
+        id_to_zone_types[cid].add(zt)
+
+    zone_types_by_id = {cid: sorted(zts) for cid, zts in id_to_zone_types.items()}
+    ids_with_multiple = [cid for cid, zts in zone_types_by_id.items() if len(zts) > 1]
+
+    return {
+        "num_unique_contiguous_ids": len(zone_types_by_id),
+        "zone_types_by_id": zone_types_by_id,
+        "ids_with_multiple_zone_types": sorted(ids_with_multiple),
+    }
+
 
 def export_to_glennht_conn(matches:List[Dict[str, Dict[int, str]]],outer_faces:List[Dict[str,int]],filename:str, gifs:List[List[Dict[str, int]]],volume_zones:List[Dict[str,Any]]):
     """Exports the connectivity to GlennHT format 
@@ -517,19 +562,18 @@ def export_to_glennht_conn(matches:List[Dict[str, Dict[int, str]]],outer_faces:L
     for gif in gifs:
         lines.append(f"{gif['id1']} {gif['id2']} -2 1\n") # type: ignore
     
+    summary = summarize_contiguous(volume_zones)
     # Print volume zones
-    zonetype_map = {'fluid':1,'solid':2}
-    lines.append(f"{len(volume_zones)}\n")
+    
+    lines.append(f"{summary['num_unique_contiguous_ids']}\n")
     # Print what types of zones are there 
-    prevType = ""
-    for v in volume_zones:
-        if v['zone_type'] != prevType:
-            lines.append(f"{zonetype_map[v['zone_type']]} ")
-        prevType = v['zone_type']
+    for k,v in summary['zone_types_by_id'].items():
+        lines.append(f"{k} ")
+    lines.append("\n")
     # Print Zone Groups
-    columns_to_print = 5
+    columns_to_print = 10
     for i,v in enumerate(volume_zones):
-        if i % columns_to_print:
+        if i % columns_to_print==0:
             lines.append(f"{v["contiguous_id"]}\n")
         else:
             lines.append(f"{v["contiguous_id"]} ")

{plot3d-1.7.1 → plot3d-1.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "plot3d"
-version = "1.7.1"
+version = "1.7.3"
 description = "Plot3D python utilities for reading and writing and also finding connectivity between blocks"
 authors = ["Paht Juangphanich <paht.juangphanich@nasa.gov>"]