Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename file name and path #2131

Merged
merged 14 commits into from
Oct 17, 2023
Merged

Rename file name and path #2131

merged 14 commits into from
Oct 17, 2023

Conversation

hpohekar
Copy link
Collaborator

@hpohekar hpohekar commented Oct 12, 2023

  • Renamed filename and filepath to file_name

@hpohekar hpohekar linked an issue Oct 12, 2023 that may be closed by this pull request
@raph-luc
Copy link
Member

Should we add filename and filepath to .github/styles/Vocab/ANSYS/reject.txt so that we don't accidentally use them again in the future? (I certainly might slip and use them by mistake)

Vale will then flag occurrences as errors.

@hpohekar
Copy link
Collaborator Author

Should we add filename and filepath to .github/styles/Vocab/ANSYS/reject.txt so that we don't accidentally use them again in the future? (I certainly might slip and use them by mistake)

Vale will then flag occurrences as errors.

@raph-luc

I think it's responsibility of every developer to follow existing naming convention for naming of arguments in future. We should not try to add all such names in reject.txt.

Here is an example - filename from urllib.request.urlretrieve , which is default. We are using it and we can not add it in the reject list.

image

@raph-luc
Copy link
Member

@hpohekar That is a great point, thanks. Note that urlretrieve is marked for deprecation at some point in the future so we are going to need to change that particular code eventually, and alternatives such as requests don't use "filename".

Copy link
Member

@raph-luc raph-luc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few filenames that you might've missed (if you are already working on these, ignore me):

