plot3d 1.7.3__tar.gz → 1.7.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plot3d
-Version: 1.7.3
+Version: 1.7.5
 Summary: Plot3D python utilities for reading and writing and also finding connectivity between blocks
 Author: Paht Juangphanich
 Author-email: paht.juangphanich@nasa.gov

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

@@ -161,8 +161,8 @@ def _write_bsurf_spec(w, bc):
 # GIF + Volume Zone writers (dict inputs supported)
 # ============================================================
 def _write_gif_from_dict(w, gdict: Dict[str, Any]) -> None:
-    sid1 = int(gdict.get("id1", 0))
-    sid2 = int(gdict.get("id2", 0))
+    sid1 = int(gdict.get("a", 0))
+    sid2 = int(gdict.get("b", 0))
     name1 = f"surface {sid1}"
     name2 = f"surface {sid2}"
     bctype = 4  # GIF
@@ -312,7 +312,7 @@ def export_to_boundary_condition(
     file_path_to_write: str,
     job_settings: Job,
     bc_group: BCGroup,
-    gifs: List[GIF] | List[Dict[str,Any]],
+    gif_pairs: List[GIF] | List[Dict[str,Any]],
     volume_zones: List[VolumeZone] | List[Dict[str,Any]],
 ):
     file_path_to_write = ensure_extension(file_path_to_write, '.bcs')
@@ -326,10 +326,10 @@ def export_to_boundary_condition(
         "slips": [_asdict_soft(x) for x in bc_group.SymmetricSlips],
         "walls": [_asdict_soft(x) for x in bc_group.Walls],
         "volume_zones": [x for x in volume_zones],
-        "gifs": [_asdict_soft(x) for x in gifs],
+        "gif_pairs": [_asdict_soft(x) for x in gif_pairs],
         "job_settings": _asdict_soft(job_settings),
     }
-    json_path.write_text(json.dumps(json_payload, indent=2))
+    json_path.write_text(json.dumps(json_payload, indent=4))
 
     # ---- Robust reference defaults (use inlet values if missing)
     ref = job_settings.ReferenceCondFull
@@ -383,24 +383,24 @@ def export_to_boundary_condition(
             _write_bsurf_spec(w, wall)
 
         # GIFS (dicts or dataclasses)
-        for g in gifs:
-            if isinstance(g, dict):
-                _write_gif_from_dict(w, g)
+        for pair in gif_pairs:
+            if isinstance(pair, dict):
+                _write_gif_from_dict(w, pair)
             else:
-                name1 = getattr(g, "Name1", f"surface {g.GIFSurface1}")
-                name2 = getattr(g, "Name2", f"surface {g.GIFSurface2}")
+                name1 = getattr(pair, "Name1", f"surface {pair.GIFSurface1}")
+                name2 = getattr(pair, "Name2", f"surface {pair.GIFSurface2}")
                 w.write(
-                    f" &BSurf_Spec\nBSurfID={g.GIFSurface1}, BCType={int(g.BCType)}, "
+                    f" &BSurf_Spec\nBSurfID={pair.GIFSurface1}, BCType={int(pair.BCType)}, "
                     f"BSurfName='{name1}'\n &END\n\n"
                 )
                 w.write(
-                    f" &BSurf_Spec\nBSurfID={g.GIFSurface2}, BCType={int(g.BCType)}, "
+                    f" &BSurf_Spec\nBSurfID={pair.GIFSurface2}, BCType={int(pair.BCType)}, "
                     f"BSurfName='{name2}'\n &END\n\n"
                 )
-                w.write(f" &GIF_Spec\nSurfID_1={g.GIFSurface1}, SurfID2={g.GIFSurface2}\n &END\n\n")
+                w.write(f" &GIF_Spec\nSurfID_1={pair.GIFSurface1}, SurfID2={pair.GIFSurface2}\n &END\n\n")
 
         # VZConditions (dict templates)
-        volume_zone_unique = {d["contiguous_id"]: d for d in volume_zones}.values()
+        volume_zone_unique = {d["contiguous_index"]: d for d in volume_zones}.values()
         for vz in volume_zone_unique:
             if isinstance(vz, dict):
                 _write_vzconditions(w, vz)
@@ -504,7 +504,7 @@ def summarize_contiguous(records: List[Dict[str, Any]]) -> Dict[str, Any]:
 
     for r in records:
         # will raise KeyError if required keys are missing (helpful fail)
-        cid = r["contiguous_id"]
+        cid = r["contiguous_index"]
         zt = r["zone_type"]
         id_to_zone_types[cid].add(zt)
 
@@ -512,13 +512,15 @@ def summarize_contiguous(records: List[Dict[str, Any]]) -> Dict[str, Any]:
     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),
