From 7c11cee7ec6993af6d4375216ba8e9f608bd6dba Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 3 Apr 2025 10:58:17 +0100 Subject: [PATCH 1/9] changes for workflow api integration --- codegen/allapigen.py | 5 +++++ src/ansys/fluent/core/codegen/__init__.py | 1 + src/ansys/fluent/core/codegen/datamodelgen.py | 11 +++++++++++ src/ansys/fluent/core/services/datamodel_se.py | 2 +- src/ansys/fluent/core/session_base_meshing.py | 8 ++++++++ src/ansys/fluent/core/session_meshing.py | 5 +++++ src/ansys/fluent/core/session_pure_meshing.py | 5 +++++ src/ansys/fluent/core/session_pure_meshing.pyi | 2 ++ 8 files changed, 38 insertions(+), 1 deletion(-) diff --git a/codegen/allapigen.py b/codegen/allapigen.py index 05ba2895d75..f3707c748b1 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -16,6 +16,7 @@ gt_222 = FluentVersion(version) > FluentVersion.v222 ge_231 = FluentVersion(version) >= FluentVersion.v231 ge_242 = FluentVersion(version) >= FluentVersion.v242 + ge_252 = FluentVersion(version) >= FluentVersion.v252 static_infos = { StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( @@ -39,6 +40,10 @@ static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) + if ge_252: + static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( + meshing._datamodel_service_se.get_static_info("meshing_workflow") + ) meshing.exit() solver = launch_fluent( diff --git a/src/ansys/fluent/core/codegen/__init__.py b/src/ansys/fluent/core/codegen/__init__.py index 6e188f5ca25..23afee68b2a 100644 --- a/src/ansys/fluent/core/codegen/__init__.py +++ b/src/ansys/fluent/core/codegen/__init__.py @@ -35,6 +35,7 @@ class StaticInfoType(Enum): DATAMODEL_MESHING = auto() DATAMODEL_PART_MANAGEMENT = auto() DATAMODEL_PM_FILE_MANAGEMENT = auto() + DATAMODEL_MESHING_WORKFLOW = auto() DATAMODEL_FLICING = auto() DATAMODEL_PREFERENCES = auto() DATAMODEL_SOLVER_WORKFLOW = auto() diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index 8e6b6f76da9..45d156881e6 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -181,6 +181,7 @@ def _build_command_query_docstring(name: str, info: Any, indent: str, is_command "MeshingUtilities": "meshing_utilities", "flicing": "flicing", "solverworkflow": "solver_workflow", + "meshing_workflow": "meshing_workflow", } @@ -251,6 +252,13 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) + if StaticInfoType.DATAMODEL_MESHING_WORKFLOW in static_infos: + self._static_info["meshing_workflow"] = DataModelStaticInfo( + StaticInfoType.DATAMODEL_MESHING_WORKFLOW, + "meshing_workflow", + ("meshing",), + self.version, + ) if StaticInfoType.DATAMODEL_FLICING in static_infos: self._static_info["flicing"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_FLICING, @@ -598,6 +606,9 @@ def generate(version, static_infos: dict, verbose: bool = False): StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: meshing._datamodel_service_se.get_static_info( "PMFileManagement" ), + StaticInfoType.DATAMODEL_MESHING_WORKFLOW: meshing._datamodel_service_se.get_static_info( + "meshing_workflow" + ), StaticInfoType.DATAMODEL_PREFERENCES: solver._datamodel_service_se.get_static_info( "preferences" ), diff --git a/src/ansys/fluent/core/services/datamodel_se.py b/src/ansys/fluent/core/services/datamodel_se.py index b18bed5f7d6..9b3e66e591a 100644 --- a/src/ansys/fluent/core/services/datamodel_se.py +++ b/src/ansys/fluent/core/services/datamodel_se.py @@ -2225,7 +2225,7 @@ def __init__( ["String", "ListString", "String List"], PyTextualCommandArgumentsSubItem ), **dict.fromkeys( - ["Real", "Int", "ListReal", "Real List", "Integer", "ListInt"], + ["Real", "Int", "ListReal", "Real List", "Integer", "ListInt", "Integer List"], PyNumericalCommandArgumentsSubItem, ), "Dict": PyDictionaryCommandArgumentsSubItem, diff --git a/src/ansys/fluent/core/session_base_meshing.py b/src/ansys/fluent/core/session_base_meshing.py index c2e9ad93853..8ca2a627fd4 100644 --- a/src/ansys/fluent/core/session_base_meshing.py +++ b/src/ansys/fluent/core/session_base_meshing.py @@ -77,6 +77,7 @@ def __init__( self._old_workflow = None self._part_management = None self._pm_file_management = None + self._meshing_workflow = None self._preferences = None self._session_execute_tui = session_execute_tui self._product_version = None @@ -264,6 +265,13 @@ def PMFileManagement(self): self._pm_file_management = _make_datamodel_module(self, "PMFileManagement") return self._pm_file_management + @property + def meshing_workflow(self): + """Full API to meshing and meshing_workflow.""" + if self._meshing_workflow is None: + self._meshing_workflow = _make_datamodel_module(self, "meshing_workflow") + return self._meshing_workflow + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_meshing.py b/src/ansys/fluent/core/session_meshing.py index dd3e757204e..325eb71a017 100644 --- a/src/ansys/fluent/core/session_meshing.py +++ b/src/ansys/fluent/core/session_meshing.py @@ -131,6 +131,11 @@ def PMFileManagement(self): """Part management file management datamodel root.""" return super(Meshing, self).PMFileManagement + @property + def meshing_workflow(self): + """Full API to meshing and meshing_workflow.""" + return super(Meshing, self).meshing_workflow + @property def preferences(self): """Preferences datamodel root.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.py b/src/ansys/fluent/core/session_pure_meshing.py index 832029ec0cb..4718f28fcf7 100644 --- a/src/ansys/fluent/core/session_pure_meshing.py +++ b/src/ansys/fluent/core/session_pure_meshing.py @@ -193,6 +193,11 @@ def PMFileManagement(self): """Datamodel root of PMFileManagement.""" return self._base_meshing.PMFileManagement + @property + def meshing_workflow(self): + """Full API to meshing and meshing_workflow.""" + return self._base_meshing.meshing_workflow + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.pyi b/src/ansys/fluent/core/session_pure_meshing.pyi index 6c13a274a01..97ad3cacc8a 100644 --- a/src/ansys/fluent/core/session_pure_meshing.pyi +++ b/src/ansys/fluent/core/session_pure_meshing.pyi @@ -56,6 +56,8 @@ class PureMeshing: @property def PMFileManagement(self) -> pmfilemanagement_root: ... @property + def meshing_workflow(self) -> meshing_workflow_root: ... + @property def preferences(self) -> preferences_root: ... def transfer_mesh_to_solvers( self, From f8493238ffb46601d16b8d2524338296fcabb6e6 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Fri, 4 Apr 2025 12:06:22 +0100 Subject: [PATCH 2/9] xxx --- codegen/allapigen.py | 49 +++++++++++++------ src/ansys/fluent/core/codegen/datamodelgen.py | 4 ++ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/codegen/allapigen.py b/codegen/allapigen.py index f3707c748b1..eceb2f3233f 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -1,6 +1,7 @@ """Helper module to generate Fluent API classes.""" import argparse +from pdb import pm from time import time from ansys.fluent.core import CODEGEN_OUTDIR, FluentMode, FluentVersion, launch_fluent @@ -18,49 +19,65 @@ ge_242 = FluentVersion(version) >= FluentVersion.v242 ge_252 = FluentVersion(version) >= FluentVersion.v252 + print("w") + + w = True or meshing._datamodel_service_se.get_static_info("workflow") + print("m") + + m = True or meshing._datamodel_service_se.get_static_info("meshing") + print("pm") + + pm = True or meshing._datamodel_service_se.get_static_info("PartManagement") + print("pmf") + pmf = True or meshing._datamodel_service_se.get_static_info("PMFileManagement") + static_infos = { - StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( - "workflow" - ), - StaticInfoType.DATAMODEL_MESHING: meshing._datamodel_service_se.get_static_info( - "meshing" - ), - StaticInfoType.DATAMODEL_PART_MANAGEMENT: meshing._datamodel_service_se.get_static_info( - "PartManagement" - ), - StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: meshing._datamodel_service_se.get_static_info( - "PMFileManagement" - ), + StaticInfoType.DATAMODEL_WORKFLOW: w, + StaticInfoType.DATAMODEL_MESHING: m, + StaticInfoType.DATAMODEL_PART_MANAGEMENT: pm, + StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: pmf, } - if gt_222: + print("tm") + if False and gt_222: static_infos[StaticInfoType.TUI_MESHING] = ( meshing._datamodel_service_tui.get_static_info("") ) - if ge_242: + print("mu") + if False and ge_242: static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) + print("mw") + input() if ge_252: static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( meshing._datamodel_service_se.get_static_info("meshing_workflow") ) + print("meshing.exit()") meshing.exit() + print("launch_fluent()") solver = launch_fluent( - mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER + mode=FluentMode.SOLVER + # mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER ) + print("p") static_infos[StaticInfoType.DATAMODEL_PREFERENCES] = ( solver._datamodel_service_se.get_static_info("preferences") ) + print("s") static_infos[StaticInfoType.SETTINGS] = solver._settings_service.get_static_info() + print("st") if gt_222: static_infos[StaticInfoType.TUI_SOLVER] = ( solver._datamodel_service_tui.get_static_info("") ) - if ge_231: + print("i") + if False and ge_231: static_infos[StaticInfoType.DATAMODEL_FLICING] = ( solver._datamodel_service_se.get_static_info("flserver") ) + print("sw") static_infos[StaticInfoType.DATAMODEL_SOLVER_WORKFLOW] = ( solver._datamodel_service_se.get_static_info("solverworkflow") ) diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index 45d156881e6..1889c8dd906 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -198,6 +198,7 @@ def __init__( version: str, rules_save_name: str = "", ): + print(f"DataModelStaticInfo for {rules}: enter") self.static_info_type = static_info_type self.rules = rules self.modes = modes @@ -214,6 +215,7 @@ def __init__( if len(modes) > 1: for mode in modes[1:]: DataModelStaticInfo._noindices.append(f"{mode}.datamodel.{rules}") + print(f"DataModelStaticInfo for {rules}: return") class DataModelGenerator: @@ -252,7 +254,9 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) + print("check if mw in static_infos") if StaticInfoType.DATAMODEL_MESHING_WORKFLOW in static_infos: + print("Instantiate DataModelStaticInfo and insert") self._static_info["meshing_workflow"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_MESHING_WORKFLOW, "meshing_workflow", From 45fa957d53eba16d321508df3170e44b84574ce5 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Mon, 7 Apr 2025 12:38:39 +0100 Subject: [PATCH 3/9] wf api stuff --- .pre-commit-config.yaml | 7 --- codegen/allapigen.py | 56 +++++++------------ src/ansys/fluent/core/codegen/__init__.py | 1 + src/ansys/fluent/core/codegen/datamodelgen.py | 11 ++++ src/ansys/fluent/core/session_base_meshing.py | 10 ++++ src/ansys/fluent/core/session_meshing.py | 5 ++ src/ansys/fluent/core/session_pure_meshing.py | 5 ++ .../fluent/core/session_pure_meshing.pyi | 2 + 8 files changed, 53 insertions(+), 44 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa20f461781..b29fd4729cf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -84,10 +84,3 @@ repos: - id: conventional-pre-commit stages: [commit-msg] args: [] - -- repo: https://github.com/ansys/pre-commit-hooks - rev: v0.5.1 - hooks: - - id: add-license-headers - args: - - --start_year=2021 diff --git a/codegen/allapigen.py b/codegen/allapigen.py index eceb2f3233f..7276772e56a 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -1,12 +1,10 @@ """Helper module to generate Fluent API classes.""" import argparse -from pdb import pm from time import time from ansys.fluent.core import CODEGEN_OUTDIR, FluentMode, FluentVersion, launch_fluent from ansys.fluent.core.codegen import StaticInfoType, allapigen -from ansys.fluent.core.codegen.print_fluent_version import print_fluent_version from ansys.fluent.core.search import _generate_api_data from ansys.fluent.core.utils.fluent_version import get_version_for_file_name @@ -19,73 +17,57 @@ ge_242 = FluentVersion(version) >= FluentVersion.v242 ge_252 = FluentVersion(version) >= FluentVersion.v252 - print("w") - - w = True or meshing._datamodel_service_se.get_static_info("workflow") - print("m") - - m = True or meshing._datamodel_service_se.get_static_info("meshing") - print("pm") - - pm = True or meshing._datamodel_service_se.get_static_info("PartManagement") - print("pmf") - pmf = True or meshing._datamodel_service_se.get_static_info("PMFileManagement") - static_infos = { - StaticInfoType.DATAMODEL_WORKFLOW: w, - StaticInfoType.DATAMODEL_MESHING: m, - StaticInfoType.DATAMODEL_PART_MANAGEMENT: pm, - StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: pmf, + StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( + "workflow" + ), + StaticInfoType.DATAMODEL_MESHING: meshing._datamodel_service_se.get_static_info( + "meshing" + ), + StaticInfoType.DATAMODEL_PART_MANAGEMENT: meshing._datamodel_service_se.get_static_info( + "PartManagement" + ), + StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: meshing._datamodel_service_se.get_static_info( + "PMFileManagement" + ), } - print("tm") - if False and gt_222: + if gt_222: static_infos[StaticInfoType.TUI_MESHING] = ( meshing._datamodel_service_tui.get_static_info("") ) - print("mu") - if False and ge_242: + if ge_242: static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) - print("mw") - input() if ge_252: static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( meshing._datamodel_service_se.get_static_info("meshing_workflow") ) - print("meshing.exit()") meshing.exit() - - print("launch_fluent()") + """ solver = launch_fluent( - mode=FluentMode.SOLVER - # mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER + mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER ) - print("p") static_infos[StaticInfoType.DATAMODEL_PREFERENCES] = ( solver._datamodel_service_se.get_static_info("preferences") ) - print("s") static_infos[StaticInfoType.SETTINGS] = solver._settings_service.get_static_info() - print("st") if gt_222: static_infos[StaticInfoType.TUI_SOLVER] = ( solver._datamodel_service_tui.get_static_info("") ) - print("i") - if False and ge_231: + if ge_231: static_infos[StaticInfoType.DATAMODEL_FLICING] = ( solver._datamodel_service_se.get_static_info("flserver") ) - print("sw") static_infos[StaticInfoType.DATAMODEL_SOLVER_WORKFLOW] = ( solver._datamodel_service_se.get_static_info("solverworkflow") ) + """ t1 = time() print(f"\nTime to fetch static info: {t1 - t0:.2f} seconds") CODEGEN_OUTDIR.mkdir(parents=True, exist_ok=True) - print_fluent_version(solver._app_utilities) - solver.exit() + # solver.exit() parser = argparse.ArgumentParser( description="A script to write Fluent API files with an optional verbose output." ) diff --git a/src/ansys/fluent/core/codegen/__init__.py b/src/ansys/fluent/core/codegen/__init__.py index 23afee68b2a..0347c6b981c 100644 --- a/src/ansys/fluent/core/codegen/__init__.py +++ b/src/ansys/fluent/core/codegen/__init__.py @@ -36,6 +36,7 @@ class StaticInfoType(Enum): DATAMODEL_PART_MANAGEMENT = auto() DATAMODEL_PM_FILE_MANAGEMENT = auto() DATAMODEL_MESHING_WORKFLOW = auto() + DATAMODEL_MESHING_WORKFLOW_X = auto() DATAMODEL_FLICING = auto() DATAMODEL_PREFERENCES = auto() DATAMODEL_SOLVER_WORKFLOW = auto() diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index 1889c8dd906..97a5bcfdb48 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -263,6 +263,14 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) + if StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X in static_infos: + print("Instantiate DataModelStaticInfo and insert") + self._static_info["meshing_workflow_x"] = DataModelStaticInfo( + StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X, + "meshing_workflow_x", + ("meshing",), + self.version, + ) if StaticInfoType.DATAMODEL_FLICING in static_infos: self._static_info["flicing"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_FLICING, @@ -613,6 +621,9 @@ def generate(version, static_infos: dict, verbose: bool = False): StaticInfoType.DATAMODEL_MESHING_WORKFLOW: meshing._datamodel_service_se.get_static_info( "meshing_workflow" ), + StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X: meshing._datamodel_service_se.get_static_info( + "meshing_workflow_x" + ), StaticInfoType.DATAMODEL_PREFERENCES: solver._datamodel_service_se.get_static_info( "preferences" ), diff --git a/src/ansys/fluent/core/session_base_meshing.py b/src/ansys/fluent/core/session_base_meshing.py index 8ca2a627fd4..4f779f9d62b 100644 --- a/src/ansys/fluent/core/session_base_meshing.py +++ b/src/ansys/fluent/core/session_base_meshing.py @@ -78,6 +78,7 @@ def __init__( self._part_management = None self._pm_file_management = None self._meshing_workflow = None + self._meshing_workflow_x = None self._preferences = None self._session_execute_tui = session_execute_tui self._product_version = None @@ -272,6 +273,15 @@ def meshing_workflow(self): self._meshing_workflow = _make_datamodel_module(self, "meshing_workflow") return self._meshing_workflow + @property + def meshing_workflow_x(self): + """Full API to meshing and meshing_workflow.""" + if self._meshing_workflow_x is None: + self._meshing_workflow_x = _make_datamodel_module( + self, "meshing_workflow_x" + ) + return self._meshing_workflow_x + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_meshing.py b/src/ansys/fluent/core/session_meshing.py index 325eb71a017..c236ee9e6cc 100644 --- a/src/ansys/fluent/core/session_meshing.py +++ b/src/ansys/fluent/core/session_meshing.py @@ -136,6 +136,11 @@ def meshing_workflow(self): """Full API to meshing and meshing_workflow.""" return super(Meshing, self).meshing_workflow + @property + def meshing_workflow_x(self): + """Full API to dummy meshing and meshing_workflow.""" + return super(Meshing, self).meshing_workflow_x + @property def preferences(self): """Preferences datamodel root.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.py b/src/ansys/fluent/core/session_pure_meshing.py index 4718f28fcf7..ca6bb2b6680 100644 --- a/src/ansys/fluent/core/session_pure_meshing.py +++ b/src/ansys/fluent/core/session_pure_meshing.py @@ -198,6 +198,11 @@ def meshing_workflow(self): """Full API to meshing and meshing_workflow.""" return self._base_meshing.meshing_workflow + @property + def meshing_workflow_x(self): + """Full API to dummy meshing and meshing_workflow.""" + return self._base_meshing.meshing_workflow_x + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.pyi b/src/ansys/fluent/core/session_pure_meshing.pyi index 97ad3cacc8a..be1a6c349b9 100644 --- a/src/ansys/fluent/core/session_pure_meshing.pyi +++ b/src/ansys/fluent/core/session_pure_meshing.pyi @@ -58,6 +58,8 @@ class PureMeshing: @property def meshing_workflow(self) -> meshing_workflow_root: ... @property + def meshing_x_workflow(self) -> meshing_workflow_x_root: ... + @property def preferences(self) -> preferences_root: ... def transfer_mesh_to_solvers( self, From 529fda61ec1297d43d39ba13efbcbaeabbc01a14 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Thu, 3 Apr 2025 10:58:17 +0100 Subject: [PATCH 4/9] changes for workflow api integration --- codegen/allapigen.py | 5 +++++ src/ansys/fluent/core/codegen/__init__.py | 1 + src/ansys/fluent/core/codegen/datamodelgen.py | 11 +++++++++++ src/ansys/fluent/core/services/datamodel_se.py | 2 +- src/ansys/fluent/core/session_base_meshing.py | 8 ++++++++ src/ansys/fluent/core/session_meshing.py | 5 +++++ src/ansys/fluent/core/session_pure_meshing.py | 5 +++++ src/ansys/fluent/core/session_pure_meshing.pyi | 2 ++ 8 files changed, 38 insertions(+), 1 deletion(-) diff --git a/codegen/allapigen.py b/codegen/allapigen.py index 05ba2895d75..f3707c748b1 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -16,6 +16,7 @@ gt_222 = FluentVersion(version) > FluentVersion.v222 ge_231 = FluentVersion(version) >= FluentVersion.v231 ge_242 = FluentVersion(version) >= FluentVersion.v242 + ge_252 = FluentVersion(version) >= FluentVersion.v252 static_infos = { StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( @@ -39,6 +40,10 @@ static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) + if ge_252: + static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( + meshing._datamodel_service_se.get_static_info("meshing_workflow") + ) meshing.exit() solver = launch_fluent( diff --git a/src/ansys/fluent/core/codegen/__init__.py b/src/ansys/fluent/core/codegen/__init__.py index 6e188f5ca25..23afee68b2a 100644 --- a/src/ansys/fluent/core/codegen/__init__.py +++ b/src/ansys/fluent/core/codegen/__init__.py @@ -35,6 +35,7 @@ class StaticInfoType(Enum): DATAMODEL_MESHING = auto() DATAMODEL_PART_MANAGEMENT = auto() DATAMODEL_PM_FILE_MANAGEMENT = auto() + DATAMODEL_MESHING_WORKFLOW = auto() DATAMODEL_FLICING = auto() DATAMODEL_PREFERENCES = auto() DATAMODEL_SOLVER_WORKFLOW = auto() diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index aa787889e53..0374ec7aa2d 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -188,6 +188,7 @@ def _build_command_query_docstring( "MeshingUtilities": "meshing_utilities", "flicing": "flicing", "solverworkflow": "solver_workflow", + "meshing_workflow": "meshing_workflow", } @@ -258,6 +259,13 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) + if StaticInfoType.DATAMODEL_MESHING_WORKFLOW in static_infos: + self._static_info["meshing_workflow"] = DataModelStaticInfo( + StaticInfoType.DATAMODEL_MESHING_WORKFLOW, + "meshing_workflow", + ("meshing",), + self.version, + ) if StaticInfoType.DATAMODEL_FLICING in static_infos: self._static_info["flicing"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_FLICING, @@ -605,6 +613,9 @@ def generate(version, static_infos: dict, verbose: bool = False): StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: meshing._datamodel_service_se.get_static_info( "PMFileManagement" ), + StaticInfoType.DATAMODEL_MESHING_WORKFLOW: meshing._datamodel_service_se.get_static_info( + "meshing_workflow" + ), StaticInfoType.DATAMODEL_PREFERENCES: solver._datamodel_service_se.get_static_info( "preferences" ), diff --git a/src/ansys/fluent/core/services/datamodel_se.py b/src/ansys/fluent/core/services/datamodel_se.py index b18bed5f7d6..9b3e66e591a 100644 --- a/src/ansys/fluent/core/services/datamodel_se.py +++ b/src/ansys/fluent/core/services/datamodel_se.py @@ -2225,7 +2225,7 @@ def __init__( ["String", "ListString", "String List"], PyTextualCommandArgumentsSubItem ), **dict.fromkeys( - ["Real", "Int", "ListReal", "Real List", "Integer", "ListInt"], + ["Real", "Int", "ListReal", "Real List", "Integer", "ListInt", "Integer List"], PyNumericalCommandArgumentsSubItem, ), "Dict": PyDictionaryCommandArgumentsSubItem, diff --git a/src/ansys/fluent/core/session_base_meshing.py b/src/ansys/fluent/core/session_base_meshing.py index c2e9ad93853..8ca2a627fd4 100644 --- a/src/ansys/fluent/core/session_base_meshing.py +++ b/src/ansys/fluent/core/session_base_meshing.py @@ -77,6 +77,7 @@ def __init__( self._old_workflow = None self._part_management = None self._pm_file_management = None + self._meshing_workflow = None self._preferences = None self._session_execute_tui = session_execute_tui self._product_version = None @@ -264,6 +265,13 @@ def PMFileManagement(self): self._pm_file_management = _make_datamodel_module(self, "PMFileManagement") return self._pm_file_management + @property + def meshing_workflow(self): + """Full API to meshing and meshing_workflow.""" + if self._meshing_workflow is None: + self._meshing_workflow = _make_datamodel_module(self, "meshing_workflow") + return self._meshing_workflow + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_meshing.py b/src/ansys/fluent/core/session_meshing.py index dd3e757204e..325eb71a017 100644 --- a/src/ansys/fluent/core/session_meshing.py +++ b/src/ansys/fluent/core/session_meshing.py @@ -131,6 +131,11 @@ def PMFileManagement(self): """Part management file management datamodel root.""" return super(Meshing, self).PMFileManagement + @property + def meshing_workflow(self): + """Full API to meshing and meshing_workflow.""" + return super(Meshing, self).meshing_workflow + @property def preferences(self): """Preferences datamodel root.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.py b/src/ansys/fluent/core/session_pure_meshing.py index 832029ec0cb..4718f28fcf7 100644 --- a/src/ansys/fluent/core/session_pure_meshing.py +++ b/src/ansys/fluent/core/session_pure_meshing.py @@ -193,6 +193,11 @@ def PMFileManagement(self): """Datamodel root of PMFileManagement.""" return self._base_meshing.PMFileManagement + @property + def meshing_workflow(self): + """Full API to meshing and meshing_workflow.""" + return self._base_meshing.meshing_workflow + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.pyi b/src/ansys/fluent/core/session_pure_meshing.pyi index 6c13a274a01..97ad3cacc8a 100644 --- a/src/ansys/fluent/core/session_pure_meshing.pyi +++ b/src/ansys/fluent/core/session_pure_meshing.pyi @@ -56,6 +56,8 @@ class PureMeshing: @property def PMFileManagement(self) -> pmfilemanagement_root: ... @property + def meshing_workflow(self) -> meshing_workflow_root: ... + @property def preferences(self) -> preferences_root: ... def transfer_mesh_to_solvers( self, From 0cb4de9759b2c82214301b976fa3c7f0ae117e69 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Fri, 4 Apr 2025 12:06:22 +0100 Subject: [PATCH 5/9] xxx --- codegen/allapigen.py | 49 +++++++++++++------ src/ansys/fluent/core/codegen/datamodelgen.py | 4 ++ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/codegen/allapigen.py b/codegen/allapigen.py index f3707c748b1..eceb2f3233f 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -1,6 +1,7 @@ """Helper module to generate Fluent API classes.""" import argparse +from pdb import pm from time import time from ansys.fluent.core import CODEGEN_OUTDIR, FluentMode, FluentVersion, launch_fluent @@ -18,49 +19,65 @@ ge_242 = FluentVersion(version) >= FluentVersion.v242 ge_252 = FluentVersion(version) >= FluentVersion.v252 + print("w") + + w = True or meshing._datamodel_service_se.get_static_info("workflow") + print("m") + + m = True or meshing._datamodel_service_se.get_static_info("meshing") + print("pm") + + pm = True or meshing._datamodel_service_se.get_static_info("PartManagement") + print("pmf") + pmf = True or meshing._datamodel_service_se.get_static_info("PMFileManagement") + static_infos = { - StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( - "workflow" - ), - StaticInfoType.DATAMODEL_MESHING: meshing._datamodel_service_se.get_static_info( - "meshing" - ), - StaticInfoType.DATAMODEL_PART_MANAGEMENT: meshing._datamodel_service_se.get_static_info( - "PartManagement" - ), - StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: meshing._datamodel_service_se.get_static_info( - "PMFileManagement" - ), + StaticInfoType.DATAMODEL_WORKFLOW: w, + StaticInfoType.DATAMODEL_MESHING: m, + StaticInfoType.DATAMODEL_PART_MANAGEMENT: pm, + StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: pmf, } - if gt_222: + print("tm") + if False and gt_222: static_infos[StaticInfoType.TUI_MESHING] = ( meshing._datamodel_service_tui.get_static_info("") ) - if ge_242: + print("mu") + if False and ge_242: static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) + print("mw") + input() if ge_252: static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( meshing._datamodel_service_se.get_static_info("meshing_workflow") ) + print("meshing.exit()") meshing.exit() + print("launch_fluent()") solver = launch_fluent( - mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER + mode=FluentMode.SOLVER + # mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER ) + print("p") static_infos[StaticInfoType.DATAMODEL_PREFERENCES] = ( solver._datamodel_service_se.get_static_info("preferences") ) + print("s") static_infos[StaticInfoType.SETTINGS] = solver._settings_service.get_static_info() + print("st") if gt_222: static_infos[StaticInfoType.TUI_SOLVER] = ( solver._datamodel_service_tui.get_static_info("") ) - if ge_231: + print("i") + if False and ge_231: static_infos[StaticInfoType.DATAMODEL_FLICING] = ( solver._datamodel_service_se.get_static_info("flserver") ) + print("sw") static_infos[StaticInfoType.DATAMODEL_SOLVER_WORKFLOW] = ( solver._datamodel_service_se.get_static_info("solverworkflow") ) diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index 0374ec7aa2d..77c1348d1f4 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -205,6 +205,7 @@ def __init__( version: str, rules_save_name: str = "", ): + print(f"DataModelStaticInfo for {rules}: enter") self.static_info_type = static_info_type self.rules = rules self.modes = modes @@ -221,6 +222,7 @@ def __init__( if len(modes) > 1: for mode in modes[1:]: DataModelStaticInfo._noindices.append(f"{mode}.datamodel.{rules}") + print(f"DataModelStaticInfo for {rules}: return") class DataModelGenerator: @@ -259,7 +261,9 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) + print("check if mw in static_infos") if StaticInfoType.DATAMODEL_MESHING_WORKFLOW in static_infos: + print("Instantiate DataModelStaticInfo and insert") self._static_info["meshing_workflow"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_MESHING_WORKFLOW, "meshing_workflow", From 144ca851490b341b5ec4dfd5d07b4a8cb315e6d9 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Mon, 7 Apr 2025 12:38:39 +0100 Subject: [PATCH 6/9] wf api stuff --- codegen/allapigen.py | 56 +++++++------------ src/ansys/fluent/core/codegen/__init__.py | 1 + src/ansys/fluent/core/codegen/datamodelgen.py | 11 ++++ src/ansys/fluent/core/session_base_meshing.py | 10 ++++ src/ansys/fluent/core/session_meshing.py | 5 ++ src/ansys/fluent/core/session_pure_meshing.py | 5 ++ .../fluent/core/session_pure_meshing.pyi | 2 + 7 files changed, 53 insertions(+), 37 deletions(-) diff --git a/codegen/allapigen.py b/codegen/allapigen.py index eceb2f3233f..7276772e56a 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -1,12 +1,10 @@ """Helper module to generate Fluent API classes.""" import argparse -from pdb import pm from time import time from ansys.fluent.core import CODEGEN_OUTDIR, FluentMode, FluentVersion, launch_fluent from ansys.fluent.core.codegen import StaticInfoType, allapigen -from ansys.fluent.core.codegen.print_fluent_version import print_fluent_version from ansys.fluent.core.search import _generate_api_data from ansys.fluent.core.utils.fluent_version import get_version_for_file_name @@ -19,73 +17,57 @@ ge_242 = FluentVersion(version) >= FluentVersion.v242 ge_252 = FluentVersion(version) >= FluentVersion.v252 - print("w") - - w = True or meshing._datamodel_service_se.get_static_info("workflow") - print("m") - - m = True or meshing._datamodel_service_se.get_static_info("meshing") - print("pm") - - pm = True or meshing._datamodel_service_se.get_static_info("PartManagement") - print("pmf") - pmf = True or meshing._datamodel_service_se.get_static_info("PMFileManagement") - static_infos = { - StaticInfoType.DATAMODEL_WORKFLOW: w, - StaticInfoType.DATAMODEL_MESHING: m, - StaticInfoType.DATAMODEL_PART_MANAGEMENT: pm, - StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: pmf, + StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( + "workflow" + ), + StaticInfoType.DATAMODEL_MESHING: meshing._datamodel_service_se.get_static_info( + "meshing" + ), + StaticInfoType.DATAMODEL_PART_MANAGEMENT: meshing._datamodel_service_se.get_static_info( + "PartManagement" + ), + StaticInfoType.DATAMODEL_PM_FILE_MANAGEMENT: meshing._datamodel_service_se.get_static_info( + "PMFileManagement" + ), } - print("tm") - if False and gt_222: + if gt_222: static_infos[StaticInfoType.TUI_MESHING] = ( meshing._datamodel_service_tui.get_static_info("") ) - print("mu") - if False and ge_242: + if ge_242: static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) - print("mw") - input() if ge_252: static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( meshing._datamodel_service_se.get_static_info("meshing_workflow") ) - print("meshing.exit()") meshing.exit() - - print("launch_fluent()") + """ solver = launch_fluent( - mode=FluentMode.SOLVER - # mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER + mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER ) - print("p") static_infos[StaticInfoType.DATAMODEL_PREFERENCES] = ( solver._datamodel_service_se.get_static_info("preferences") ) - print("s") static_infos[StaticInfoType.SETTINGS] = solver._settings_service.get_static_info() - print("st") if gt_222: static_infos[StaticInfoType.TUI_SOLVER] = ( solver._datamodel_service_tui.get_static_info("") ) - print("i") - if False and ge_231: + if ge_231: static_infos[StaticInfoType.DATAMODEL_FLICING] = ( solver._datamodel_service_se.get_static_info("flserver") ) - print("sw") static_infos[StaticInfoType.DATAMODEL_SOLVER_WORKFLOW] = ( solver._datamodel_service_se.get_static_info("solverworkflow") ) + """ t1 = time() print(f"\nTime to fetch static info: {t1 - t0:.2f} seconds") CODEGEN_OUTDIR.mkdir(parents=True, exist_ok=True) - print_fluent_version(solver._app_utilities) - solver.exit() + # solver.exit() parser = argparse.ArgumentParser( description="A script to write Fluent API files with an optional verbose output." ) diff --git a/src/ansys/fluent/core/codegen/__init__.py b/src/ansys/fluent/core/codegen/__init__.py index 23afee68b2a..0347c6b981c 100644 --- a/src/ansys/fluent/core/codegen/__init__.py +++ b/src/ansys/fluent/core/codegen/__init__.py @@ -36,6 +36,7 @@ class StaticInfoType(Enum): DATAMODEL_PART_MANAGEMENT = auto() DATAMODEL_PM_FILE_MANAGEMENT = auto() DATAMODEL_MESHING_WORKFLOW = auto() + DATAMODEL_MESHING_WORKFLOW_X = auto() DATAMODEL_FLICING = auto() DATAMODEL_PREFERENCES = auto() DATAMODEL_SOLVER_WORKFLOW = auto() diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index 77c1348d1f4..f790a6e412e 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -270,6 +270,14 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) + if StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X in static_infos: + print("Instantiate DataModelStaticInfo and insert") + self._static_info["meshing_workflow_x"] = DataModelStaticInfo( + StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X, + "meshing_workflow_x", + ("meshing",), + self.version, + ) if StaticInfoType.DATAMODEL_FLICING in static_infos: self._static_info["flicing"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_FLICING, @@ -620,6 +628,9 @@ def generate(version, static_infos: dict, verbose: bool = False): StaticInfoType.DATAMODEL_MESHING_WORKFLOW: meshing._datamodel_service_se.get_static_info( "meshing_workflow" ), + StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X: meshing._datamodel_service_se.get_static_info( + "meshing_workflow_x" + ), StaticInfoType.DATAMODEL_PREFERENCES: solver._datamodel_service_se.get_static_info( "preferences" ), diff --git a/src/ansys/fluent/core/session_base_meshing.py b/src/ansys/fluent/core/session_base_meshing.py index 8ca2a627fd4..4f779f9d62b 100644 --- a/src/ansys/fluent/core/session_base_meshing.py +++ b/src/ansys/fluent/core/session_base_meshing.py @@ -78,6 +78,7 @@ def __init__( self._part_management = None self._pm_file_management = None self._meshing_workflow = None + self._meshing_workflow_x = None self._preferences = None self._session_execute_tui = session_execute_tui self._product_version = None @@ -272,6 +273,15 @@ def meshing_workflow(self): self._meshing_workflow = _make_datamodel_module(self, "meshing_workflow") return self._meshing_workflow + @property + def meshing_workflow_x(self): + """Full API to meshing and meshing_workflow.""" + if self._meshing_workflow_x is None: + self._meshing_workflow_x = _make_datamodel_module( + self, "meshing_workflow_x" + ) + return self._meshing_workflow_x + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_meshing.py b/src/ansys/fluent/core/session_meshing.py index 325eb71a017..c236ee9e6cc 100644 --- a/src/ansys/fluent/core/session_meshing.py +++ b/src/ansys/fluent/core/session_meshing.py @@ -136,6 +136,11 @@ def meshing_workflow(self): """Full API to meshing and meshing_workflow.""" return super(Meshing, self).meshing_workflow + @property + def meshing_workflow_x(self): + """Full API to dummy meshing and meshing_workflow.""" + return super(Meshing, self).meshing_workflow_x + @property def preferences(self): """Preferences datamodel root.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.py b/src/ansys/fluent/core/session_pure_meshing.py index 4718f28fcf7..ca6bb2b6680 100644 --- a/src/ansys/fluent/core/session_pure_meshing.py +++ b/src/ansys/fluent/core/session_pure_meshing.py @@ -198,6 +198,11 @@ def meshing_workflow(self): """Full API to meshing and meshing_workflow.""" return self._base_meshing.meshing_workflow + @property + def meshing_workflow_x(self): + """Full API to dummy meshing and meshing_workflow.""" + return self._base_meshing.meshing_workflow_x + @property def preferences(self): """Datamodel root of preferences.""" diff --git a/src/ansys/fluent/core/session_pure_meshing.pyi b/src/ansys/fluent/core/session_pure_meshing.pyi index 97ad3cacc8a..be1a6c349b9 100644 --- a/src/ansys/fluent/core/session_pure_meshing.pyi +++ b/src/ansys/fluent/core/session_pure_meshing.pyi @@ -58,6 +58,8 @@ class PureMeshing: @property def meshing_workflow(self) -> meshing_workflow_root: ... @property + def meshing_x_workflow(self) -> meshing_workflow_x_root: ... + @property def preferences(self) -> preferences_root: ... def transfer_mesh_to_solvers( self, From e8a65bb696280f54a71cae1d4d16e2623b7886b4 Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Fri, 23 May 2025 10:20:51 +0100 Subject: [PATCH 7/9] clean up allapigen --- codegen/allapigen.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/codegen/allapigen.py b/codegen/allapigen.py index 7276772e56a..597d21229a4 100644 --- a/codegen/allapigen.py +++ b/codegen/allapigen.py @@ -15,7 +15,7 @@ gt_222 = FluentVersion(version) > FluentVersion.v222 ge_231 = FluentVersion(version) >= FluentVersion.v231 ge_242 = FluentVersion(version) >= FluentVersion.v242 - ge_252 = FluentVersion(version) >= FluentVersion.v252 + ge_261 = FluentVersion(version) >= FluentVersion.v261 static_infos = { StaticInfoType.DATAMODEL_WORKFLOW: meshing._datamodel_service_se.get_static_info( @@ -39,12 +39,11 @@ static_infos[StaticInfoType.DATAMODEL_MESHING_UTILITIES] = ( meshing._datamodel_service_se.get_static_info("MeshingUtilities") ) - if ge_252: + if ge_261: static_infos[StaticInfoType.DATAMODEL_MESHING_WORKFLOW] = ( meshing._datamodel_service_se.get_static_info("meshing_workflow") ) meshing.exit() - """ solver = launch_fluent( mode=FluentMode.SOLVER_ICING if ge_231 else FluentMode.SOLVER ) @@ -63,11 +62,10 @@ static_infos[StaticInfoType.DATAMODEL_SOLVER_WORKFLOW] = ( solver._datamodel_service_se.get_static_info("solverworkflow") ) - """ t1 = time() print(f"\nTime to fetch static info: {t1 - t0:.2f} seconds") CODEGEN_OUTDIR.mkdir(parents=True, exist_ok=True) - # solver.exit() + solver.exit() parser = argparse.ArgumentParser( description="A script to write Fluent API files with an optional verbose output." ) From cd994d5ecaa71178a229d1b0430aac8703ac093e Mon Sep 17 00:00:00 2001 From: "ANSYS\\spearson" Date: Fri, 23 May 2025 12:20:31 +0100 Subject: [PATCH 8/9] tidy up --- src/ansys/fluent/core/codegen/__init__.py | 2 +- src/ansys/fluent/core/codegen/datamodelgen.py | 22 +++++++++---------- src/ansys/fluent/core/session_base_meshing.py | 18 +++++++-------- src/ansys/fluent/core/session_meshing.py | 8 +++---- src/ansys/fluent/core/session_pure_meshing.py | 8 +++---- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/ansys/fluent/core/codegen/__init__.py b/src/ansys/fluent/core/codegen/__init__.py index 0347c6b981c..0b3eeda31cd 100644 --- a/src/ansys/fluent/core/codegen/__init__.py +++ b/src/ansys/fluent/core/codegen/__init__.py @@ -36,7 +36,7 @@ class StaticInfoType(Enum): DATAMODEL_PART_MANAGEMENT = auto() DATAMODEL_PM_FILE_MANAGEMENT = auto() DATAMODEL_MESHING_WORKFLOW = auto() - DATAMODEL_MESHING_WORKFLOW_X = auto() + # DATAMODEL_MESHING_WORKFLOW_X = auto() DATAMODEL_FLICING = auto() DATAMODEL_PREFERENCES = auto() DATAMODEL_SOLVER_WORKFLOW = auto() diff --git a/src/ansys/fluent/core/codegen/datamodelgen.py b/src/ansys/fluent/core/codegen/datamodelgen.py index f790a6e412e..a06088cd9a5 100644 --- a/src/ansys/fluent/core/codegen/datamodelgen.py +++ b/src/ansys/fluent/core/codegen/datamodelgen.py @@ -270,14 +270,14 @@ def __init__(self, version, static_infos: dict, verbose: bool = False): ("meshing",), self.version, ) - if StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X in static_infos: - print("Instantiate DataModelStaticInfo and insert") - self._static_info["meshing_workflow_x"] = DataModelStaticInfo( - StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X, - "meshing_workflow_x", - ("meshing",), - self.version, - ) + # if StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X in static_infos: + # print("Instantiate DataModelStaticInfo and insert") + # self._static_info["meshing_workflow_x"] = DataModelStaticInfo( + # StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X, + # "meshing_workflow_x", + # ("meshing",), + # self.version, + # ) if StaticInfoType.DATAMODEL_FLICING in static_infos: self._static_info["flicing"] = DataModelStaticInfo( StaticInfoType.DATAMODEL_FLICING, @@ -628,9 +628,9 @@ def generate(version, static_infos: dict, verbose: bool = False): StaticInfoType.DATAMODEL_MESHING_WORKFLOW: meshing._datamodel_service_se.get_static_info( "meshing_workflow" ), - StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X: meshing._datamodel_service_se.get_static_info( - "meshing_workflow_x" - ), + # StaticInfoType.DATAMODEL_MESHING_WORKFLOW_X: meshing._datamodel_service_se.get_static_info( + # "meshing_workflow_x" + # ), StaticInfoType.DATAMODEL_PREFERENCES: solver._datamodel_service_se.get_static_info( "preferences" ), diff --git a/src/ansys/fluent/core/session_base_meshing.py b/src/ansys/fluent/core/session_base_meshing.py index 4f779f9d62b..852b9a43721 100644 --- a/src/ansys/fluent/core/session_base_meshing.py +++ b/src/ansys/fluent/core/session_base_meshing.py @@ -78,7 +78,7 @@ def __init__( self._part_management = None self._pm_file_management = None self._meshing_workflow = None - self._meshing_workflow_x = None + # self._meshing_workflow_x = None self._preferences = None self._session_execute_tui = session_execute_tui self._product_version = None @@ -273,14 +273,14 @@ def meshing_workflow(self): self._meshing_workflow = _make_datamodel_module(self, "meshing_workflow") return self._meshing_workflow - @property - def meshing_workflow_x(self): - """Full API to meshing and meshing_workflow.""" - if self._meshing_workflow_x is None: - self._meshing_workflow_x = _make_datamodel_module( - self, "meshing_workflow_x" - ) - return self._meshing_workflow_x + # @property + # def meshing_workflow_x(self): + # """Full API to meshing and meshing_workflow.""" + # if self._meshing_workflow_x is None: + # self._meshing_workflow_x = _make_datamodel_module( + # self, "meshing_workflow_x" + # ) + # return self._meshing_workflow_x @property def preferences(self): diff --git a/src/ansys/fluent/core/session_meshing.py b/src/ansys/fluent/core/session_meshing.py index 7b41d240ed1..2d91ba953a4 100644 --- a/src/ansys/fluent/core/session_meshing.py +++ b/src/ansys/fluent/core/session_meshing.py @@ -142,10 +142,10 @@ def meshing_workflow(self): """Full API to meshing and meshing_workflow.""" return super(Meshing, self).meshing_workflow - @property - def meshing_workflow_x(self): - """Full API to dummy meshing and meshing_workflow.""" - return super(Meshing, self).meshing_workflow_x + # @property + # def meshing_workflow_x(self): + # """Full API to dummy meshing and meshing_workflow.""" + # return super(Meshing, self).meshing_workflow_x @property def preferences(self): diff --git a/src/ansys/fluent/core/session_pure_meshing.py b/src/ansys/fluent/core/session_pure_meshing.py index ca6bb2b6680..cb1d53638fd 100644 --- a/src/ansys/fluent/core/session_pure_meshing.py +++ b/src/ansys/fluent/core/session_pure_meshing.py @@ -198,10 +198,10 @@ def meshing_workflow(self): """Full API to meshing and meshing_workflow.""" return self._base_meshing.meshing_workflow - @property - def meshing_workflow_x(self): - """Full API to dummy meshing and meshing_workflow.""" - return self._base_meshing.meshing_workflow_x + # @property + # def meshing_workflow_x(self): + # """Full API to dummy meshing and meshing_workflow.""" + # return self._base_meshing.meshing_workflow_x @property def preferences(self): From 0f9eb0a8d03a813be928c5eb33dbe696cbc73eae Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:56:25 +0000 Subject: [PATCH 9/9] chore: adding changelog file 4063.added.md [dependabot-skip] --- doc/changelog.d/4063.added.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/4063.added.md diff --git a/doc/changelog.d/4063.added.md b/doc/changelog.d/4063.added.md new file mode 100644 index 00000000000..312d01d18c7 --- /dev/null +++ b/doc/changelog.d/4063.added.md @@ -0,0 +1 @@ +gen mwf api \ No newline at end of file