list
doc/settings_rstgen.py:15:    --- Use the filename of the child class to generate the hyperlink to that class.
doc/source/api/general/data_transfer.rst:26:  >>> mesh_filename = download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
doc/source/api/general/data_transfer.rst:28:  >>> pure_meshing_session.tui.file.read_mesh(import_filename)
doc/source/api/general/fielddata.rst:20:  >>> import_filename = examples.download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
doc/source/api/general/fielddata.rst:22:  >>> solver.file.read(file_type="case", file_name=import_filename)
doc/source/api/meshing/index.rst:60:        "FileName": import_filename,
doc/source/api/solver/settings.rst:241:  >>> import_filename = examples.download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
doc/source/api/solver/settings.rst:243:  >>> solver.file.read(file_type="case", file_name=import_filename)
doc/source/conf.py:90:# The suffix(es) of source filenames.
doc/source/conf.py:146:    "filename_pattern": r"\.py",
doc/source/examples/00-fluent/exhaust_system.py:51:import_filename = examples.download_file(
doc/source/examples/00-fluent/exhaust_system.py:82:    FilePath=import_filename, IgnoreSolidNames=False, PartPerBody=False
doc/source/examples/00-fluent/exhaust_system.py:102:        "FMDFileName": import_filename,
doc/source/examples/00-fluent/exhaust_system.rst:74:    import_filename = examples.download_file(
doc/source/examples/00-fluent/exhaust_system.rst:158:        FilePath=import_filename, IgnoreSolidNames=False, PartPerBody=False
doc/source/examples/00-fluent/exhaust_system.rst:178:            "FMDFileName": import_filename,
doc/source/examples/00-fluent/mixing_elbow.py:48:import_filename = examples.download_file("mixing_elbow.pmdb", "pyfluent/mixing_elbow")
doc/source/examples/00-fluent/mixing_elbow.py:78:    "FileName": import_filename,
doc/source/examples/00-fluent/mixing_elbow.rst:71:    import_filename = examples.download_file("mixing_elbow.pmdb", "pyfluent/mixing_elbow")
doc/source/examples/00-fluent/mixing_elbow.rst:154:        "FileName": import_filename,
doc/source/examples/00-fluent/mixing_elbow_settings_api.py:32:import_filename = examples.download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
doc/source/examples/00-fluent/mixing_elbow_settings_api.py:51:solver.file.read(file_type="case", file_name=import_filename)
doc/source/examples/00-fluent/mixing_elbow_settings_api.rst:55:    import_filename = examples.download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
doc/source/examples/00-fluent/mixing_elbow_settings_api.rst:114:    solver.file.read(file_type="case", file_name=import_filename)
doc/source/user_guide/meshing_workflows.rst:20:    import_filename = examples.download_file('mixing_elbow.pmdb', 'pyfluent/mixing_elbow')
doc/source/user_guide/meshing_workflows.rst:26:        'FileName': import_filename, 'LengthUnit': 'in'
doc/source/user_guide/meshing_workflows.rst:127:    import_filename = examples.download_file(
doc/source/user_guide/meshing_workflows.rst:133:        FilePath=import_filename, IgnoreSolidNames=False, PartPerBody=False
doc/source/user_guide/meshing_workflows.rst:150:            "FMDFileName": import_filename,
doc/source/user_guide/meshing_workflows.rst:583:    import_filename = examples.download_file("mixing_elbow.pmdb", "pyfluent/mixing_elbow")
examples/00-fluent/exhaust_system.py:51:import_filename = examples.download_file(
examples/00-fluent/exhaust_system.py:82:    FilePath=import_filename, IgnoreSolidNames=False, PartPerBody=False
examples/00-fluent/exhaust_system.py:102:        "FMDFileName": import_filename,
examples/00-fluent/mixing_elbow.py:48:import_filename = examples.download_file("mixing_elbow.pmdb", "pyfluent/mixing_elbow")
examples/00-fluent/mixing_elbow.py:78:    "FileName": import_filename,
examples/00-fluent/mixing_elbow_settings_api.py:32:import_filename = examples.download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
examples/00-fluent/mixing_elbow_settings_api.py:51:solver.file.read(file_type="case", file_name=import_filename)
src/ansys/fluent/core/examples/downloads.py:76:    urlretrieve(url, filename=local_path)
src/ansys/fluent/core/fluent_connection.py:416:        cleanup_filename = f"cleanup-fluent-{host}-{pid}.{cleanup_file_ext}"
src/ansys/fluent/core/fluent_connection.py:417:        logger.debug(f"Looking for {cleanup_filename}...")
src/ansys/fluent/core/fluent_connection.py:418:        cleanup_file_path = Path(pwd, cleanup_filename)
src/ansys/fluent/core/fluent_connection.py:457:        cleanup_filename = f"cleanup-fluent-{container_id}-{pid}.sh"
src/ansys/fluent/core/fluent_connection.py:458:        logger.debug(f"Executing Fluent container cleanup script: {cleanup_filename}")
src/ansys/fluent/core/fluent_connection.py:461:                container.exec_run(["bash", cleanup_filename], detach=True)
src/ansys/fluent/core/launcher/watchdog.py:161:            "filename"
src/ansys/fluent/core/logging.py:45:                                    'filename': 'pyfluent.log',
src/ansys/fluent/core/logging.py:98:    >>> config_dict['handlers']['pyfluent_file']['filename'] = 'test.log'
src/ansys/fluent/core/logging.py:117:    file_name = config["handlers"]["pyfluent_file"]["filename"]
src/ansys/fluent/core/scheduler/load_machines.py:251:def _construct_machine_list_uge(host_filename):
src/ansys/fluent/core/scheduler/load_machines.py:255:    with open(host_filename, "r") as peFile:
src/ansys/fluent/core/scheduler/load_machines.py:279:def _construct_machine_list_pbs(host_filename):
src/ansys/fluent/core/scheduler/load_machines.py:285:    with open(host_filename, "r") as pbsFile:
tests/parametric/test_parametric_workflow.py:18:    import_filename = examples.download_file(
tests/parametric/test_parametric_workflow.py:32:    solver_session.file.read_case(file_name=import_filename)
tests/parametric/test_parametric_workflow.py:146:    project_filename = Path(tmp_save_path) / "static_mixer_study.flprj"
tests/parametric/test_parametric_workflow.py:148:        write_project_filename = str(container_workdir / "static_mixer_study.flprj")
tests/parametric/test_parametric_workflow.py:150:        write_project_filename = str(project_filename)
tests/parametric/test_parametric_workflow.py:153:        project_filename=write_project_filename
tests/parametric/test_parametric_workflow.py:155:    assert project_filename.exists()
tests/parametric/test_parametric_workflow.py:165:    solver_session.file.parametric_project.open(project_filename=write_project_filename)
tests/parametric/test_parametric_workflow.py:176:        project_filename=write_project_save_as_name
tests/parametric/test_parametric_workflow.py:190:        project_filename=write_project_save_as_copy_name
tests/test_batch_ops.py:12:    case_filename = examples.download_file(
tests/test_batch_ops.py:16:        solver.file.read_case(file_name=case_filename)
tests/test_batch_ops.py:28:    case_filename = examples.download_file(
tests/test_batch_ops.py:33:            solver.file.read_case(file_name=case_filename)
tests/test_field_data.py:20:    import_filename = examples.download_file(
tests/test_field_data.py:23:    solver.file.read(file_type="case", file_name=import_filename)
tests/test_field_data.py:121:    import_filename = examples.download_file(
tests/test_field_data.py:132:    solver.file.read(file_type="case", file_name=import_filename)
tests/test_field_data.py:177:    import_filename = examples.download_file(
tests/test_field_data.py:185:    solver.file.read(file_type="case", file_name=import_filename)
tests/test_field_data.py:305:    import_filename = examples.download_file(
tests/test_field_data.py:321:    solver.file.read(file_type="case", file_name=import_filename)
tests/test_field_data.py:357:    import_filename = examples.download_file(
tests/test_field_data.py:360:    solver.file.read(file_type="case", file_name=import_filename)
tests/test_fluent_fixes.py:12:    import_filename = examples.download_file(
tests/test_fluent_fixes.py:16:    solver.file.read_case(file_name=import_filename)
tests/test_fluent_session.py:110:        cleanup_filename = (
tests/test_fluent_session.py:113:        print(f"cleanup_filename: {cleanup_filename}")
tests/test_fluent_session.py:114:        cmd_list.append(Path(cortex_pwd, cleanup_filename))
tests/test_meshing_queries.py:5:import_filename = examples.download_file(
tests/test_meshing_queries.py:13:    meshing_session.tui.file.read_case(import_filename)
tests/test_pure_mesh_vs_mesh_workflow.py:63:#     mesh_filename = download_file("mixing_elbow.msh.h5", "pyfluent/mixing_elbow")
tests/test_pure_mesh_vs_mesh_workflow.py:65:#     pure_meshing_session.tui.file.read_mesh(mesh_filename)
tests/test_pure_mesh_vs_mesh_workflow.py:84:    case_filename = download_file("mixing_elbow.cas.h5", "pyfluent/mixing_elbow")
tests/test_pure_mesh_vs_mesh_workflow.py:86:    pure_meshing_session.tui.file.read_case(case_filename)
tests/test_session.py:309:    import_filename = examples.download_file(
tests/test_session.py:313:        case_filepath=import_filename, lightweight_mode=True
tests/test_svars.py:14:    import_filename = examples.download_file(
tests/test_svars.py:17:    solver.file.read(file_type="case", file_name=import_filename)
tests/test_svars.py:122:    import_filename = examples.download_file(
tests/test_svars.py:125:    solver.file.read(file_type="case", file_name=import_filename)
tests/util/fixture_fluent.py:22:    file_name = f'_{full_file_name.split(".")[0]}_{file_type}_filename'
tests/util/fixture_fluent.py:32:        dat_name = f'_{data_file_name.split(".")[0]}_{dat_file_type}_filename'

@hpohekar
Copy link
Collaborator Author

A few filenames that you might've missed (if you are already working on these, ignore me):

list

We are not going to change FilePath, it's default from Fluent.

@raph-luc
Copy link
Member

A few filepaths you might've missed:

filepath
codegen/tuigen.py:44:def _get_tui_filepath(mode: str, version: str, pyfluent_path: str):
codegen/tuigen.py:172:        self._tui_file = _get_tui_filepath(mode, version, pyfluent_path)
doc/source/api/general/case_reader.rst:20:  >>> case_filepath = examples.download_file("Static_Mixer_Parameters.cas.h5", "pyfluent/static_mixer")
doc/source/api/general/case_reader.rst:21:  >>> reader = CaseFile(case_filepath=case_filepath)
doc/source/api/general/case_reader.rst:43:    >>> reader = CaseFile(project_filepath="Dir1/Dir2/project.flprj")
doc/source/api/general/case_reader.rst:63:      >>> case_filepath = examples.download_file("elbow1.cas.h5", "pyfluent/file_session")
doc/source/api/general/case_reader.rst:64:      >>> reader = CaseFile(case_filepath=case_filepath)
doc/source/api/general/data_reader.rst:23:  >>> data_filepath = examples.download_file("elbow1.dat.h5", "pyfluent/file_session")
doc/source/api/general/data_reader.rst:24:  >>> reader = DataFile(data_filepath=data_filepath, case_file_handle=CaseFile(case_filepath))
doc/source/api/general/file_session.rst:27:  >>> case_filepath = examples.download_file("elbow1.cas.h5", "pyfluent/file_session")
doc/source/api/general/file_session.rst:28:  >>> data_filepath = examples.download_file("elbow1.dat.h5", "pyfluent/file_session")
doc/source/api/general/file_session.rst:30:  >>> file_session.read_case(case_filepath)
doc/source/api/general/file_session.rst:31:  >>> file_session.read_data(data_filepath)
doc/source/api/general/file_session.rst:109:  >>> case_filepath = examples.download_file("mixing_elbow_mul_ph.cas.h5", "pyfluent/file_session")
doc/source/api/general/file_session.rst:110:  >>> data_filepath = examples.download_file("mixing_elbow_mul_ph.dat.h5", "pyfluent/file_session")
doc/source/api/general/file_session.rst:112:  >>> file_session.read_case(case_filepath)
doc/source/api/general/file_session.rst:113:  >>> file_session.read_data(data_filepath)
doc/source/user_guide/launching_ansys_fluent.rst:16:server in Fluent can be started using the ``-sifile=<server_info_filepath>`` command line
doc/source/user_guide/launching_ansys_fluent.rst:25:    solver = pyfluent.connect_to_fluent(server_info_filepath="server.txt")
src/ansys/fluent/core/filereader/case_file.py:11:    >>> case_filepath = examples.download_file("Static_Mixer_Parameters.cas.h5", "pyfluent/static_mixer", return_only_file_name=False)
src/ansys/fluent/core/filereader/case_file.py:13:    >>> reader = CaseFile(case_filepath=case_filepath) # Instantiate a CaseFile class
src/ansys/fluent/core/filereader/case_file.py:488:    def __init__(self, settings_filepath: Optional[str] = None) -> None:
src/ansys/fluent/core/filereader/case_file.py:494:        settings_filepath : Optional[str]
src/ansys/fluent/core/filereader/case_file.py:497:        if settings_filepath:
src/ansys/fluent/core/filereader/case_file.py:499:                with open(settings_filepath, "r") as file:
src/ansys/fluent/core/filereader/case_file.py:506:                    f"The settings file {settings_filepath} cannot be found."
src/ansys/fluent/core/filereader/case_file.py:511:                    f"Error while reading settings file {settings_filepath}"
src/ansys/fluent/core/filereader/case_file.py:516:                    f"Could not read settings file {settings_filepath}"
src/ansys/fluent/core/filereader/case_file.py:533:        case_filepath: Optional[str] = None,
src/ansys/fluent/core/filereader/case_file.py:534:        project_filepath: Optional[str] = None,
src/ansys/fluent/core/filereader/case_file.py:541:        case_filepath : Optional[str]
src/ansys/fluent/core/filereader/case_file.py:543:        project_filepath : Optional[str]
src/ansys/fluent/core/filereader/case_file.py:547:        if (not case_filepath) == (not project_filepath):
src/ansys/fluent/core/filereader/case_file.py:551:        if project_filepath:
src/ansys/fluent/core/filereader/case_file.py:552:            if Path(project_filepath).suffix in [".flprj", ".flprz"]:
src/ansys/fluent/core/filereader/case_file.py:554:                    dirname(project_filepath),
src/ansys/fluent/core/filereader/case_file.py:555:                    Path(project_filepath).name.split(".")[0] + ".cffdb",
src/ansys/fluent/core/filereader/case_file.py:557:                case_filepath = Path(
src/ansys/fluent/core/filereader/case_file.py:558:                    project_dir + _get_case_filepath_from_flprj(project_filepath)
src/ansys/fluent/core/filereader/case_file.py:566:            if Path(case_filepath).match("*.cas.h5"):
src/ansys/fluent/core/filereader/case_file.py:567:                _file = h5py.File(case_filepath)
src/ansys/fluent/core/filereader/case_file.py:571:            elif Path(case_filepath).match("*.cas"):
src/ansys/fluent/core/filereader/case_file.py:572:                with open(case_filepath, "rb") as _file:
src/ansys/fluent/core/filereader/case_file.py:575:            elif Path(case_filepath).match("*.cas.gz"):
src/ansys/fluent/core/filereader/case_file.py:576:                with gzip.open(case_filepath, "rb") as _file:
src/ansys/fluent/core/filereader/case_file.py:588:                f"The case file {case_filepath} cannot be found."
src/ansys/fluent/core/filereader/case_file.py:592:            raise OSError(f"Error while reading case file {case_filepath}") from e
src/ansys/fluent/core/filereader/case_file.py:595:            raise RuntimeError(f"Could not read case file {case_filepath}") from e
src/ansys/fluent/core/filereader/case_file.py:623:def _get_case_filepath_from_flprj(flprj_file):
src/ansys/fluent/core/filereader/data_file.py:11:    >>> data_filepath = examples.download_file("elbow1.dat.h5", "pyfluent/file_session", return_only_file_name=False)
src/ansys/fluent/core/filereader/data_file.py:13:    >>> reader = DataFile(data_filepath=data_filepath) # Instantiate a DataFile class
src/ansys/fluent/core/filereader/data_file.py:49:        data_filepath: Optional[str] = None,
src/ansys/fluent/core/filereader/data_file.py:50:        project_filepath: Optional[str] = None,
src/ansys/fluent/core/filereader/data_file.py:55:        if data_filepath and project_filepath:
src/ansys/fluent/core/filereader/data_file.py:59:        if project_filepath:
src/ansys/fluent/core/filereader/data_file.py:60:            if Path(project_filepath).suffix in [".flprj", ".flprz"]:
src/ansys/fluent/core/filereader/data_file.py:62:                    dirname(project_filepath),
src/ansys/fluent/core/filereader/data_file.py:63:                    Path(project_filepath).name.split(".")[0] + ".cffdb",
src/ansys/fluent/core/filereader/data_file.py:65:                data_filepath = Path(
src/ansys/fluent/core/filereader/data_file.py:66:                    project_dir + _get_data_filepath_from_flprj(project_filepath)
src/ansys/fluent/core/filereader/data_file.py:74:            if Path(data_filepath).match("*.dat.h5"):
src/ansys/fluent/core/filereader/data_file.py:75:                _file = h5py.File(data_filepath)
src/ansys/fluent/core/filereader/data_file.py:90:                f"The data file {data_filepath} cannot be found."
src/ansys/fluent/core/filereader/data_file.py:94:            raise OSError(f"Error while reading data file {data_filepath}") from e
src/ansys/fluent/core/filereader/data_file.py:97:            raise RuntimeError(f"Could not read data file {data_filepath}") from e
src/ansys/fluent/core/filereader/data_file.py:199:def _get_data_filepath_from_flprj(flprj_file):
src/ansys/fluent/core/file_session.py:720:    def read_case(self, case_filepath):
src/ansys/fluent/core/file_session.py:722:        self._case_file = CaseFile(case_filepath)
src/ansys/fluent/core/file_session.py:724:    def read_data(self, data_filepath):
src/ansys/fluent/core/file_session.py:726:        self._data_file = DataFile(data_filepath, case_file_handle=self._case_file)
src/ansys/fluent/core/meshing/watertight.py:8:def watertight_workflow(geometry_filepath, **launch_args) -> MeshingWorkflow:
src/ansys/fluent/core/meshing/watertight.py:13:    geometry_filepath : str
src/ansys/fluent/core/meshing/watertight.py:39:    if geometry_filepath:
src/ansys/fluent/core/meshing/watertight.py:42:        # import_geometry.arguments.FileName = geometry_filepath
src/ansys/fluent/core/meshing/watertight.py:43:        # or import_geometry.FileName = geometry_filepath
src/ansys/fluent/core/meshing/watertight.py:44:        import_geometry.arguments.update_dict(dict(FileName=geometry_filepath))
src/ansys/fluent/core/session_solver.py:226:            launcher_args["case_filepath"] = file_name
src/ansys/fluent/core/solver/settings_232/export_design_table.py:15:from .filepath import filepath as filepath_cls
src/ansys/fluent/core/solver/settings_232/export_design_table.py:22:        filepath : str
src/ansys/fluent/core/solver/settings_232/export_design_table.py:23:            'filepath' child.
src/ansys/fluent/core/solver/settings_232/export_design_table.py:30:        ['filepath']
src/ansys/fluent/core/solver/settings_232/export_design_table.py:32:    filepath: filepath_cls = filepath_cls
src/ansys/fluent/core/solver/settings_232/export_design_table.py:34:    filepath argument of export_design_table.
src/ansys/fluent/core/solver/settings_232/filepath.py:15:class filepath(String):
src/ansys/fluent/core/solver/settings_232/filepath.py:17:    'filepath' child.
src/ansys/fluent/core/solver/settings_232/filepath.py:20:    fluent_name = "filepath"
src/ansys/fluent/core/solver/settings_232/import_design_table.py:15:from .filepath import filepath as filepath_cls
src/ansys/fluent/core/solver/settings_232/import_design_table.py:23:        filepath : str
src/ansys/fluent/core/solver/settings_232/import_design_table.py:24:            'filepath' child.
src/ansys/fluent/core/solver/settings_232/import_design_table.py:33:        ['filepath', 'delete_existing']
src/ansys/fluent/core/solver/settings_232/import_design_table.py:35:    filepath: filepath_cls = filepath_cls
src/ansys/fluent/core/solver/settings_232/import_design_table.py:37:    filepath argument of import_design_table.
src/ansys_fluent_core.egg-info/SOURCES.txt:1337:src/ansys/fluent/core/solver/settings_232/filepath.py
tests/parametric/test_parametric_workflow.py:128:    solver_session.parametric_studies.export_design_table(filepath=write_design_table)
tests/test_casereader.py:19:    case_filepath: Optional[str] = None,
tests/test_casereader.py:20:    project_filepath: Optional[str] = None,
tests/test_casereader.py:23:    reader = CaseReader(case_filepath=case_filepath, project_filepath=project_filepath)
tests/test_casereader.py:37:    case_filepath: Optional[str] = None, project_filepath: Optional[str] = None
tests/test_casereader.py:40:        case_filepath=case_filepath,
tests/test_casereader.py:41:        project_filepath=project_filepath,
tests/test_casereader.py:69:    call_casereader_static_mixer(case_filepath=static_mixer_file())
tests/test_casereader.py:74:        case_filepath=examples.download_file(
tests/test_casereader.py:84:        case_filepath=examples.download_file(
tests/test_casereader.py:94:        case_filepath=examples.download_file(
tests/test_casereader.py:104:        case_filepath=examples.download_file(
tests/test_casereader.py:118:    case_filepath = examples.download_file(
tests/test_casereader.py:123:    prj_dir = join(dirname(case_filepath), case_file_dir)
tests/test_casereader.py:126:        shutil.copy2(case_filepath, prj_dir)
tests/test_casereader.py:128:        case_filepath_2 = examples.download_file(
tests/test_casereader.py:133:        shutil.copy2(case_filepath_2, prj_dir)
tests/test_casereader.py:136:    prj_filepath = examples.download_file(
tests/test_casereader.py:139:    prj_file_dir = join(dirname(prj_filepath), prj_file_dir)
tests/test_casereader.py:140:    shutil.copy2(prj_filepath, prj_file_dir)
tests/test_casereader.py:160:            case_filepath="case_file.cas.h5", project_filepath="project.flprj"
tests/test_casereader.py:166:        call_casereader(project_filepath="project.flprx")
tests/test_casereader.py:171:        case_filepath=examples.download_file(
tests/test_casereader.py:195:    reader = CaseReader(case_filepath=static_mixer_file())
tests/test_datareader.py:16:        data_filepath=data_file_name,
tests/test_datareader.py:17:        case_file_handle=CaseFile(case_filepath=case_file_name),
tests/test_datareader.py:65:        data_filepath=data_file_name,
tests/test_datareader.py:66:        case_file_handle=CaseFile(case_filepath=case_file_name),
tests/test_meshing_workflow.py:615:        geometry_filepath=mixing_elbow_geometry, session=new_mesh_session
tests/test_meshing_workflow.py:633:        geometry_filepath=mixing_elbow_geometry, session=new_mesh_session
tests/test_meshing_workflow.py:668:        geometry_filepath=mixing_elbow_geometry, session=new_mesh_session
tests/test_rp_vars.py:47:    case = CaseReader(case_filepath=path(case_path))
tests/test_settings_reader.py:10:    settings_filepath: Optional[str] = None, expected: Optional[dict] = None
tests/test_settings_reader.py:12:    reader = SettingsReader(settings_filepath=settings_filepath)
tests/test_settings_reader.py:26:    settings_filepath: Optional[str] = None,
tests/test_settings_reader.py:29:        settings_filepath=settings_filepath,
tests/test_settings_reader.py:57:    call_settings_reader_static_mixer(settings_filepath=static_mixer_settings_file())
tests/test_settings_reader.py:61:    reader = SettingsReader(settings_filepath=static_mixer_settings_file())
tests/test_settings_reader.py:68:    reader = SettingsReader(settings_filepath=static_mixer_settings_file())

Note that these lists I am sharing are based on the latest version of this branch, and I haven't worked through all these items, there will be false positives or things that we shouldn't change, and I probably missed a few instances as well.

Just trying to help you catch all of them (there are a lot). Feel free to ignore these if you're already aware of them or have a better way of finding them.

@hpohekar
Copy link
Collaborator Author

A few filepaths you might've missed:

filepath
Note that these lists I am sharing are based on the latest version of this branch, and I haven't worked through all these items, there will be false positives or things that we shouldn't change, and I probably missed a few instances as well.

Just trying to help you catch all of them (there are a lot). Feel free to ignore these if you're already aware of them or have a better way of finding them.

I'm waiting to pass all tests first, then we will fix remaining from rsts. Thank you very much for your help.

@hpohekar
Copy link
Collaborator Author

This PR is ready.

@hpohekar hpohekar enabled auto-merge (squash) October 13, 2023 07:10
@hpohekar hpohekar disabled auto-merge October 13, 2023 12:00
@hpohekar hpohekar mentioned this pull request Oct 13, 2023
11 tasks
@raph-luc raph-luc mentioned this pull request Oct 13, 2023
@seanpearsonuk
Copy link
Collaborator

@hpohekar, I have added @tejalprabhu01 as a reviewer because of the case_file changes.

Copy link
Member

@raph-luc raph-luc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed an issue that doesn't show up in the tests as it is occurring in the detached watchdog process - see above

Edit: going to see if I can add a test to catch watchdog errors like this (will be a separate PR)

Copy link
Collaborator

@tejalprabhu01 tejalprabhu01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes will be consumed by optiSLang for 24R2. Thanks for updating us about the changes!

@hpohekar hpohekar merged commit d7458ee into main Oct 17, 2023
@hpohekar hpohekar deleted the fix/rename_file_name branch October 17, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Various naming of file_name arguments
6 participants