+        "num_unique_contiguous_indices": 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]]):
+def export_to_glennht_conn(matches:List[Dict[str, Dict[int, str]]],outer_faces:List[Dict[str,int]],filename:str, 
+                           gif_pairs:List[List[Dict[str, int]]],gif_faces:List[List[Dict[str, int]]],
+                               volume_zones:List[Dict[str,Any]]):
     """Exports the connectivity to GlennHT format 
 
     Args:
@@ -544,7 +546,11 @@ def export_to_glennht_conn(matches:List[Dict[str, Dict[int, str]]],outer_faces:L
 
             lines.append(f"{block_indx:3d}\t{block_IMIN:5d} {block_JMIN:5d} {block_KMIN:5d}\t{block_IMAX:5d} {block_JMAX:5d} {block_KMAX:5d}\n")
     # Print Surfaces 
-    # Get total number of surfaces     
+    # Get total number of surfaces
+    outer_faces.extend(gif_faces)
+    outer_faces = sorted(outer_faces, key=lambda d: d["id"])
+
+    lines.append(f"{len(outer_faces)}\n")
     for surface in outer_faces:
         block_indx = surface['block_index']+1 # type: ignore
         IMIN = surface['IMIN']+1 # type: ignore
@@ -558,14 +564,14 @@ def export_to_glennht_conn(matches:List[Dict[str, Dict[int, str]]],outer_faces:L
         lines.append(f"{block_indx:3d}\t{IMIN:5d} {JMIN:5d} {KMIN:5d}\t{IMAX:5d} {JMAX:5d} {KMAX:5d}\t{id:4d}\n")
     
     # Print GIFs
-    lines.append(f"{len(gifs)}\n")
-    for gif in gifs:
-        lines.append(f"{gif['id1']} {gif['id2']} -2 1\n") # type: ignore
+    lines.append(f"{len(gif_pairs)}\n")
+    for pairs in gif_pairs:
+        lines.append(f"{pairs['a']} {pairs['b']} -2 1\n") # type: ignore
     
     summary = summarize_contiguous(volume_zones)
     # Print volume zones
     
-    lines.append(f"{summary['num_unique_contiguous_ids']}\n")
+    lines.append(f"{summary['num_unique_contiguous_indices']}\n")
     # Print what types of zones are there 
     for k,v in summary['zone_types_by_id'].items():
         lines.append(f"{k} ")
@@ -574,9 +580,9 @@ def export_to_glennht_conn(matches:List[Dict[str, Dict[int, str]]],outer_faces:L
     columns_to_print = 10
     for i,v in enumerate(volume_zones):
         if i % columns_to_print==0:
-            lines.append(f"{v["contiguous_id"]}\n")
+            lines.append(f"{v["contiguous_index"]}\n")
         else:
-            lines.append(f"{v["contiguous_id"]} ")
+            lines.append(f"{v["contiguous_index"]} ")
     
     filename = ensure_extension(filename,'.ght_conn')
     with open(f'{filename}','w') as fp:

{plot3d-1.7.3 → plot3d-1.7.5}/plot3d/gridpro/import_functions.py

@@ -1,7 +1,7 @@
 from typing import Dict, List, Tuple, Optional
 import numpy as np
 from tqdm import tqdm
-from typing import List, Tuple, Optional
+from typing import List, Tuple, Optional, Any
 from plot3d import Block
 from collections import defaultdict
 
@@ -97,7 +97,7 @@ def read_gridpro_connectivity(
             "bc_group":       {"inlet":[...], "outlet":[...], "symm_slip":[...], "wall":[...]},
             "gifs":      List[List[face_dict]],  # grouped by sf1
             "periodic_faces": List[{"block1":{...}, "block2":{...}}],
-            "volume_zones":   List[{"pty":int, "zone":str, "contiguous_id":int}],
+            "volume_zones":   List[{"pty":int, "zone":str, "contiguous_index":int}],
         }
     """
     # ---------------------------- parsing ----------------------------
@@ -219,16 +219,7 @@ def read_gridpro_connectivity(
         "symm_slip": bc_faces_for(4),
         "wall":      bc_faces_for(2),
     }
-    # GIF faces grouped by sf1 for pty in 12..21 or == 1000
-    gif_faces: List[Dict[str, int]] = []
-    for p in patches:
-        if (12 <= p["pty"] <= 21) or (p["pty"] == 1000): # type: ignore
-            face_temp = face_dict(p["sb1"], p["L1i"], p["L1j"], p["L1k"], p["H1i"], p["H1j"], p["H1k"]) # type: ignore
-            face_temp["id1"] = int(p["sf1"]) # type: ignore
-            face_temp["id2"] = int(p["sf2"]) # type: ignore
-            face_temp["pty"] = int(p["pty"]) # type: ignore
-            gif_faces.append(face_temp)
-            
+    
     # Periodic faces: pty == 3 (explicit pairs)
     periodic_faces: List[Dict[str, Dict[str, int]]] = []
     for p in patches:
@@ -239,6 +230,16 @@ def read_gridpro_connectivity(
                     p["sb2"], (p["L2i"], p["L2j"], p["L2k"], p["H2i"], p["H2j"], p["H2k"]), # type: ignore
                 )
             )
+            
+    # GIF faces grouped by sf1 for pty in 12..21 or == 1000
+    gif_faces: List[Dict[str, int]] = []
+    for p in patches:
+#? This is how we identify gifs inside of a grid pro connectivity file. 
+#? If the PTY is between 12 and 21 these are gifs
+        if (12 <= p["pty"] <= 21) or (p["pty"] == 1000): # type: ignore
+            face_temp = face_dict(p["sb1"], p["L1i"], p["L1j"], p["L1k"], p["H1i"], p["H1j"], p["H1k"]) # type: ignore
+            face_temp["id"] = p["pty"] # type: ignore
+            gif_faces.append(face_temp)
 
     # Volume zones (unique superblock ptys; odd→fluid, even→solid) with contiguous ids
     volume_zones: List[Dict[str, object]] = []
@@ -249,7 +250,7 @@ def read_gridpro_connectivity(
         if zone is not prevZoneType:
             cid += 1
             prevZoneType = zone
-        volume_zones.append({"block_index": id, "zone_type": zone, "contiguous_id": cid})
+        volume_zones.append({"block_index": id, "zone_type": zone, "contiguous_index": cid})
         
 
     return {

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

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