From 9d536d294a7a5c7303f4bba2d6826c3c46b89149 Mon Sep 17 00:00:00 2001 From: jake Date: Wed, 11 Oct 2023 21:05:16 +0900 Subject: [PATCH] Issue #336, application names have been changed to BaramFlow and BaramMesh --- {baram => baramFlow}/__init__.py | 0 {baram => baramFlow}/app.py | 2 +- {baram => baramFlow}/app_plug_in.py | 6 +- {baram => baramFlow}/app_properties.py | 0 {baram => baramFlow}/coredb/__init__.py | 0 {baram => baramFlow}/coredb/app_settings.py | 36 ++++++----- {baram => baramFlow}/coredb/boundary_db.py | 4 +- {baram => baramFlow}/coredb/cell_zone_db.py | 4 +- {baram => baramFlow}/coredb/coredb.py | 2 +- {baram => baramFlow}/coredb/coredb_writer.py | 2 +- {baram => baramFlow}/coredb/filedb.py | 2 +- {baram => baramFlow}/coredb/general_db.py | 2 +- .../coredb/initialization_db.py | 2 +- {baram => baramFlow}/coredb/material_db.py | 2 +- {baram => baramFlow}/coredb/migrate.py | 0 {baram => baramFlow}/coredb/models_db.py | 2 +- {baram => baramFlow}/coredb/monitor_db.py | 8 +-- {baram => baramFlow}/coredb/numerical_db.py | 0 {baram => baramFlow}/coredb/project.py | 2 +- .../coredb/project_settings.py | 2 +- .../coredb/reference_values_db.py | 0 {baram => baramFlow}/coredb/region_db.py | 8 +-- .../coredb/run_calculation_db.py | 0 {baram => baramFlow}/libbaram/__init__.py | 0 {baram => baramFlow}/libbaram/db/__init__.py | 0 {baram => baramFlow}/libbaram/db/schema.py | 0 {baram => baramFlow}/libbaram/db/simple_db.py | 0 {baram => baramFlow}/main.py | 18 +++--- {baram => baramFlow}/mesh/__init__.py | 0 {baram => baramFlow}/mesh/mesh_manager.py | 8 +-- {baram => baramFlow}/mesh/mesh_model.py | 4 +- {baram => baramFlow}/mesh/vtk_loader.py | 0 {baram => baramFlow}/misc/baramd.c | 0 {baram => baramFlow}/misc/test_child.c | 0 {baram => baramFlow}/openfoam/__init__.py | 0 .../openfoam/boundary_conditions/__init__.py | 0 .../openfoam/boundary_conditions/alpha.py | 10 +-- .../openfoam/boundary_conditions/alphat.py | 6 +- .../boundary_conditions/boundary_condition.py | 12 ++-- .../openfoam/boundary_conditions/epsilon.py | 6 +- .../openfoam/boundary_conditions/k.py | 6 +- .../openfoam/boundary_conditions/nuTilda.py | 6 +- .../openfoam/boundary_conditions/nut.py | 6 +- .../openfoam/boundary_conditions/omega.py | 6 +- .../openfoam/boundary_conditions/p.py | 20 +++--- .../openfoam/boundary_conditions/t.py | 14 ++--- .../openfoam/boundary_conditions/u.py | 12 ++-- .../openfoam/case_generator.py | 58 +++++++++--------- .../openfoam/constant/MRF_properties.py | 8 +-- .../openfoam/constant/__init__.py | 0 .../openfoam/constant/boundary_data.py | 2 +- .../openfoam/constant/dynamic_mesh_dict.py | 6 +- {baram => baramFlow}/openfoam/constant/g.py | 6 +- .../openfoam/constant/operating_conditions.py | 6 +- .../openfoam/constant/region_properties.py | 10 +-- .../constant/thermophysical_properties.py | 4 +- .../openfoam/constant/transport_properties.py | 12 ++-- .../constant/turbulence_properties.py | 6 +- {baram => baramFlow}/openfoam/file_system.py | 2 +- {baram => baramFlow}/openfoam/parallel.py | 8 +-- .../openfoam/polymesh/__init__.py | 0 .../openfoam/polymesh/boundary.py | 6 +- .../openfoam/polymesh/polymesh_loader.py | 14 ++--- {baram => baramFlow}/openfoam/porous.py | 4 +- .../openfoam/post_processing/__init__.py | 0 .../openfoam/post_processing/monitor.py | 18 +++--- .../post_processing/post_file_reader.py | 2 +- .../openfoam/redistribution_task.py | 8 +-- {baram => baramFlow}/openfoam/solver.py | 2 +- .../openfoam/solver_info_manager.py | 2 +- .../openfoam/system/__init__.py | 0 .../openfoam/system/control_dict.py | 30 ++++----- .../openfoam/system/fv_options.py | 10 +-- .../openfoam/system/fv_schemes.py | 10 +-- .../openfoam/system/fv_solution.py | 18 +++--- .../openfoam/system/set_fields_dict.py | 8 +-- {baram => baramFlow}/test/__init__.py | 0 .../test/test_coredb/__init__.py | 0 .../test/test_coredb/coredb_xml/v1.xml | 0 .../test/test_coredb/coredb_xml/v1a.xml | 0 .../test/test_coredb/test_attribute.py | 2 +- .../test_coredb/test_boundary_condition.py | 2 +- .../test/test_coredb/test_cell_zones.py | 2 +- .../test/test_coredb/test_config_count.py | 2 +- .../test/test_coredb/test_context_manager.py | 2 +- .../test_coredb/test_enumeration_string.py | 2 +- .../test_input_number_list_type.py | 2 +- ...test_input_number_type_with_restriction.py | 2 +- ...t_input_number_type_without_restriction.py | 2 +- .../test/test_coredb/test_material.py | 2 +- .../test/test_coredb/test_material_db.py | 4 +- .../test/test_coredb/test_migration.py | 4 +- .../test/test_coredb/test_monitors.py | 2 +- .../test_coredb/test_non_negative_integer.py | 2 +- .../test/test_coredb/test_positve_integer.py | 2 +- .../test/test_openfoam/__init__.py | 0 .../test/test_openfoam/test_MRF_properties.py | 4 +- .../test/test_openfoam/test_alpha.py | 8 +-- .../test/test_openfoam/test_alphat.py | 10 +-- .../test/test_openfoam/test_control_dict.py | 8 +-- .../test_openfoam/test_decomposePar_dict.py | 2 +- .../test_openfoam/test_dynamic_mesh_dict.py | 4 +- .../test/test_openfoam/test_epsilon.py | 12 ++-- .../test/test_openfoam/test_fv_options.py | 4 +- .../test/test_openfoam/test_fv_schemes.py | 4 +- .../test/test_openfoam/test_fv_solution.py | 14 ++--- .../test/test_openfoam/test_g.py | 6 +- .../test/test_openfoam/test_k.py | 10 +-- .../test/test_openfoam/test_nuTilda.py | 12 ++-- .../test/test_openfoam/test_nut.py | 12 ++-- .../test/test_openfoam/test_omega.py | 12 ++-- .../test_operating_conditions.py | 4 +- .../test/test_openfoam/test_p.py | 18 +++--- .../test/test_openfoam/test_p_caculated.py | 10 +-- .../test/test_openfoam/test_p_rgh.py | 16 ++--- .../test/test_openfoam/test_solver.py | 10 +-- .../test_openfoam/test_solver_info_manager.py | 2 +- .../test/test_openfoam/test_t.py | 18 +++--- .../test_thermophysical_properties.py | 4 +- .../test_transport_properties.py | 4 +- .../test_turbulence_properties.py | 6 +- .../test/test_openfoam/test_u.py | 14 ++--- {baram => baramFlow}/view/__init__.py | 0 .../view/case_wizard/__init__.py | 0 .../view/case_wizard/case_wizard.py | 4 +- .../view/case_wizard/case_wizard.ui | 0 .../view/case_wizard/energy_model_page.py | 0 .../view/case_wizard/energy_model_page.ui | 0 .../view/case_wizard/flow_type_page.py | 0 .../view/case_wizard/flow_type_page.ui | 0 .../view/case_wizard/gravity_model_page.py | 0 .../view/case_wizard/gravity_model_page.ui | 0 .../view/case_wizard/multiphase_model_page.py | 4 +- .../view/case_wizard/multiphase_model_page.ui | 0 .../view/case_wizard/solver_type_page.py | 0 .../view/case_wizard/solver_type_page.ui | 0 .../view/case_wizard/species_model_page.py | 0 .../view/case_wizard/species_model_page.ui | 0 .../view/case_wizard/workspace_page.py | 2 +- .../view/case_wizard/workspace_page.ui | 0 .../view/main_window/__init__.py | 0 .../view/main_window/chart_dock.py | 12 ++-- .../view/main_window/console_dock.py | 4 +- .../view/main_window/content_view.py | 2 +- .../view/main_window/empty_page.py | 0 .../view/main_window/main_window.py | 50 +++++++-------- .../view/main_window/main_window.ui | 2 +- .../view/main_window/menu/__init__.py | 0 .../view/main_window/menu/help/__init__.py | 0 .../main_window/menu/help/about_dialog.py | 2 +- .../main_window/menu/help/about_dialog.ui | 0 .../main_window/menu/help/license_dialog.py | 0 .../main_window/menu/help/license_dialog.ui | 0 .../view/main_window/menu/mesh/__init__.py | 0 .../menu/mesh/mesh_rotate_dialog.py | 0 .../menu/mesh/mesh_rotate_dialog.ui | 0 .../menu/mesh/mesh_scale_dialog.py | 0 .../menu/mesh/mesh_scale_dialog.ui | 0 .../menu/mesh/mesh_translate_dialog.py | 0 .../menu/mesh/mesh_translate_dialog.ui | 0 .../main_window/menu/settrings/__init__.py | 0 .../settrings/settings_language_dialog.py | 4 +- .../settrings/settings_language_dialog.ui | 0 .../settrings/settings_paraveiw_dialog.py | 2 +- .../settrings/settings_paraview_dialog.ui | 0 .../menu/settrings/settings_scaling_dialog.py | 2 +- .../menu/settrings/settings_scaling_dialog.ui | 0 .../view/main_window/monitor_dock.py | 10 +-- .../view/main_window/navigator_view.py | 4 +- .../view/main_window/rendering_dock.py | 0 .../view/main_window/rendering_view.py | 4 +- .../view/main_window/rendering_view.ui | 0 .../view/main_window/start_window.py | 8 +-- .../view/main_window/start_window.ui | 0 .../view/main_window/tabified_dock.py | 0 {baram => baramFlow}/view/setup/__init__.py | 0 .../boundary_conditions/ABL_inlet_dialog.py | 6 +- .../boundary_conditions/ABL_inlet_dialog.ui | 0 .../setup/boundary_conditions/__init__.py | 0 .../boundary_conditions_page.py | 10 +-- .../boundary_conditions_page.ui | 0 .../boundary_type_picker.py | 10 +-- .../boundary_type_picker.ui | 0 .../boundary_conditions/boundary_widget.py | 4 +- .../boundary_conditions/boundary_widget.ui | 0 .../conditional_widget_helper.py | 4 +- .../coupled_boundary_condition_dialog.py | 6 +- .../boundary_conditions/cyclic_dialog.py | 8 +-- .../boundary_conditions/cyclic_dialog.ui | 0 .../setup/boundary_conditions/fan_dialog.py | 12 ++-- .../setup/boundary_conditions/fan_dialog.ui | 0 .../farfield_riemann_dialog.py | 8 +-- .../farfield_riemann_dialog.ui | 0 .../flow_rate_inlet_dialog.py | 12 ++-- .../flow_rate_inlet_dialog.ui | 0 .../boundary_conditions/free_stream_dialog.py | 8 +-- .../boundary_conditions/free_stream_dialog.ui | 0 .../boundary_conditions/interface_dialog.py | 14 ++--- .../boundary_conditions/interface_dialog.ui | 0 .../open_channel_inlet_dialog.py | 8 +-- .../open_channel_inlet_dialog.ui | 0 .../open_channel_outlet_dialog.py | 8 +-- .../open_channel_outlet_dialog.ui | 0 .../boundary_conditions/porous_jump_dialog.py | 8 +-- .../boundary_conditions/porous_jump_dialog.ui | 0 .../pressure_inlet_dialog.py | 8 +-- .../pressure_inlet_dialog.ui | 0 .../pressure_outlet_dialog.py | 10 +-- .../pressure_outlet_dialog.ui | 0 .../boundary_conditions/region_widget.py | 4 +- .../boundary_conditions/region_widget.ui | 0 .../subsonic_inflow_dialog.py | 8 +-- .../subsonic_inflow_dialog.ui | 0 .../subsonic_outflow_dialog.py | 6 +- .../subsonic_outflow_dialog.ui | 0 .../supersonic_inflow_dialog.py | 8 +-- .../supersonic_inflow_dialog.ui | 0 .../boundary_conditions/temperature_widget.py | 12 ++-- .../boundary_conditions/temperature_widget.ui | 0 .../thermo_coupled_wall_dialog.py | 8 +-- .../thermo_coupled_wall_dialog.ui | 0 .../turbulence_k_epsilon_widget.py | 4 +- .../turbulence_k_epsilon_widget.ui | 0 .../turbulence_k_omega_widget.py | 4 +- .../turbulence_k_omega_widget.ui | 0 .../turbulence_spalart_allmaras_widget.py | 4 +- .../turbulence_spalart_allmaras_widget.ui | 0 .../velocity_inlet_dialog.py | 14 ++--- .../velocity_inlet_dialog.ui | 0 .../setup/boundary_conditions/wall_dialog.py | 18 +++--- .../setup/boundary_conditions/wall_dialog.ui | 0 .../setup/cell_zone_conditions/MRF_widget.py | 6 +- .../setup/cell_zone_conditions/MRF_widget.ui | 0 .../setup/cell_zone_conditions/__init__.py | 0 .../actuator_disk_widget.py | 2 +- .../actuator_disk_widget.ui | 0 .../cell_zone_condition_dialog.py | 14 ++--- .../cell_zone_condition_dialog.ui | 0 .../cell_zone_conditions_page.py | 8 +-- .../cell_zone_conditions_page.ui | 0 .../cell_zone_conditions/cell_zone_widget.py | 4 +- .../cell_zone_conditions/cell_zone_widget.ui | 0 .../constant_source_widget.py | 4 +- .../constant_source_widget.ui | 0 .../fixed_value_widget.py | 2 +- .../fixed_value_widget.ui | 0 .../material_selector_dialog.py | 4 +- .../materials_selector_dialog.ui | 0 .../cell_zone_conditions/materials_widget.py | 6 +- .../cell_zone_conditions/materials_widget.ui | 0 .../operating_conditions_dialog.py | 6 +- .../operating_conditions_dialog.ui | 0 .../porous_zone_widget.py | 4 +- .../porous_zone_widget.ui | 0 .../sliding_mesh_widget.py | 2 +- .../sliding_mesh_widget.ui | 0 .../variable_source_widget.py | 6 +- .../variable_source_widget.ui | 0 .../view/setup/general/__init__.py | 0 .../view/setup/general/general_page.py | 8 +-- .../view/setup/general/general_page.ui | 0 .../view/setup/materials/__init__.py | 0 .../view/setup/materials/material_card.py | 6 +- .../view/setup/materials/material_card.ui | 0 .../view/setup/materials/material_dialog.py | 14 ++--- .../view/setup/materials/material_dialog.ui | 0 .../view/setup/materials/material_page.py | 14 ++--- .../view/setup/materials/material_page.ui | 0 .../view/setup/models/__init__.py | 0 .../view/setup/models/energy_dialog.py | 6 +- .../view/setup/models/energy_dialog.ui | 0 .../view/setup/models/models_page.py | 6 +- .../view/setup/models/models_page.ui | 0 .../view/setup/models/multiphase_dialog.py | 8 +-- .../view/setup/models/multiphase_dialog.ui | 0 .../view/setup/models/radiation_dialog.py | 2 +- .../view/setup/models/radiation_dialog.ui | 0 .../view/setup/models/turbulence_dialog.py | 8 +-- .../view/setup/models/turbulence_dialog.ui | 0 .../view/setup/reference_values/__init__.py | 0 .../reference_values/reference_values_page.py | 8 +-- .../reference_values/reference_values_page.ui | 0 .../view/solution/__init__.py | 0 .../view/solution/initialization/__init__.py | 0 .../initialization/initialization_page.py | 16 ++--- .../initialization/initialization_page.ui | 0 .../initialization/initialization_widget.py | 12 ++-- .../initialization/initialization_widget.ui | 0 .../solution/initialization/option_dialog.py | 2 +- .../solution/initialization/option_dialog.ui | 0 .../solution/initialization/section_dialog.py | 8 +-- .../solution/initialization/section_dialog.ui | 0 .../view/solution/monitors/__init__.py | 0 .../view/solution/monitors/force_dialog.py | 8 +-- .../view/solution/monitors/force_dialog.ui | 0 .../view/solution/monitors/forces_widget.py | 2 +- .../view/solution/monitors/monitor_widget.py | 8 +-- .../view/solution/monitors/monitor_widget.ui | 0 .../view/solution/monitors/monitors_page.py | 4 +- .../view/solution/monitors/monitors_page.ui | 0 .../view/solution/monitors/monitors_widget.py | 0 .../view/solution/monitors/monitors_widget.ui | 0 .../view/solution/monitors/point_dialog.py | 10 +-- .../view/solution/monitors/point_dialog.ui | 0 .../view/solution/monitors/points_widget.py | 2 +- .../monitors/region_objects_selector.py | 4 +- .../monitors/region_objects_selector.ui | 0 .../view/solution/monitors/surface_dialog.py | 10 +-- .../view/solution/monitors/surface_dialog.ui | 0 .../view/solution/monitors/surfaces_widget.py | 2 +- .../view/solution/monitors/volume_dialog.py | 10 +-- .../view/solution/monitors/volume_dialog.ui | 0 .../view/solution/monitors/volumes_widget.py | 2 +- .../solution/numerical_conditions/__init__.py | 0 .../numerical_conditions/advanced_dialog.py | 6 +- .../numerical_conditions/advanced_dialog.ui | 0 .../numerical_conditions_page.py | 14 ++--- .../numerical_conditions_page.ui | 0 .../view/solution/run/__init__.py | 0 .../view/solution/run/job_information_page.py | 8 +-- .../view/solution/run/job_information_page.ui | 0 .../solution/run/process_information_page.py | 22 +++---- .../solution/run/process_information_page.ui | 0 .../view/solution/run_conditions/__init__.py | 0 .../run_conditions/edit_hostfile_dialog.py | 2 +- .../run_conditions/edit_hostfile_dialog.ui | 0 .../run_conditions/run_conditions_page.py | 12 ++-- .../run_conditions/run_conditions_page.ui | 0 {baram => baramFlow}/view/widgets/__init__.py | 0 .../view/widgets/chart_wigdet.py | 6 +- .../view/widgets/content_page.py | 0 .../view/widgets/enum_button_group.py | 0 .../view/widgets/enum_combo_box.py | 0 .../view/widgets/flow_layout.py | 0 .../view/widgets/multi_selector_dialog.py | 0 .../view/widgets/multi_selector_dialog.ui | 0 .../view/widgets/new_project_dialog.py | 2 +- .../view/widgets/new_project_dialog.ui | 0 .../view/widgets/number_input_dialog.py | 0 .../view/widgets/number_input_dialog.ui | 0 .../view/widgets/progress_dialog.py | 0 .../view/widgets/progress_dialog.ui | 0 .../view/widgets/progress_dialog_simple.py | 0 .../view/widgets/project_selector.py | 6 +- .../view/widgets/project_selector.ui | 0 .../view/widgets/project_widget.py | 0 .../view/widgets/project_widget.ui | 0 .../view/widgets/resizable_dialog.py | 0 .../view/widgets/selector_dialog.py | 0 .../view/widgets/selector_dialog.ui | 0 .../view/widgets/volume_fraction_widget.py | 12 ++-- {baramSnappy => baramMesh}/__init__.py | 0 {baramSnappy => baramMesh}/app.py | 8 +-- {baramSnappy => baramMesh}/db/__init__.py | 0 .../db/configurations.py | 0 .../db/configurations_schema.py | 0 {baramSnappy => baramMesh}/db/file_db.py | 0 {baramSnappy => baramMesh}/db/migrate.py | 0 {baramSnappy => baramMesh}/db/project.py | 6 +- {baramSnappy => baramMesh}/db/simple_db.py | 0 .../db/simple_schema.py | 0 {baramSnappy => baramMesh}/main.py | 14 ++--- .../openfoam/__init__.py | 0 .../openfoam/constant/__init__.py | 0 .../openfoam/constant/region_properties.py | 4 +- .../openfoam/file_system.py | 0 .../openfoam/poly_mesh/__init__.py | 0 .../openfoam/poly_mesh/poly_mesh_loader.py | 0 .../openfoam/redistribution_task.py | 2 +- .../openfoam/system/__init__.py | 0 .../openfoam/system/block_mesh_dict.py | 6 +- .../openfoam/system/snappy_hex_mesh_dict.py | 6 +- .../openfoam/system/surface_patch_dict.py | 2 +- .../openfoam/system/topo_set_dict.py | 6 +- .../rendering/__init__.py | 0 .../rendering/actor_info.py | 0 .../rendering/plane_widget.py | 0 .../rendering/point_widget.py | 2 +- .../rendering/rendering_manager.py | 0 .../rendering/vtk_loader.py | 0 .../settings/__init__.py | 0 .../settings/app_properties.py | 0 .../settings/app_settings.py | 9 +++ .../settings/local_settings.py | 0 .../settings/project_manager.py | 2 +- .../settings/project_settings.py | 2 +- {baramSnappy => baramMesh}/view/__init__.py | 0 .../view/base_grid/__init__.py | 0 .../view/base_grid/base_grid_page.py | 14 ++--- .../view/boundaryLayer/__init__.py | 0 .../boundar_layer_advanced_dialog.ui | 0 .../boundary_layer_advanced_dialog.py | 4 +- .../view/boundaryLayer/boundary_layer_page.py | 10 +-- .../boundaryLayer/boundary_setting_dialog.py | 8 +-- .../boundaryLayer/boundary_setting_dialog.ui | 0 .../view/boundaryLayer/layer_item.py | 4 +- .../view/boundaryLayer/thickness_form.py | 2 +- .../view/castellation/__init__.py | 0 .../view/castellation/castellation_page.py | 14 ++--- .../view/castellation/castellation_page.ui | 0 .../view/castellation/refinement_item.py | 4 +- .../castellation/surface_refinement_dialog.py | 10 +-- .../castellation/surface_refinement_dialog.ui | 0 .../castellation/volume_refinement_dialog.py | 10 +-- .../castellation/volume_refinement_dialog.ui | 0 .../view/display_control/__init__.py | 0 .../view/display_control/cut_tool.py | 4 +- .../view/display_control/display_control.py | 6 +- .../view/display_control/display_item.py | 2 +- .../view/display_control/opacity_dialog.py | 0 .../view/display_control/opacity_dialog.ui | 0 .../view/export/__init__.py | 0 .../view/export/export_page.py | 12 ++-- .../view/geometry/__init__.py | 0 .../view/geometry/geometry_add_dialog.py | 0 .../view/geometry/geometry_add_dialog.ui | 0 .../view/geometry/geometry_import_dialog.py | 0 .../view/geometry/geometry_import_dialog.ui | 0 .../view/geometry/geometry_list.py | 2 +- .../view/geometry/geometry_manager.py | 12 ++-- .../view/geometry/geometry_page.py | 6 +- .../view/geometry/geometry_page.ui | 0 .../view/geometry/stl_file_loader.py | 6 +- .../view/geometry/surface_dialog.py | 6 +- .../view/geometry/surface_dialog.ui | 0 .../view/geometry/volume_dialog.py | 6 +- .../view/geometry/volume_dialog.ui | 0 .../view/main_window/__init__.py | 0 .../view/main_window/actor_manager.py | 4 +- .../view/main_window/console_view.py | 0 .../view/main_window/main_window.py | 20 +++--- .../view/main_window/main_window.ui | 6 +- .../view/main_window/mesh_manager.py | 8 +-- .../view/main_window/naviagtion_view.py | 2 +- .../view/main_window/recent_files_menu.py | 0 .../view/main_window/rendering_tool.py | 2 +- .../view/main_window/step_manager.py | 20 +++--- .../view/menu/__init__.py | 0 .../view/menu/help/__init__.py | 0 .../view/menu/help/about_dialog.py | 2 +- .../view/menu/help/about_dialog.ui | 0 .../view/menu/help/license_dialog.py | 0 .../view/menu/help/license_dialog.ui | 0 .../view/menu/mesh_quality/__init__.py | 0 .../mesh_quality_parameters_dialog.py | 4 +- .../mesh_quality_parameters_dialog.ui | 0 .../view/region/__init__.py | 0 .../view/region/region_card.py | 4 +- .../view/region/region_card.ui | 0 .../view/region/region_form.py | 8 +-- .../view/region/region_form.ui | 0 .../view/region/region_page.py | 6 +- .../view/snap/__init__.py | 0 .../view/snap/snap_page.py | 12 ++-- .../view/snap/snap_page.ui | 0 {baramSnappy => baramMesh}/view/step_page.py | 6 +- .../view/widgets/__init__.py | 0 .../view/widgets/flat_push_button.py | 0 .../view/widgets/folder_header.py | 0 .../view/widgets/icon_check_box.py | 0 .../view/widgets/language_dialog.py | 0 .../view/widgets/language_dialog.ui | 0 .../view/widgets/list_table.py | 0 .../view/widgets/multi_selector_dialog.py | 0 .../view/widgets/multi_selector_dialog.ui | 0 .../view/widgets/new_project_dialog.py | 0 .../view/widgets/new_project_dialog.ui | 0 .../view/widgets/project_dialog.py | 2 +- .../view/widgets/project_dialog.ui | 0 .../view/widgets/project_widget.py | 0 .../view/widgets/project_widget.ui | 0 .../view/widgets/settings_scaling_dialog.py | 0 .../view/widgets/settings_scaling_dialog.ui | 0 convertUi.py | 2 +- resources/baram.ico | Bin 102301 -> 0 bytes resources/baramFlow.ico | Bin 0 -> 99846 bytes resources/baramMesh.ico | Bin 0 -> 31766 bytes resources/baramPackage.ico | Bin 0 -> 21357 bytes 478 files changed, 883 insertions(+), 866 deletions(-) rename {baram => baramFlow}/__init__.py (100%) rename {baram => baramFlow}/app.py (97%) rename {baram => baramFlow}/app_plug_in.py (85%) rename {baram => baramFlow}/app_properties.py (100%) rename {baram => baramFlow}/coredb/__init__.py (100%) rename {baram => baramFlow}/coredb/app_settings.py (85%) rename {baram => baramFlow}/coredb/boundary_db.py (98%) rename {baram => baramFlow}/coredb/cell_zone_db.py (96%) rename {baram => baramFlow}/coredb/coredb.py (99%) rename {baram => baramFlow}/coredb/coredb_writer.py (98%) rename {baram => baramFlow}/coredb/filedb.py (99%) rename {baram => baramFlow}/coredb/general_db.py (95%) rename {baram => baramFlow}/coredb/initialization_db.py (97%) rename {baram => baramFlow}/coredb/material_db.py (99%) rename {baram => baramFlow}/coredb/migrate.py (100%) rename {baram => baramFlow}/coredb/models_db.py (99%) rename {baram => baramFlow}/coredb/monitor_db.py (97%) rename {baram => baramFlow}/coredb/numerical_db.py (100%) rename {baram => baramFlow}/coredb/project.py (99%) rename {baram => baramFlow}/coredb/project_settings.py (98%) rename {baram => baramFlow}/coredb/reference_values_db.py (100%) rename {baram => baramFlow}/coredb/region_db.py (94%) rename {baram => baramFlow}/coredb/run_calculation_db.py (100%) rename {baram => baramFlow}/libbaram/__init__.py (100%) rename {baram => baramFlow}/libbaram/db/__init__.py (100%) rename {baram => baramFlow}/libbaram/db/schema.py (100%) rename {baram => baramFlow}/libbaram/db/simple_db.py (100%) rename {baram => baramFlow}/main.py (81%) rename {baram => baramFlow}/mesh/__init__.py (100%) rename {baram => baramFlow}/mesh/mesh_manager.py (95%) rename {baram => baramFlow}/mesh/mesh_model.py (98%) rename {baram => baramFlow}/mesh/vtk_loader.py (100%) rename {baram => baramFlow}/misc/baramd.c (100%) rename {baram => baramFlow}/misc/test_child.c (100%) rename {baram => baramFlow}/openfoam/__init__.py (100%) rename {baram => baramFlow}/openfoam/boundary_conditions/__init__.py (100%) rename {baram => baramFlow}/openfoam/boundary_conditions/alpha.py (94%) rename {baram => baramFlow}/openfoam/boundary_conditions/alphat.py (94%) rename {baram => baramFlow}/openfoam/boundary_conditions/boundary_condition.py (96%) rename {baram => baramFlow}/openfoam/boundary_conditions/epsilon.py (95%) rename {baram => baramFlow}/openfoam/boundary_conditions/k.py (96%) rename {baram => baramFlow}/openfoam/boundary_conditions/nuTilda.py (95%) rename {baram => baramFlow}/openfoam/boundary_conditions/nut.py (94%) rename {baram => baramFlow}/openfoam/boundary_conditions/omega.py (95%) rename {baram => baramFlow}/openfoam/boundary_conditions/p.py (93%) rename {baram => baramFlow}/openfoam/boundary_conditions/t.py (93%) rename {baram => baramFlow}/openfoam/boundary_conditions/u.py (95%) rename {baram => baramFlow}/openfoam/case_generator.py (78%) rename {baram => baramFlow}/openfoam/constant/MRF_properties.py (86%) rename {baram => baramFlow}/openfoam/constant/__init__.py (100%) rename {baram => baramFlow}/openfoam/constant/boundary_data.py (95%) rename {baram => baramFlow}/openfoam/constant/dynamic_mesh_dict.py (90%) rename {baram => baramFlow}/openfoam/constant/g.py (80%) rename {baram => baramFlow}/openfoam/constant/operating_conditions.py (82%) rename {baram => baramFlow}/openfoam/constant/region_properties.py (87%) rename {baram => baramFlow}/openfoam/constant/thermophysical_properties.py (98%) rename {baram => baramFlow}/openfoam/constant/transport_properties.py (92%) rename {baram => baramFlow}/openfoam/constant/turbulence_properties.py (93%) rename {baram => baramFlow}/openfoam/file_system.py (99%) rename {baram => baramFlow}/openfoam/parallel.py (81%) rename {baram => baramFlow}/openfoam/polymesh/__init__.py (100%) rename {baram => baramFlow}/openfoam/polymesh/boundary.py (97%) rename {baram => baramFlow}/openfoam/polymesh/polymesh_loader.py (95%) rename {baram => baramFlow}/openfoam/porous.py (94%) rename {baram => baramFlow}/openfoam/post_processing/__init__.py (100%) rename {baram => baramFlow}/openfoam/post_processing/monitor.py (93%) rename {baram => baramFlow}/openfoam/post_processing/post_file_reader.py (98%) rename {baram => baramFlow}/openfoam/redistribution_task.py (93%) rename {baram => baramFlow}/openfoam/solver.py (98%) rename {baram => baramFlow}/openfoam/solver_info_manager.py (99%) rename {baram => baramFlow}/openfoam/system/__init__.py (100%) rename {baram => baramFlow}/openfoam/system/control_dict.py (94%) rename {baram => baramFlow}/openfoam/system/fv_options.py (98%) rename {baram => baramFlow}/openfoam/system/fv_schemes.py (97%) rename {baram => baramFlow}/openfoam/system/fv_solution.py (96%) rename {baram => baramFlow}/openfoam/system/set_fields_dict.py (96%) rename {baram => baramFlow}/test/__init__.py (100%) rename {baram => baramFlow}/test/test_coredb/__init__.py (100%) rename {baram => baramFlow}/test/test_coredb/coredb_xml/v1.xml (100%) rename {baram => baramFlow}/test/test_coredb/coredb_xml/v1a.xml (100%) rename {baram => baramFlow}/test/test_coredb/test_attribute.py (96%) rename {baram => baramFlow}/test/test_coredb/test_boundary_condition.py (97%) rename {baram => baramFlow}/test/test_coredb/test_cell_zones.py (98%) rename {baram => baramFlow}/test/test_coredb/test_config_count.py (98%) rename {baram => baramFlow}/test/test_coredb/test_context_manager.py (97%) rename {baram => baramFlow}/test/test_coredb/test_enumeration_string.py (95%) rename {baram => baramFlow}/test/test_coredb/test_input_number_list_type.py (96%) rename {baram => baramFlow}/test/test_coredb/test_input_number_type_with_restriction.py (98%) rename {baram => baramFlow}/test/test_coredb/test_input_number_type_without_restriction.py (98%) rename {baram => baramFlow}/test/test_coredb/test_material.py (99%) rename {baram => baramFlow}/test/test_coredb/test_material_db.py (96%) rename {baram => baramFlow}/test/test_coredb/test_migration.py (90%) rename {baram => baramFlow}/test/test_coredb/test_monitors.py (97%) rename {baram => baramFlow}/test/test_coredb/test_non_negative_integer.py (97%) rename {baram => baramFlow}/test/test_coredb/test_positve_integer.py (97%) rename {baram => baramFlow}/test/test_openfoam/__init__.py (100%) rename {baram => baramFlow}/test/test_openfoam/test_MRF_properties.py (93%) rename {baram => baramFlow}/test/test_openfoam/test_alpha.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_alphat.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_control_dict.py (98%) rename {baram => baramFlow}/test/test_openfoam/test_decomposePar_dict.py (95%) rename {baram => baramFlow}/test/test_openfoam/test_dynamic_mesh_dict.py (94%) rename {baram => baramFlow}/test/test_openfoam/test_epsilon.py (98%) rename {baram => baramFlow}/test/test_openfoam/test_fv_options.py (99%) rename {baram => baramFlow}/test/test_openfoam/test_fv_schemes.py (98%) rename {baram => baramFlow}/test/test_openfoam/test_fv_solution.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_g.py (84%) rename {baram => baramFlow}/test/test_openfoam/test_k.py (98%) rename {baram => baramFlow}/test/test_openfoam/test_nuTilda.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_nut.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_omega.py (98%) rename {baram => baramFlow}/test/test_openfoam/test_operating_conditions.py (84%) rename {baram => baramFlow}/test/test_openfoam/test_p.py (96%) rename {baram => baramFlow}/test/test_openfoam/test_p_caculated.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_p_rgh.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_solver.py (89%) rename {baram => baramFlow}/test/test_openfoam/test_solver_info_manager.py (98%) rename {baram => baramFlow}/test/test_openfoam/test_t.py (97%) rename {baram => baramFlow}/test/test_openfoam/test_thermophysical_properties.py (96%) rename {baram => baramFlow}/test/test_openfoam/test_transport_properties.py (85%) rename {baram => baramFlow}/test/test_openfoam/test_turbulence_properties.py (95%) rename {baram => baramFlow}/test/test_openfoam/test_u.py (98%) rename {baram => baramFlow}/view/__init__.py (100%) rename {baram => baramFlow}/view/case_wizard/__init__.py (100%) rename {baram => baramFlow}/view/case_wizard/case_wizard.py (97%) rename {baram => baramFlow}/view/case_wizard/case_wizard.ui (100%) rename {baram => baramFlow}/view/case_wizard/energy_model_page.py (100%) rename {baram => baramFlow}/view/case_wizard/energy_model_page.ui (100%) rename {baram => baramFlow}/view/case_wizard/flow_type_page.py (100%) rename {baram => baramFlow}/view/case_wizard/flow_type_page.ui (100%) rename {baram => baramFlow}/view/case_wizard/gravity_model_page.py (100%) rename {baram => baramFlow}/view/case_wizard/gravity_model_page.ui (100%) rename {baram => baramFlow}/view/case_wizard/multiphase_model_page.py (88%) rename {baram => baramFlow}/view/case_wizard/multiphase_model_page.ui (100%) rename {baram => baramFlow}/view/case_wizard/solver_type_page.py (100%) rename {baram => baramFlow}/view/case_wizard/solver_type_page.ui (100%) rename {baram => baramFlow}/view/case_wizard/species_model_page.py (100%) rename {baram => baramFlow}/view/case_wizard/species_model_page.ui (100%) rename {baram => baramFlow}/view/case_wizard/workspace_page.py (97%) rename {baram => baramFlow}/view/case_wizard/workspace_page.ui (100%) rename {baram => baramFlow}/view/main_window/__init__.py (100%) rename {baram => baramFlow}/view/main_window/chart_dock.py (94%) rename {baram => baramFlow}/view/main_window/console_dock.py (97%) rename {baram => baramFlow}/view/main_window/content_view.py (90%) rename {baram => baramFlow}/view/main_window/empty_page.py (100%) rename {baram => baramFlow}/view/main_window/main_window.py (92%) rename {baram => baramFlow}/view/main_window/main_window.ui (99%) rename {baram => baramFlow}/view/main_window/menu/__init__.py (100%) rename {baram => baramFlow}/view/main_window/menu/help/__init__.py (100%) rename {baram => baramFlow}/view/main_window/menu/help/about_dialog.py (96%) rename {baram => baramFlow}/view/main_window/menu/help/about_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/help/license_dialog.py (100%) rename {baram => baramFlow}/view/main_window/menu/help/license_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/__init__.py (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/mesh_rotate_dialog.py (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/mesh_rotate_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/mesh_scale_dialog.py (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/mesh_scale_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/mesh_translate_dialog.py (100%) rename {baram => baramFlow}/view/main_window/menu/mesh/mesh_translate_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/settrings/__init__.py (100%) rename {baram => baramFlow}/view/main_window/menu/settrings/settings_language_dialog.py (93%) rename {baram => baramFlow}/view/main_window/menu/settrings/settings_language_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/settrings/settings_paraveiw_dialog.py (96%) rename {baram => baramFlow}/view/main_window/menu/settrings/settings_paraview_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/menu/settrings/settings_scaling_dialog.py (93%) rename {baram => baramFlow}/view/main_window/menu/settrings/settings_scaling_dialog.ui (100%) rename {baram => baramFlow}/view/main_window/monitor_dock.py (91%) rename {baram => baramFlow}/view/main_window/navigator_view.py (98%) rename {baram => baramFlow}/view/main_window/rendering_dock.py (100%) rename {baram => baramFlow}/view/main_window/rendering_view.py (95%) rename {baram => baramFlow}/view/main_window/rendering_view.ui (100%) rename {baram => baramFlow}/view/main_window/start_window.py (91%) rename {baram => baramFlow}/view/main_window/start_window.ui (100%) rename {baram => baramFlow}/view/main_window/tabified_dock.py (100%) rename {baram => baramFlow}/view/setup/__init__.py (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/ABL_inlet_dialog.py (95%) rename {baram => baramFlow}/view/setup/boundary_conditions/ABL_inlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/__init__.py (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/boundary_conditions_page.py (96%) rename {baram => baramFlow}/view/setup/boundary_conditions/boundary_conditions_page.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/boundary_type_picker.py (96%) rename {baram => baramFlow}/view/setup/boundary_conditions/boundary_type_picker.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/boundary_widget.py (94%) rename {baram => baramFlow}/view/setup/boundary_conditions/boundary_widget.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/conditional_widget_helper.py (91%) rename {baram => baramFlow}/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py (86%) rename {baram => baramFlow}/view/setup/boundary_conditions/cyclic_dialog.py (91%) rename {baram => baramFlow}/view/setup/boundary_conditions/cyclic_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/fan_dialog.py (93%) rename {baram => baramFlow}/view/setup/boundary_conditions/fan_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/farfield_riemann_dialog.py (91%) rename {baram => baramFlow}/view/setup/boundary_conditions/farfield_riemann_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/flow_rate_inlet_dialog.py (92%) rename {baram => baramFlow}/view/setup/boundary_conditions/flow_rate_inlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/free_stream_dialog.py (91%) rename {baram => baramFlow}/view/setup/boundary_conditions/free_stream_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/interface_dialog.py (94%) rename {baram => baramFlow}/view/setup/boundary_conditions/interface_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/open_channel_inlet_dialog.py (86%) rename {baram => baramFlow}/view/setup/boundary_conditions/open_channel_inlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/open_channel_outlet_dialog.py (86%) rename {baram => baramFlow}/view/setup/boundary_conditions/open_channel_outlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/porous_jump_dialog.py (93%) rename {baram => baramFlow}/view/setup/boundary_conditions/porous_jump_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/pressure_inlet_dialog.py (90%) rename {baram => baramFlow}/view/setup/boundary_conditions/pressure_inlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/pressure_outlet_dialog.py (91%) rename {baram => baramFlow}/view/setup/boundary_conditions/pressure_outlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/region_widget.py (98%) rename {baram => baramFlow}/view/setup/boundary_conditions/region_widget.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/subsonic_inflow_dialog.py (90%) rename {baram => baramFlow}/view/setup/boundary_conditions/subsonic_inflow_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/subsonic_outflow_dialog.py (87%) rename {baram => baramFlow}/view/setup/boundary_conditions/subsonic_outflow_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/supersonic_inflow_dialog.py (90%) rename {baram => baramFlow}/view/setup/boundary_conditions/supersonic_inflow_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/temperature_widget.py (96%) rename {baram => baramFlow}/view/setup/boundary_conditions/temperature_widget.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py (91%) rename {baram => baramFlow}/view/setup/boundary_conditions/thermo_coupled_wall_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py (97%) rename {baram => baramFlow}/view/setup/boundary_conditions/turbulence_k_epsilon_widget.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/turbulence_k_omega_widget.py (97%) rename {baram => baramFlow}/view/setup/boundary_conditions/turbulence_k_omega_widget.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py (96%) rename {baram => baramFlow}/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/velocity_inlet_dialog.py (97%) rename {baram => baramFlow}/view/setup/boundary_conditions/velocity_inlet_dialog.ui (100%) rename {baram => baramFlow}/view/setup/boundary_conditions/wall_dialog.py (96%) rename {baram => baramFlow}/view/setup/boundary_conditions/wall_dialog.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/MRF_widget.py (95%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/MRF_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/__init__.py (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/actuator_disk_widget.py (98%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/actuator_disk_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py (96%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/cell_zone_condition_dialog.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/cell_zone_conditions_page.py (92%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/cell_zone_conditions_page.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/cell_zone_widget.py (90%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/cell_zone_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/constant_source_widget.py (95%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/constant_source_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/fixed_value_widget.py (97%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/fixed_value_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/material_selector_dialog.py (97%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/materials_selector_dialog.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/materials_widget.py (98%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/materials_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/operating_conditions_dialog.py (92%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/operating_conditions_dialog.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/porous_zone_widget.py (98%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/porous_zone_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/sliding_mesh_widget.py (98%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/sliding_mesh_widget.ui (100%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/variable_source_widget.py (96%) rename {baram => baramFlow}/view/setup/cell_zone_conditions/variable_source_widget.ui (100%) rename {baram => baramFlow}/view/setup/general/__init__.py (100%) rename {baram => baramFlow}/view/setup/general/general_page.py (91%) rename {baram => baramFlow}/view/setup/general/general_page.ui (100%) rename {baram => baramFlow}/view/setup/materials/__init__.py (100%) rename {baram => baramFlow}/view/setup/materials/material_card.py (95%) rename {baram => baramFlow}/view/setup/materials/material_card.ui (100%) rename {baram => baramFlow}/view/setup/materials/material_dialog.py (97%) rename {baram => baramFlow}/view/setup/materials/material_dialog.ui (100%) rename {baram => baramFlow}/view/setup/materials/material_page.py (89%) rename {baram => baramFlow}/view/setup/materials/material_page.ui (100%) rename {baram => baramFlow}/view/setup/models/__init__.py (100%) rename {baram => baramFlow}/view/setup/models/energy_dialog.py (88%) rename {baram => baramFlow}/view/setup/models/energy_dialog.ui (100%) rename {baram => baramFlow}/view/setup/models/models_page.py (94%) rename {baram => baramFlow}/view/setup/models/models_page.ui (100%) rename {baram => baramFlow}/view/setup/models/multiphase_dialog.py (87%) rename {baram => baramFlow}/view/setup/models/multiphase_dialog.ui (100%) rename {baram => baramFlow}/view/setup/models/radiation_dialog.py (97%) rename {baram => baramFlow}/view/setup/models/radiation_dialog.ui (100%) rename {baram => baramFlow}/view/setup/models/turbulence_dialog.py (95%) rename {baram => baramFlow}/view/setup/models/turbulence_dialog.ui (100%) rename {baram => baramFlow}/view/setup/reference_values/__init__.py (100%) rename {baram => baramFlow}/view/setup/reference_values/reference_values_page.py (91%) rename {baram => baramFlow}/view/setup/reference_values/reference_values_page.ui (100%) rename {baram => baramFlow}/view/solution/__init__.py (100%) rename {baram => baramFlow}/view/solution/initialization/__init__.py (100%) rename {baram => baramFlow}/view/solution/initialization/initialization_page.py (92%) rename {baram => baramFlow}/view/solution/initialization/initialization_page.ui (100%) rename {baram => baramFlow}/view/solution/initialization/initialization_widget.py (96%) rename {baram => baramFlow}/view/solution/initialization/initialization_widget.ui (100%) rename {baram => baramFlow}/view/solution/initialization/option_dialog.py (92%) rename {baram => baramFlow}/view/solution/initialization/option_dialog.ui (100%) rename {baram => baramFlow}/view/solution/initialization/section_dialog.py (98%) rename {baram => baramFlow}/view/solution/initialization/section_dialog.ui (100%) rename {baram => baramFlow}/view/solution/monitors/__init__.py (100%) rename {baram => baramFlow}/view/solution/monitors/force_dialog.py (96%) rename {baram => baramFlow}/view/solution/monitors/force_dialog.ui (100%) rename {baram => baramFlow}/view/solution/monitors/forces_widget.py (97%) rename {baram => baramFlow}/view/solution/monitors/monitor_widget.py (95%) rename {baram => baramFlow}/view/solution/monitors/monitor_widget.ui (100%) rename {baram => baramFlow}/view/solution/monitors/monitors_page.py (97%) rename {baram => baramFlow}/view/solution/monitors/monitors_page.ui (100%) rename {baram => baramFlow}/view/solution/monitors/monitors_widget.py (100%) rename {baram => baramFlow}/view/solution/monitors/monitors_widget.ui (100%) rename {baram => baramFlow}/view/solution/monitors/point_dialog.py (94%) rename {baram => baramFlow}/view/solution/monitors/point_dialog.ui (100%) rename {baram => baramFlow}/view/solution/monitors/points_widget.py (97%) rename {baram => baramFlow}/view/solution/monitors/region_objects_selector.py (98%) rename {baram => baramFlow}/view/solution/monitors/region_objects_selector.ui (100%) rename {baram => baramFlow}/view/solution/monitors/surface_dialog.py (93%) rename {baram => baramFlow}/view/solution/monitors/surface_dialog.ui (100%) rename {baram => baramFlow}/view/solution/monitors/surfaces_widget.py (97%) rename {baram => baramFlow}/view/solution/monitors/volume_dialog.py (93%) rename {baram => baramFlow}/view/solution/monitors/volume_dialog.ui (100%) rename {baram => baramFlow}/view/solution/monitors/volumes_widget.py (97%) rename {baram => baramFlow}/view/solution/numerical_conditions/__init__.py (100%) rename {baram => baramFlow}/view/solution/numerical_conditions/advanced_dialog.py (90%) rename {baram => baramFlow}/view/solution/numerical_conditions/advanced_dialog.ui (100%) rename {baram => baramFlow}/view/solution/numerical_conditions/numerical_conditions_page.py (97%) rename {baram => baramFlow}/view/solution/numerical_conditions/numerical_conditions_page.ui (100%) rename {baram => baramFlow}/view/solution/run/__init__.py (100%) rename {baram => baramFlow}/view/solution/run/job_information_page.py (60%) rename {baram => baramFlow}/view/solution/run/job_information_page.ui (100%) rename {baram => baramFlow}/view/solution/run/process_information_page.py (90%) rename {baram => baramFlow}/view/solution/run/process_information_page.ui (100%) rename {baram => baramFlow}/view/solution/run_conditions/__init__.py (100%) rename {baram => baramFlow}/view/solution/run_conditions/edit_hostfile_dialog.py (98%) rename {baram => baramFlow}/view/solution/run_conditions/edit_hostfile_dialog.ui (100%) rename {baram => baramFlow}/view/solution/run_conditions/run_conditions_page.py (95%) rename {baram => baramFlow}/view/solution/run_conditions/run_conditions_page.ui (100%) rename {baram => baramFlow}/view/widgets/__init__.py (100%) rename {baram => baramFlow}/view/widgets/chart_wigdet.py (97%) rename {baram => baramFlow}/view/widgets/content_page.py (100%) rename {baram => baramFlow}/view/widgets/enum_button_group.py (100%) rename {baram => baramFlow}/view/widgets/enum_combo_box.py (100%) rename {baram => baramFlow}/view/widgets/flow_layout.py (100%) rename {baram => baramFlow}/view/widgets/multi_selector_dialog.py (100%) rename {baram => baramFlow}/view/widgets/multi_selector_dialog.ui (100%) rename {baram => baramFlow}/view/widgets/new_project_dialog.py (97%) rename {baram => baramFlow}/view/widgets/new_project_dialog.ui (100%) rename {baram => baramFlow}/view/widgets/number_input_dialog.py (100%) rename {baram => baramFlow}/view/widgets/number_input_dialog.ui (100%) rename {baram => baramFlow}/view/widgets/progress_dialog.py (100%) rename {baram => baramFlow}/view/widgets/progress_dialog.ui (100%) rename {baram => baramFlow}/view/widgets/progress_dialog_simple.py (100%) rename {baram => baramFlow}/view/widgets/project_selector.py (96%) rename {baram => baramFlow}/view/widgets/project_selector.ui (100%) rename {baram => baramFlow}/view/widgets/project_widget.py (100%) rename {baram => baramFlow}/view/widgets/project_widget.ui (100%) rename {baram => baramFlow}/view/widgets/resizable_dialog.py (100%) rename {baram => baramFlow}/view/widgets/selector_dialog.py (100%) rename {baram => baramFlow}/view/widgets/selector_dialog.ui (100%) rename {baram => baramFlow}/view/widgets/volume_fraction_widget.py (90%) rename {baramSnappy => baramMesh}/__init__.py (100%) rename {baramSnappy => baramMesh}/app.py (92%) rename {baramSnappy => baramMesh}/db/__init__.py (100%) rename {baramSnappy => baramMesh}/db/configurations.py (100%) rename {baramSnappy => baramMesh}/db/configurations_schema.py (100%) rename {baramSnappy => baramMesh}/db/file_db.py (100%) rename {baramSnappy => baramMesh}/db/migrate.py (100%) rename {baramSnappy => baramMesh}/db/project.py (87%) rename {baramSnappy => baramMesh}/db/simple_db.py (100%) rename {baramSnappy => baramMesh}/db/simple_schema.py (100%) rename {baramSnappy => baramMesh}/main.py (81%) rename {baramSnappy => baramMesh}/openfoam/__init__.py (100%) rename {baramSnappy => baramMesh}/openfoam/constant/__init__.py (100%) rename {baramSnappy => baramMesh}/openfoam/constant/region_properties.py (91%) rename {baramSnappy => baramMesh}/openfoam/file_system.py (100%) rename {baramSnappy => baramMesh}/openfoam/poly_mesh/__init__.py (100%) rename {baramSnappy => baramMesh}/openfoam/poly_mesh/poly_mesh_loader.py (100%) rename {baramSnappy => baramMesh}/openfoam/redistribution_task.py (99%) rename {baramSnappy => baramMesh}/openfoam/system/__init__.py (100%) rename {baramSnappy => baramMesh}/openfoam/system/block_mesh_dict.py (95%) rename {baramSnappy => baramMesh}/openfoam/system/snappy_hex_mesh_dict.py (98%) rename {baramSnappy => baramMesh}/openfoam/system/surface_patch_dict.py (96%) rename {baramSnappy => baramMesh}/openfoam/system/topo_set_dict.py (98%) rename {baramSnappy => baramMesh}/rendering/__init__.py (100%) rename {baramSnappy => baramMesh}/rendering/actor_info.py (100%) rename {baramSnappy => baramMesh}/rendering/plane_widget.py (100%) rename {baramSnappy => baramMesh}/rendering/point_widget.py (98%) rename {baramSnappy => baramMesh}/rendering/rendering_manager.py (100%) rename {baramSnappy => baramMesh}/rendering/vtk_loader.py (100%) rename {baramSnappy => baramMesh}/settings/__init__.py (100%) rename {baramSnappy => baramMesh}/settings/app_properties.py (100%) rename {baramSnappy => baramMesh}/settings/app_settings.py (92%) rename {baramSnappy => baramMesh}/settings/local_settings.py (100%) rename {baramSnappy => baramMesh}/settings/project_manager.py (89%) rename {baramSnappy => baramMesh}/settings/project_settings.py (98%) rename {baramSnappy => baramMesh}/view/__init__.py (100%) rename {baramSnappy => baramMesh}/view/base_grid/__init__.py (100%) rename {baramSnappy => baramMesh}/view/base_grid/base_grid_page.py (95%) rename {baramSnappy => baramMesh}/view/boundaryLayer/__init__.py (100%) rename {baramSnappy => baramMesh}/view/boundaryLayer/boundar_layer_advanced_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/boundaryLayer/boundary_layer_advanced_dialog.py (97%) rename {baramSnappy => baramMesh}/view/boundaryLayer/boundary_layer_page.py (97%) rename {baramSnappy => baramMesh}/view/boundaryLayer/boundary_setting_dialog.py (96%) rename {baramSnappy => baramMesh}/view/boundaryLayer/boundary_setting_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/boundaryLayer/layer_item.py (94%) rename {baramSnappy => baramMesh}/view/boundaryLayer/thickness_form.py (98%) rename {baramSnappy => baramMesh}/view/castellation/__init__.py (100%) rename {baramSnappy => baramMesh}/view/castellation/castellation_page.py (97%) rename {baramSnappy => baramMesh}/view/castellation/castellation_page.ui (100%) rename {baramSnappy => baramMesh}/view/castellation/refinement_item.py (95%) rename {baramSnappy => baramMesh}/view/castellation/surface_refinement_dialog.py (94%) rename {baramSnappy => baramMesh}/view/castellation/surface_refinement_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/castellation/volume_refinement_dialog.py (93%) rename {baramSnappy => baramMesh}/view/castellation/volume_refinement_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/display_control/__init__.py (100%) rename {baramSnappy => baramMesh}/view/display_control/cut_tool.py (98%) rename {baramSnappy => baramMesh}/view/display_control/display_control.py (98%) rename {baramSnappy => baramMesh}/view/display_control/display_item.py (98%) rename {baramSnappy => baramMesh}/view/display_control/opacity_dialog.py (100%) rename {baramSnappy => baramMesh}/view/display_control/opacity_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/export/__init__.py (100%) rename {baramSnappy => baramMesh}/view/export/export_page.py (94%) rename {baramSnappy => baramMesh}/view/geometry/__init__.py (100%) rename {baramSnappy => baramMesh}/view/geometry/geometry_add_dialog.py (100%) rename {baramSnappy => baramMesh}/view/geometry/geometry_add_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/geometry/geometry_import_dialog.py (100%) rename {baramSnappy => baramMesh}/view/geometry/geometry_import_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/geometry/geometry_list.py (98%) rename {baramSnappy => baramMesh}/view/geometry/geometry_manager.py (94%) rename {baramSnappy => baramMesh}/view/geometry/geometry_page.py (98%) rename {baramSnappy => baramMesh}/view/geometry/geometry_page.ui (100%) rename {baramSnappy => baramMesh}/view/geometry/stl_file_loader.py (92%) rename {baramSnappy => baramMesh}/view/geometry/surface_dialog.py (96%) rename {baramSnappy => baramMesh}/view/geometry/surface_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/geometry/volume_dialog.py (98%) rename {baramSnappy => baramMesh}/view/geometry/volume_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/main_window/__init__.py (100%) rename {baramSnappy => baramMesh}/view/main_window/actor_manager.py (96%) rename {baramSnappy => baramMesh}/view/main_window/console_view.py (100%) rename {baramSnappy => baramMesh}/view/main_window/main_window.py (93%) rename {baramSnappy => baramMesh}/view/main_window/main_window.ui (99%) rename {baramSnappy => baramMesh}/view/main_window/mesh_manager.py (87%) rename {baramSnappy => baramMesh}/view/main_window/naviagtion_view.py (96%) rename {baramSnappy => baramMesh}/view/main_window/recent_files_menu.py (100%) rename {baramSnappy => baramMesh}/view/main_window/rendering_tool.py (90%) rename {baramSnappy => baramMesh}/view/main_window/step_manager.py (87%) rename {baramSnappy => baramMesh}/view/menu/__init__.py (100%) rename {baramSnappy => baramMesh}/view/menu/help/__init__.py (100%) rename {baramSnappy => baramMesh}/view/menu/help/about_dialog.py (95%) rename {baramSnappy => baramMesh}/view/menu/help/about_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/menu/help/license_dialog.py (100%) rename {baramSnappy => baramMesh}/view/menu/help/license_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/menu/mesh_quality/__init__.py (100%) rename {baramSnappy => baramMesh}/view/menu/mesh_quality/mesh_quality_parameters_dialog.py (98%) rename {baramSnappy => baramMesh}/view/menu/mesh_quality/mesh_quality_parameters_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/region/__init__.py (100%) rename {baramSnappy => baramMesh}/view/region/region_card.py (95%) rename {baramSnappy => baramMesh}/view/region/region_card.ui (100%) rename {baramSnappy => baramMesh}/view/region/region_form.py (95%) rename {baramSnappy => baramMesh}/view/region/region_form.ui (100%) rename {baramSnappy => baramMesh}/view/region/region_page.py (97%) rename {baramSnappy => baramMesh}/view/snap/__init__.py (100%) rename {baramSnappy => baramMesh}/view/snap/snap_page.py (94%) rename {baramSnappy => baramMesh}/view/snap/snap_page.ui (100%) rename {baramSnappy => baramMesh}/view/step_page.py (93%) rename {baramSnappy => baramMesh}/view/widgets/__init__.py (100%) rename {baramSnappy => baramMesh}/view/widgets/flat_push_button.py (100%) rename {baramSnappy => baramMesh}/view/widgets/folder_header.py (100%) rename {baramSnappy => baramMesh}/view/widgets/icon_check_box.py (100%) rename {baramSnappy => baramMesh}/view/widgets/language_dialog.py (100%) rename {baramSnappy => baramMesh}/view/widgets/language_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/widgets/list_table.py (100%) rename {baramSnappy => baramMesh}/view/widgets/multi_selector_dialog.py (100%) rename {baramSnappy => baramMesh}/view/widgets/multi_selector_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/widgets/new_project_dialog.py (100%) rename {baramSnappy => baramMesh}/view/widgets/new_project_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/widgets/project_dialog.py (98%) rename {baramSnappy => baramMesh}/view/widgets/project_dialog.ui (100%) rename {baramSnappy => baramMesh}/view/widgets/project_widget.py (100%) rename {baramSnappy => baramMesh}/view/widgets/project_widget.ui (100%) rename {baramSnappy => baramMesh}/view/widgets/settings_scaling_dialog.py (100%) rename {baramSnappy => baramMesh}/view/widgets/settings_scaling_dialog.ui (100%) delete mode 100644 resources/baram.ico create mode 100644 resources/baramFlow.ico create mode 100644 resources/baramMesh.ico create mode 100644 resources/baramPackage.ico diff --git a/baram/__init__.py b/baramFlow/__init__.py similarity index 100% rename from baram/__init__.py rename to baramFlow/__init__.py diff --git a/baram/app.py b/baramFlow/app.py similarity index 97% rename from baram/app.py rename to baramFlow/app.py index 58655851..1a141f73 100644 --- a/baram/app.py +++ b/baramFlow/app.py @@ -8,7 +8,7 @@ from PySide6.QtWidgets import QApplication from resources import resource -from baram.coredb.app_settings import AppSettings +from baramFlow.coredb.app_settings import AppSettings class App(QObject): diff --git a/baram/app_plug_in.py b/baramFlow/app_plug_in.py similarity index 85% rename from baram/app_plug_in.py rename to baramFlow/app_plug_in.py index e91d0191..7b0d7262 100644 --- a/baram/app_plug_in.py +++ b/baramFlow/app_plug_in.py @@ -5,9 +5,9 @@ from PySide6.QtCore import QObject -from baram.app import app -from baram.view.main_window.main_window import MainWindow -from baram.view.case_wizard.case_wizard import CaseWizard +from baramFlow.app import app +from baramFlow.view.main_window.main_window import MainWindow +from baramFlow.view.case_wizard.case_wizard import CaseWizard class AppPlugIn(QObject): diff --git a/baram/app_properties.py b/baramFlow/app_properties.py similarity index 100% rename from baram/app_properties.py rename to baramFlow/app_properties.py diff --git a/baram/coredb/__init__.py b/baramFlow/coredb/__init__.py similarity index 100% rename from baram/coredb/__init__.py rename to baramFlow/coredb/__init__.py diff --git a/baram/coredb/app_settings.py b/baramFlow/coredb/app_settings.py similarity index 85% rename from baram/coredb/app_settings.py rename to baramFlow/coredb/app_settings.py index b51334e8..0ead269f 100644 --- a/baram/coredb/app_settings.py +++ b/baramFlow/coredb/app_settings.py @@ -6,6 +6,7 @@ import shutil from enum import Enum from pathlib import Path +from typing import Optional from PySide6.QtCore import QLocale, QRect @@ -42,6 +43,15 @@ def setup(cls, name): cls._settingsFile = cls._settingsPath / 'baram.cfg.yaml' cls._applicationLockFile = cls._settingsPath / 'baram.lock' + # ToDo: For compatibility. Remove this code block after 20241201 + # Migration from previous name of "BaramFlow" + # Begin + if name == 'BaramFlow': + oldPath = Path.home().joinpath('.baram') + if not cls._settingsPath.exists() and oldPath.is_dir(): + oldPath.replace(cls._settingsPath) + # End + cls._settingsPath.mkdir(exist_ok=True) cls._casesPath.mkdir(exist_ok=True) @@ -136,37 +146,35 @@ def setLanguage(cls, language): cls._save(settings) @classmethod - def getParaviewInstalledPath(cls): - return cls._get(SettingKey.PARAVIEW_INSTALLED_PATH, '') - - @classmethod - def updateParaviewInstalledPath(cls, path): + def updateParaviewInstalledPath(cls, path: Path): settings = cls._load() settings[SettingKey.PARAVIEW_INSTALLED_PATH.value] = str(path) cls._save(settings) @classmethod - def findParaviewInstalledPath(cls): - def validate(path, update=True): - if path and Path(path).exists(): - if update: - cls.updateParaviewInstalledPath(path) + def findParaviewInstalledPath(cls) -> Optional[Path]: + def validate(pathString: str, update=True): + if pathString: + path = Path(pathString) + if path.is_file(): + if update: + cls.updateParaviewInstalledPath(path) - return str(path) + return path return None - if path := validate(cls.getParaviewInstalledPath(), False): + if path := validate(cls._get(SettingKey.PARAVIEW_INSTALLED_PATH, ''), False): return path - if path := validate(Path(shutil.which('paraview'))): + if path := validate(shutil.which('paraview')): return path if platform.system() == 'Windows': # Search the unique paraview executable file. paraviewHomes = list(Path(os.environ.get('PROGRAMFILES')).glob('paraview*')) if len(paraviewHomes) == 1: - if path := validate(paraviewHomes[0] / 'bin/paraview.exe'): + if path := validate(str(paraviewHomes[0] / 'bin/paraview.exe')): return path return None diff --git a/baram/coredb/boundary_db.py b/baramFlow/coredb/boundary_db.py similarity index 98% rename from baram/coredb/boundary_db.py rename to baramFlow/coredb/boundary_db.py index 0a7e92be..33087001 100644 --- a/baram/coredb/boundary_db.py +++ b/baramFlow/coredb/boundary_db.py @@ -5,8 +5,8 @@ from PySide6.QtCore import QCoreApplication -from baram.coredb import coredb -from baram.view.widgets.multi_selector_dialog import SelectorItem +from baramFlow.coredb import coredb +from baramFlow.view.widgets.multi_selector_dialog import SelectorItem class BoundaryType(Enum): diff --git a/baram/coredb/cell_zone_db.py b/baramFlow/coredb/cell_zone_db.py similarity index 96% rename from baram/coredb/cell_zone_db.py rename to baramFlow/coredb/cell_zone_db.py index e0eac0ba..6514c36e 100644 --- a/baram/coredb/cell_zone_db.py +++ b/baramFlow/coredb/cell_zone_db.py @@ -3,8 +3,8 @@ from enum import Enum -from baram.coredb import coredb -from baram.view.widgets.multi_selector_dialog import SelectorItem +from baramFlow.coredb import coredb +from baramFlow.view.widgets.multi_selector_dialog import SelectorItem class ZoneType(Enum): diff --git a/baram/coredb/coredb.py b/baramFlow/coredb/coredb.py similarity index 99% rename from baram/coredb/coredb.py rename to baramFlow/coredb/coredb.py index f1c79da7..e3fa2480 100644 --- a/baram/coredb/coredb.py +++ b/baramFlow/coredb/coredb.py @@ -18,7 +18,7 @@ import resource_rc from resources import resource -from baram.coredb import migrate +from baramFlow.coredb import migrate ns = 'http://www.baramcfd.org/baram' nsmap = {'': ns} diff --git a/baram/coredb/coredb_writer.py b/baramFlow/coredb/coredb_writer.py similarity index 98% rename from baram/coredb/coredb_writer.py rename to baramFlow/coredb/coredb_writer.py index 7c1d11b9..bb778589 100644 --- a/baram/coredb/coredb_writer.py +++ b/baramFlow/coredb/coredb_writer.py @@ -3,7 +3,7 @@ from PySide6.QtCore import QCoreApplication -from baram.coredb.coredb import CoreDB, Error +from baramFlow.coredb.coredb import CoreDB, Error class WriteItem: diff --git a/baram/coredb/filedb.py b/baramFlow/coredb/filedb.py similarity index 99% rename from baram/coredb/filedb.py rename to baramFlow/coredb/filedb.py index 183591ba..7e64076c 100644 --- a/baram/coredb/filedb.py +++ b/baramFlow/coredb/filedb.py @@ -8,7 +8,7 @@ import pandas as pd import h5py -from baram.coredb import coredb +from baramFlow.coredb import coredb class BcFileRole(Enum): diff --git a/baram/coredb/general_db.py b/baramFlow/coredb/general_db.py similarity index 95% rename from baram/coredb/general_db.py rename to baramFlow/coredb/general_db.py index 9d373896..d342dcfa 100644 --- a/baram/coredb/general_db.py +++ b/baramFlow/coredb/general_db.py @@ -3,7 +3,7 @@ from enum import Enum -from baram.coredb import coredb +from baramFlow.coredb import coredb class SolverType(Enum): diff --git a/baram/coredb/initialization_db.py b/baramFlow/coredb/initialization_db.py similarity index 97% rename from baram/coredb/initialization_db.py rename to baramFlow/coredb/initialization_db.py index 08dc2602..dcaa2f14 100644 --- a/baram/coredb/initialization_db.py +++ b/baramFlow/coredb/initialization_db.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb import coredb +from baramFlow.coredb import coredb class InitializationDB: diff --git a/baram/coredb/material_db.py b/baramFlow/coredb/material_db.py similarity index 99% rename from baram/coredb/material_db.py rename to baramFlow/coredb/material_db.py index c30cad88..e8293e58 100644 --- a/baram/coredb/material_db.py +++ b/baramFlow/coredb/material_db.py @@ -5,7 +5,7 @@ from PySide6.QtCore import QCoreApplication -from baram.coredb import coredb +from baramFlow.coredb import coredb UNIVERSAL_GAL_CONSTANT = 8314.46261815324 diff --git a/baram/coredb/migrate.py b/baramFlow/coredb/migrate.py similarity index 100% rename from baram/coredb/migrate.py rename to baramFlow/coredb/migrate.py diff --git a/baram/coredb/models_db.py b/baramFlow/coredb/models_db.py similarity index 99% rename from baram/coredb/models_db.py rename to baramFlow/coredb/models_db.py index e519fd92..aa67cb0c 100644 --- a/baram/coredb/models_db.py +++ b/baramFlow/coredb/models_db.py @@ -5,7 +5,7 @@ from PySide6.QtCore import QCoreApplication -from baram.coredb import coredb +from baramFlow.coredb import coredb class MultiphaseModel(Enum): diff --git a/baram/coredb/monitor_db.py b/baramFlow/coredb/monitor_db.py similarity index 97% rename from baram/coredb/monitor_db.py rename to baramFlow/coredb/monitor_db.py index 309c1ae9..c05c8465 100644 --- a/baram/coredb/monitor_db.py +++ b/baramFlow/coredb/monitor_db.py @@ -5,10 +5,10 @@ from PySide6.QtCore import QCoreApplication -from baram.coredb import coredb -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.coredb.general_db import GeneralDB -from baram.coredb.material_db import MaterialDB, Phase +from baramFlow.coredb import coredb +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.material_db import MaterialDB, Phase class Field(Enum): diff --git a/baram/coredb/numerical_db.py b/baramFlow/coredb/numerical_db.py similarity index 100% rename from baram/coredb/numerical_db.py rename to baramFlow/coredb/numerical_db.py diff --git a/baram/coredb/project.py b/baramFlow/coredb/project.py similarity index 99% rename from baram/coredb/project.py rename to baramFlow/coredb/project.py index 30d4385c..9ad73283 100644 --- a/baram/coredb/project.py +++ b/baramFlow/coredb/project.py @@ -10,7 +10,7 @@ from pathlib import Path from libbaram import process -from baram.coredb import coredb +from baramFlow.coredb import coredb from .project_settings import ProjectSettings, ProjectSettingKey from .app_settings import AppSettings from .filedb import FileDB diff --git a/baram/coredb/project_settings.py b/baramFlow/coredb/project_settings.py similarity index 98% rename from baram/coredb/project_settings.py rename to baramFlow/coredb/project_settings.py index bac4f2b7..01f4f2ab 100644 --- a/baram/coredb/project_settings.py +++ b/baramFlow/coredb/project_settings.py @@ -6,7 +6,7 @@ import yaml -from baram.coredb.app_settings import AppSettings +from baramFlow.coredb.app_settings import AppSettings SETTINGS_FILE_NAME = 'case.cfg.yaml' diff --git a/baram/coredb/reference_values_db.py b/baramFlow/coredb/reference_values_db.py similarity index 100% rename from baram/coredb/reference_values_db.py rename to baramFlow/coredb/reference_values_db.py diff --git a/baram/coredb/region_db.py b/baramFlow/coredb/region_db.py similarity index 94% rename from baram/coredb/region_db.py rename to baramFlow/coredb/region_db.py index 7a01f0b6..76d51285 100644 --- a/baram/coredb/region_db.py +++ b/baramFlow/coredb/region_db.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB, Phase -from baram.coredb.initialization_db import InitializationDB -from baram.coredb.models_db import ModelsDB +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB, Phase +from baramFlow.coredb.initialization_db import InitializationDB +from baramFlow.coredb.models_db import ModelsDB DEFAULT_REGION_NAME = 'region0' diff --git a/baram/coredb/run_calculation_db.py b/baramFlow/coredb/run_calculation_db.py similarity index 100% rename from baram/coredb/run_calculation_db.py rename to baramFlow/coredb/run_calculation_db.py diff --git a/baram/libbaram/__init__.py b/baramFlow/libbaram/__init__.py similarity index 100% rename from baram/libbaram/__init__.py rename to baramFlow/libbaram/__init__.py diff --git a/baram/libbaram/db/__init__.py b/baramFlow/libbaram/db/__init__.py similarity index 100% rename from baram/libbaram/db/__init__.py rename to baramFlow/libbaram/db/__init__.py diff --git a/baram/libbaram/db/schema.py b/baramFlow/libbaram/db/schema.py similarity index 100% rename from baram/libbaram/db/schema.py rename to baramFlow/libbaram/db/schema.py diff --git a/baram/libbaram/db/simple_db.py b/baramFlow/libbaram/db/simple_db.py similarity index 100% rename from baram/libbaram/db/simple_db.py rename to baramFlow/libbaram/db/simple_db.py diff --git a/baram/main.py b/baramFlow/main.py similarity index 81% rename from baram/main.py rename to baramFlow/main.py index 5b1a1ce4..8b1dd2b1 100644 --- a/baram/main.py +++ b/baramFlow/main.py @@ -19,11 +19,11 @@ # noinspection PyUnresolvedReferences import resource_rc -from baram.app import app -from baram.app_properties import AppProperties -from baram.app_plug_in import AppPlugIn -from baram.view.main_window.start_window import Baram -from baram.coredb.app_settings import AppSettings +from baramFlow.app import app +from baramFlow.app_properties import AppProperties +from baramFlow.app_plug_in import AppPlugIn +from baramFlow.view.main_window.start_window import Baram +from baramFlow.coredb.app_settings import AppSettings logger = logging.getLogger() @@ -47,10 +47,10 @@ def handle_exception(eType, eValue, eTraceback): def main(): app.setupApplication(AppProperties({ - 'name': 'baram', - 'fullName': QApplication.translate('Main', 'Baram'), - 'iconResource': 'baram.ico', - 'logoResource': 'baram.ico', + 'name': 'BaramFlow', + 'fullName': QApplication.translate('Main', 'BaramFlow'), + 'iconResource': 'baramFlow.ico', + 'logoResource': 'baramFlow.ico', })) app.setPlug(AppPlugIn()) diff --git a/baram/mesh/__init__.py b/baramFlow/mesh/__init__.py similarity index 100% rename from baram/mesh/__init__.py rename to baramFlow/mesh/__init__.py diff --git a/baram/mesh/mesh_manager.py b/baramFlow/mesh/mesh_manager.py similarity index 95% rename from baram/mesh/mesh_manager.py rename to baramFlow/mesh/mesh_manager.py index 6b24b8d8..7e8c06fb 100644 --- a/baram/mesh/mesh_manager.py +++ b/baramFlow/mesh/mesh_manager.py @@ -7,13 +7,13 @@ from enum import Enum, auto from pathlib import Path -from baram.openfoam.redistribution_task import RedistributionTask +from baramFlow.openfoam.redistribution_task import RedistributionTask from libbaram.run import runUtility, runParallelUtility from widgets.progress_dialog import ProgressDialog -from baram.openfoam import parallel -from baram.openfoam.file_system import FileSystem -from baram.openfoam.polymesh.polymesh_loader import PolyMeshLoader +from baramFlow.openfoam import parallel +from baramFlow.openfoam.file_system import FileSystem +from baramFlow.openfoam.polymesh.polymesh_loader import PolyMeshLoader from libbaram.process import Processor diff --git a/baram/mesh/mesh_model.py b/baramFlow/mesh/mesh_model.py similarity index 98% rename from baram/mesh/mesh_model.py rename to baramFlow/mesh/mesh_model.py index cb6a693a..592ef793 100644 --- a/baram/mesh/mesh_model.py +++ b/baramFlow/mesh/mesh_model.py @@ -3,8 +3,8 @@ from PySide6.QtCore import QObject, Signal -from baram.app import app -from baram.view.main_window.rendering_view import DisplayMode +from baramFlow.app import app +from baramFlow.view.main_window.rendering_view import DisplayMode _applyDisplayMode = { diff --git a/baram/mesh/vtk_loader.py b/baramFlow/mesh/vtk_loader.py similarity index 100% rename from baram/mesh/vtk_loader.py rename to baramFlow/mesh/vtk_loader.py diff --git a/baram/misc/baramd.c b/baramFlow/misc/baramd.c similarity index 100% rename from baram/misc/baramd.c rename to baramFlow/misc/baramd.c diff --git a/baram/misc/test_child.c b/baramFlow/misc/test_child.c similarity index 100% rename from baram/misc/test_child.c rename to baramFlow/misc/test_child.c diff --git a/baram/openfoam/__init__.py b/baramFlow/openfoam/__init__.py similarity index 100% rename from baram/openfoam/__init__.py rename to baramFlow/openfoam/__init__.py diff --git a/baram/openfoam/boundary_conditions/__init__.py b/baramFlow/openfoam/boundary_conditions/__init__.py similarity index 100% rename from baram/openfoam/boundary_conditions/__init__.py rename to baramFlow/openfoam/boundary_conditions/__init__.py diff --git a/baram/openfoam/boundary_conditions/alpha.py b/baramFlow/openfoam/boundary_conditions/alpha.py similarity index 94% rename from baram/openfoam/boundary_conditions/alpha.py rename to baramFlow/openfoam/boundary_conditions/alpha.py index e9934c30..cca4f19b 100644 --- a/baram/openfoam/boundary_conditions/alpha.py +++ b/baramFlow/openfoam/boundary_conditions/alpha.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, ContactAngleModel, InterfaceMode -from baram.coredb.models_db import ModelsDB -from baram.coredb.material_db import MaterialDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, ContactAngleModel, InterfaceMode +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class Alpha(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/alphat.py b/baramFlow/openfoam/boundary_conditions/alphat.py similarity index 94% rename from baram/openfoam/boundary_conditions/alphat.py rename to baramFlow/openfoam/boundary_conditions/alphat.py index 4d927760..cb0e55f4 100644 --- a/baram/openfoam/boundary_conditions/alphat.py +++ b/baramFlow/openfoam/boundary_conditions/alphat.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, WallVelocityCondition, InterfaceMode, WallTemperature -from baram.coredb.models_db import ModelsDB -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, WallVelocityCondition, InterfaceMode, WallTemperature +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class Alphat(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/boundary_condition.py b/baramFlow/openfoam/boundary_conditions/boundary_condition.py similarity index 96% rename from baram/openfoam/boundary_conditions/boundary_condition.py rename to baramFlow/openfoam/boundary_conditions/boundary_condition.py index b6aae0e2..633eacaf 100644 --- a/baram/openfoam/boundary_conditions/boundary_condition.py +++ b/baramFlow/openfoam/boundary_conditions/boundary_condition.py @@ -9,12 +9,12 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile, DataClass -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB -from baram.coredb.models_db import TurbulenceModel -from baram.coredb.region_db import RegionDB -from baram.openfoam.constant.boundary_data import BoundaryData -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.models_db import TurbulenceModel +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.constant.boundary_data import BoundaryData +from baramFlow.openfoam.file_system import FileSystem logger = logging.getLogger(__name__) # logger.setLevel(logging.INFO) diff --git a/baram/openfoam/boundary_conditions/epsilon.py b/baramFlow/openfoam/boundary_conditions/epsilon.py similarity index 95% rename from baram/openfoam/boundary_conditions/epsilon.py rename to baramFlow/openfoam/boundary_conditions/epsilon.py index d2dd8b5d..8694ba66 100644 --- a/baram/openfoam/boundary_conditions/epsilon.py +++ b/baramFlow/openfoam/boundary_conditions/epsilon.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, KEpsilonSpecification, WallVelocityCondition, InterfaceMode -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, KEpsilonSpecification, WallVelocityCondition, InterfaceMode +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class Epsilon(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/k.py b/baramFlow/openfoam/boundary_conditions/k.py similarity index 96% rename from baram/openfoam/boundary_conditions/k.py rename to baramFlow/openfoam/boundary_conditions/k.py index e06f1f08..197d6ff3 100644 --- a/baram/openfoam/boundary_conditions/k.py +++ b/baramFlow/openfoam/boundary_conditions/k.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, KEpsilonSpecification, KOmegaSpecification, InterfaceMode -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, KEpsilonSpecification, KOmegaSpecification, InterfaceMode +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class K(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/nuTilda.py b/baramFlow/openfoam/boundary_conditions/nuTilda.py similarity index 95% rename from baram/openfoam/boundary_conditions/nuTilda.py rename to baramFlow/openfoam/boundary_conditions/nuTilda.py index b595f703..0cb77443 100644 --- a/baram/openfoam/boundary_conditions/nuTilda.py +++ b/baramFlow/openfoam/boundary_conditions/nuTilda.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, SpalartAllmarasSpecification, InterfaceMode -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, SpalartAllmarasSpecification, InterfaceMode +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class NuTilda(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/nut.py b/baramFlow/openfoam/boundary_conditions/nut.py similarity index 94% rename from baram/openfoam/boundary_conditions/nut.py rename to baramFlow/openfoam/boundary_conditions/nut.py index ede09eee..2eab7434 100644 --- a/baram/openfoam/boundary_conditions/nut.py +++ b/baramFlow/openfoam/boundary_conditions/nut.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, WallVelocityCondition, InterfaceMode -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, WallVelocityCondition, InterfaceMode +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class Nut(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/omega.py b/baramFlow/openfoam/boundary_conditions/omega.py similarity index 95% rename from baram/openfoam/boundary_conditions/omega.py rename to baramFlow/openfoam/boundary_conditions/omega.py index 44c4c859..7364cfb0 100644 --- a/baram/openfoam/boundary_conditions/omega.py +++ b/baramFlow/openfoam/boundary_conditions/omega.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, KOmegaSpecification, WallVelocityCondition, InterfaceMode -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, KOmegaSpecification, WallVelocityCondition, InterfaceMode +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class Omega(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/p.py b/baramFlow/openfoam/boundary_conditions/p.py similarity index 93% rename from baram/openfoam/boundary_conditions/p.py rename to baramFlow/openfoam/boundary_conditions/p.py index 9648ae30..ac525dda 100644 --- a/baram/openfoam/boundary_conditions/p.py +++ b/baramFlow/openfoam/boundary_conditions/p.py @@ -1,14 +1,14 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.project import Project -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, InterfaceMode -from baram.coredb.general_db import GeneralDB -from baram.coredb.initialization_db import InitializationDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition -import baram.openfoam.solver -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb.project import Project +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, InterfaceMode +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.initialization_db import InitializationDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +import baramFlow.openfoam.solver +from baramFlow.openfoam.file_system import FileSystem TYPE_MAP = { BoundaryType.VELOCITY_INLET.value: 'calculated', @@ -49,11 +49,11 @@ def __init__(self, region: RegionDB.Region, time, processorNo, field): self._field = field self._usePrgh = False - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() if len(solvers) == 0: # configuration not enough yet raise RuntimeError - cap = baram.openfoam.solver.getSolverCapability(solvers[0]) + cap = baramFlow.openfoam.solver.getSolverCapability(solvers[0]) self._usePrgh = cap['usePrgh'] if field == 'p_rgh' and cap['useGaugePressureInPrgh']: diff --git a/baram/openfoam/boundary_conditions/t.py b/baramFlow/openfoam/boundary_conditions/t.py similarity index 93% rename from baram/openfoam/boundary_conditions/t.py rename to baramFlow/openfoam/boundary_conditions/t.py index ca27cb00..92cd6aaf 100644 --- a/baram/openfoam/boundary_conditions/t.py +++ b/baramFlow/openfoam/boundary_conditions/t.py @@ -1,13 +1,13 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, FlowRateInletSpecification, WallVelocityCondition, WallTemperature -from baram.coredb.boundary_db import TemperatureProfile, TemperatureTemporalDistribution, InterfaceMode -from baram.coredb.material_db import MaterialDB, UNIVERSAL_GAL_CONSTANT -from baram.coredb.models_db import ModelsDB -from baram.coredb.project import Project -from baram.coredb.initialization_db import InitializationDB -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, FlowRateInletSpecification, WallVelocityCondition, WallTemperature +from baramFlow.coredb.boundary_db import TemperatureProfile, TemperatureTemporalDistribution, InterfaceMode +from baramFlow.coredb.material_db import MaterialDB, UNIVERSAL_GAL_CONSTANT +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.project import Project +from baramFlow.coredb.initialization_db import InitializationDB +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition class T(BoundaryCondition): diff --git a/baram/openfoam/boundary_conditions/u.py b/baramFlow/openfoam/boundary_conditions/u.py similarity index 95% rename from baram/openfoam/boundary_conditions/u.py rename to baramFlow/openfoam/boundary_conditions/u.py index 61844567..014b3042 100644 --- a/baram/openfoam/boundary_conditions/u.py +++ b/baramFlow/openfoam/boundary_conditions/u.py @@ -1,12 +1,12 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.project import Project -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, VelocitySpecification, VelocityProfile -from baram.coredb.boundary_db import FlowRateInletSpecification, WallVelocityCondition, InterfaceMode -from baram.coredb.initialization_db import InitializationDB -from baram.coredb.material_db import MaterialDB -from baram.openfoam.boundary_conditions.boundary_condition import BoundaryCondition +from baramFlow.coredb.project import Project +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, VelocitySpecification, VelocityProfile +from baramFlow.coredb.boundary_db import FlowRateInletSpecification, WallVelocityCondition, InterfaceMode +from baramFlow.coredb.initialization_db import InitializationDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.openfoam.boundary_conditions.boundary_condition import BoundaryCondition from libbaram.openfoam.dictionary.dictionary_file import DataClass diff --git a/baram/openfoam/case_generator.py b/baramFlow/openfoam/case_generator.py similarity index 78% rename from baram/openfoam/case_generator.py rename to baramFlow/openfoam/case_generator.py index 2a0706ef..25fa8e58 100644 --- a/baram/openfoam/case_generator.py +++ b/baramFlow/openfoam/case_generator.py @@ -7,35 +7,35 @@ from PySide6.QtCore import QCoreApplication, QObject, Signal -from baram.coredb import coredb -from baram.coredb.region_db import RegionDB -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.openfoam.constant.dynamic_mesh_dict import DynamicMeshDict -from baram.openfoam.constant.thermophysical_properties import ThermophysicalProperties -from baram.openfoam.constant.operating_conditions import OperatingConditions -from baram.openfoam.constant.MRF_properties import MRFProperties -from baram.openfoam.constant.turbulence_properties import TurbulenceProperties -from baram.openfoam.constant.transport_properties import TransportProperties -from baram.openfoam.constant.g import G -from baram.openfoam.constant.region_properties import RegionProperties -from baram.openfoam.boundary_conditions.p import P -from baram.openfoam.boundary_conditions.u import U -from baram.openfoam.boundary_conditions.t import T -from baram.openfoam.boundary_conditions.k import K -from baram.openfoam.boundary_conditions.epsilon import Epsilon -from baram.openfoam.boundary_conditions.omega import Omega -from baram.openfoam.boundary_conditions.nut import Nut -from baram.openfoam.boundary_conditions.nuTilda import NuTilda -from baram.openfoam.boundary_conditions.alphat import Alphat -from baram.openfoam.boundary_conditions.alpha import Alpha -from baram.openfoam.system.fv_solution import FvSolution -from baram.openfoam.system.control_dict import ControlDict -from baram.openfoam.system.fv_schemes import FvSchemes -from baram.openfoam.system.fv_options import FvOptions -from baram.openfoam.system.set_fields_dict import SetFieldsDict -from baram.openfoam.polymesh.boundary import Boundary -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.openfoam.constant.dynamic_mesh_dict import DynamicMeshDict +from baramFlow.openfoam.constant.thermophysical_properties import ThermophysicalProperties +from baramFlow.openfoam.constant.operating_conditions import OperatingConditions +from baramFlow.openfoam.constant.MRF_properties import MRFProperties +from baramFlow.openfoam.constant.turbulence_properties import TurbulenceProperties +from baramFlow.openfoam.constant.transport_properties import TransportProperties +from baramFlow.openfoam.constant.g import G +from baramFlow.openfoam.constant.region_properties import RegionProperties +from baramFlow.openfoam.boundary_conditions.p import P +from baramFlow.openfoam.boundary_conditions.u import U +from baramFlow.openfoam.boundary_conditions.t import T +from baramFlow.openfoam.boundary_conditions.k import K +from baramFlow.openfoam.boundary_conditions.epsilon import Epsilon +from baramFlow.openfoam.boundary_conditions.omega import Omega +from baramFlow.openfoam.boundary_conditions.nut import Nut +from baramFlow.openfoam.boundary_conditions.nuTilda import NuTilda +from baramFlow.openfoam.boundary_conditions.alphat import Alphat +from baramFlow.openfoam.boundary_conditions.alpha import Alpha +from baramFlow.openfoam.system.fv_solution import FvSolution +from baramFlow.openfoam.system.control_dict import ControlDict +from baramFlow.openfoam.system.fv_schemes import FvSchemes +from baramFlow.openfoam.system.fv_options import FvOptions +from baramFlow.openfoam.system.set_fields_dict import SetFieldsDict +from baramFlow.openfoam.polymesh.boundary import Boundary +from baramFlow.openfoam.file_system import FileSystem from libbaram import utils from libbaram.run import runUtility diff --git a/baram/openfoam/constant/MRF_properties.py b/baramFlow/openfoam/constant/MRF_properties.py similarity index 86% rename from baram/openfoam/constant/MRF_properties.py rename to baramFlow/openfoam/constant/MRF_properties.py index 0b03c8cb..cf82fd85 100644 --- a/baram/openfoam/constant/MRF_properties.py +++ b/baramFlow/openfoam/constant/MRF_properties.py @@ -3,10 +3,10 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.cell_zone_db import ZoneType, CellZoneDB -from baram.coredb.boundary_db import BoundaryDB -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import ZoneType, CellZoneDB +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.openfoam.file_system import FileSystem class MRFProperties(DictionaryFile): diff --git a/baram/openfoam/constant/__init__.py b/baramFlow/openfoam/constant/__init__.py similarity index 100% rename from baram/openfoam/constant/__init__.py rename to baramFlow/openfoam/constant/__init__.py diff --git a/baram/openfoam/constant/boundary_data.py b/baramFlow/openfoam/constant/boundary_data.py similarity index 95% rename from baram/openfoam/constant/boundary_data.py rename to baramFlow/openfoam/constant/boundary_data.py index 6456bdc5..bec71660 100644 --- a/baram/openfoam/constant/boundary_data.py +++ b/baramFlow/openfoam/constant/boundary_data.py @@ -3,7 +3,7 @@ import os -from baram.openfoam.file_system import FileSystem +from baramFlow.openfoam.file_system import FileSystem class BoundaryData: diff --git a/baram/openfoam/constant/dynamic_mesh_dict.py b/baramFlow/openfoam/constant/dynamic_mesh_dict.py similarity index 90% rename from baram/openfoam/constant/dynamic_mesh_dict.py rename to baramFlow/openfoam/constant/dynamic_mesh_dict.py index ebc28a13..a1dc14e1 100644 --- a/baram/openfoam/constant/dynamic_mesh_dict.py +++ b/baramFlow/openfoam/constant/dynamic_mesh_dict.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.cell_zone_db import ZoneType, CellZoneDB -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import ZoneType, CellZoneDB +from baramFlow.openfoam.file_system import FileSystem class DynamicMeshDict(DictionaryFile): diff --git a/baram/openfoam/constant/g.py b/baramFlow/openfoam/constant/g.py similarity index 80% rename from baram/openfoam/constant/g.py rename to baramFlow/openfoam/constant/g.py index 4732d754..6698bef5 100644 --- a/baram/openfoam/constant/g.py +++ b/baramFlow/openfoam/constant/g.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.general_db import GeneralDB -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.openfoam.file_system import FileSystem class G(DictionaryFile): diff --git a/baram/openfoam/constant/operating_conditions.py b/baramFlow/openfoam/constant/operating_conditions.py similarity index 82% rename from baram/openfoam/constant/operating_conditions.py rename to baramFlow/openfoam/constant/operating_conditions.py index 030f2a37..39e35669 100644 --- a/baram/openfoam/constant/operating_conditions.py +++ b/baramFlow/openfoam/constant/operating_conditions.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.general_db import GeneralDB -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.openfoam.file_system import FileSystem class OperatingConditions(DictionaryFile): diff --git a/baram/openfoam/constant/region_properties.py b/baramFlow/openfoam/constant/region_properties.py similarity index 87% rename from baram/openfoam/constant/region_properties.py rename to baramFlow/openfoam/constant/region_properties.py index 23c4f2a7..c894206b 100644 --- a/baram/openfoam/constant/region_properties.py +++ b/baramFlow/openfoam/constant/region_properties.py @@ -6,11 +6,11 @@ from libbaram.openfoam.constants import Directory from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.openfoam.file_system import FileLoadingError -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import Phase -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.openfoam.file_system import FileLoadingError +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import Phase +from baramFlow.openfoam.file_system import FileSystem class RegionProperties(DictionaryFile): diff --git a/baram/openfoam/constant/thermophysical_properties.py b/baramFlow/openfoam/constant/thermophysical_properties.py similarity index 98% rename from baram/openfoam/constant/thermophysical_properties.py rename to baramFlow/openfoam/constant/thermophysical_properties.py index 5f09fdcb..bbea7015 100644 --- a/baram/openfoam/constant/thermophysical_properties.py +++ b/baramFlow/openfoam/constant/thermophysical_properties.py @@ -3,8 +3,8 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.openfoam.file_system import FileSystem def _constructFluid(region: str): diff --git a/baram/openfoam/constant/transport_properties.py b/baramFlow/openfoam/constant/transport_properties.py similarity index 92% rename from baram/openfoam/constant/transport_properties.py rename to baramFlow/openfoam/constant/transport_properties.py index f8a93394..67e3bdb7 100644 --- a/baram/openfoam/constant/transport_properties.py +++ b/baramFlow/openfoam/constant/transport_properties.py @@ -5,11 +5,11 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB -from baram.coredb.region_db import RegionDB -import baram.openfoam.solver -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.region_db import RegionDB +import baramFlow.openfoam.solver +from baramFlow.openfoam.file_system import FileSystem class TransportProperties(DictionaryFile): @@ -23,7 +23,7 @@ def build(self): if self._data is not None: return self - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() if len(solvers) == 1 and solvers[0] == 'interFoam': self._data = self._buildForInterFoam() return self diff --git a/baram/openfoam/constant/turbulence_properties.py b/baramFlow/openfoam/constant/turbulence_properties.py similarity index 93% rename from baram/openfoam/constant/turbulence_properties.py rename to baramFlow/openfoam/constant/turbulence_properties.py index 18b008ad..7e301efc 100644 --- a/baram/openfoam/constant/turbulence_properties.py +++ b/baramFlow/openfoam/constant/turbulence_properties.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.models_db import ModelsDB, TurbulenceModel, KEpsilonModel, KOmegaModel -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel, KEpsilonModel, KOmegaModel +from baramFlow.openfoam.file_system import FileSystem class TurbulenceProperties(DictionaryFile): diff --git a/baram/openfoam/file_system.py b/baramFlow/openfoam/file_system.py similarity index 99% rename from baram/openfoam/file_system.py rename to baramFlow/openfoam/file_system.py index 2d55b5cb..06693eff 100644 --- a/baram/openfoam/file_system.py +++ b/baramFlow/openfoam/file_system.py @@ -11,7 +11,7 @@ from libbaram import utils from libbaram.openfoam.constants import Directory -from baram.coredb.project import Project +from baramFlow.coredb.project import Project class FileLoadingError(Exception): diff --git a/baram/openfoam/parallel.py b/baramFlow/openfoam/parallel.py similarity index 81% rename from baram/openfoam/parallel.py rename to baramFlow/openfoam/parallel.py index fd116481..07523ad9 100644 --- a/baram/openfoam/parallel.py +++ b/baramFlow/openfoam/parallel.py @@ -3,13 +3,13 @@ from libbaram.mpi import ParallelType, ParallelEnvironment -from baram.coredb import coredb -from baram.coredb.project import Project +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project def getNP() -> int: numCoresStr = Project.instance().np - if numCoresStr is None: # For compatibility. Remove this block after 20240601 + if numCoresStr is None: # ToDo: For compatibility. Remove this code block after 20240601 numCoresStr = coredb.CoreDB().getValue('.//parallel/numberOfCores') Project.instance().np = numCoresStr @@ -18,7 +18,7 @@ def getNP() -> int: def getParallelType() -> ParallelType: ptypeStr = Project.instance().pType - if ptypeStr is None: # For compatibility. Remove this block after 20240601 + if ptypeStr is None: # ToDo: For compatibility. Remove this code block after 20240601 if coredb.CoreDB().getValue('.//parallel/localhost') == 'true': ptypeStr = ParallelType.LOCAL_MACHINE.value else: diff --git a/baram/openfoam/polymesh/__init__.py b/baramFlow/openfoam/polymesh/__init__.py similarity index 100% rename from baram/openfoam/polymesh/__init__.py rename to baramFlow/openfoam/polymesh/__init__.py diff --git a/baram/openfoam/polymesh/boundary.py b/baramFlow/openfoam/polymesh/boundary.py similarity index 97% rename from baram/openfoam/polymesh/boundary.py rename to baramFlow/openfoam/polymesh/boundary.py index 3cf7614b..ae55a153 100644 --- a/baram/openfoam/polymesh/boundary.py +++ b/baramFlow/openfoam/polymesh/boundary.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryType, BoundaryDB, InterfaceMode -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryType, BoundaryDB, InterfaceMode +from baramFlow.openfoam.file_system import FileSystem from .polymesh_loader import PolyMeshLoader diff --git a/baram/openfoam/polymesh/polymesh_loader.py b/baramFlow/openfoam/polymesh/polymesh_loader.py similarity index 95% rename from baram/openfoam/polymesh/polymesh_loader.py rename to baramFlow/openfoam/polymesh/polymesh_loader.py index d171f148..fd514309 100644 --- a/baram/openfoam/polymesh/polymesh_loader.py +++ b/baramFlow/openfoam/polymesh/polymesh_loader.py @@ -17,13 +17,13 @@ from libbaram.openfoam.constants import Directory -from baram.app import app -from baram.coredb import coredb -from baram.coredb.project import Project -from baram.coredb.cell_zone_db import CellZoneDB -from baram.openfoam.file_system import FileSystem, FileLoadingError -from baram.openfoam.constant.region_properties import RegionProperties -from baram.mesh.mesh_model import ActorInfo, MeshModel +from baramFlow.app import app +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project +from baramFlow.coredb.cell_zone_db import CellZoneDB +from baramFlow.openfoam.file_system import FileSystem, FileLoadingError +from baramFlow.openfoam.constant.region_properties import RegionProperties +from baramFlow.mesh.mesh_model import ActorInfo, MeshModel logger = logging.getLogger(__name__) diff --git a/baram/openfoam/porous.py b/baramFlow/openfoam/porous.py similarity index 94% rename from baram/openfoam/porous.py rename to baramFlow/openfoam/porous.py index ad2ecd27..5eef40af 100644 --- a/baram/openfoam/porous.py +++ b/baramFlow/openfoam/porous.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb import coredb -from baram.coredb.cell_zone_db import CellZoneDB, PorousZoneModel +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import CellZoneDB, PorousZoneModel class Porous: diff --git a/baram/openfoam/post_processing/__init__.py b/baramFlow/openfoam/post_processing/__init__.py similarity index 100% rename from baram/openfoam/post_processing/__init__.py rename to baramFlow/openfoam/post_processing/__init__.py diff --git a/baram/openfoam/post_processing/monitor.py b/baramFlow/openfoam/post_processing/monitor.py similarity index 93% rename from baram/openfoam/post_processing/monitor.py rename to baramFlow/openfoam/post_processing/monitor.py index cb9c7c52..592d7f34 100644 --- a/baram/openfoam/post_processing/monitor.py +++ b/baramFlow/openfoam/post_processing/monitor.py @@ -6,15 +6,15 @@ import pandas as pd from PySide6.QtCore import QThread, QObject, QTimer, Signal, Qt -from baram.coredb import coredb -from baram.coredb.project import Project -from baram.coredb.monitor_db import MonitorDB -from baram.coredb.general_db import GeneralDB -from baram.coredb.run_calculation_db import RunCalculationDB -from baram.coredb.monitor_db import FieldHelper -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.cell_zone_db import CellZoneDB -from baram.openfoam.post_processing.post_file_reader import PostFileReader +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project +from baramFlow.coredb.monitor_db import MonitorDB +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.run_calculation_db import RunCalculationDB +from baramFlow.coredb.monitor_db import FieldHelper +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.cell_zone_db import CellZoneDB +from baramFlow.openfoam.post_processing.post_file_reader import PostFileReader def calculateMaxX(): diff --git a/baram/openfoam/post_processing/post_file_reader.py b/baramFlow/openfoam/post_processing/post_file_reader.py similarity index 98% rename from baram/openfoam/post_processing/post_file_reader.py rename to baramFlow/openfoam/post_processing/post_file_reader.py index 142d3829..38280896 100644 --- a/baram/openfoam/post_processing/post_file_reader.py +++ b/baramFlow/openfoam/post_processing/post_file_reader.py @@ -6,7 +6,7 @@ import pandas as pd from PySide6.QtCore import QObject -from baram.openfoam.file_system import FileSystem +from baramFlow.openfoam.file_system import FileSystem class PostFileReader(QObject): diff --git a/baram/openfoam/redistribution_task.py b/baramFlow/openfoam/redistribution_task.py similarity index 93% rename from baram/openfoam/redistribution_task.py rename to baramFlow/openfoam/redistribution_task.py index 18f6eada..14d19abb 100644 --- a/baram/openfoam/redistribution_task.py +++ b/baramFlow/openfoam/redistribution_task.py @@ -10,10 +10,10 @@ from libbaram.run import runUtility from libbaram.openfoam.dictionary.decomposePar_dict import DecomposeParDict -from baram.coredb import coredb -from baram.openfoam.file_system import FileSystem -from baram.openfoam import parallel -from baram.openfoam.polymesh.polymesh_loader import PolyMeshLoader +from baramFlow.coredb import coredb +from baramFlow.openfoam.file_system import FileSystem +from baramFlow.openfoam import parallel +from baramFlow.openfoam.polymesh.polymesh_loader import PolyMeshLoader logger = logging.getLogger(__name__) diff --git a/baram/openfoam/solver.py b/baramFlow/openfoam/solver.py similarity index 98% rename from baram/openfoam/solver.py rename to baramFlow/openfoam/solver.py index 58a4b3fc..9cbb0703 100644 --- a/baram/openfoam/solver.py +++ b/baramFlow/openfoam/solver.py @@ -5,7 +5,7 @@ import pandas as pd -from baram.coredb import coredb +from baramFlow.coredb import coredb from resources import resource availableSolvers = pd.read_csv(resource.file('openfoam/solvers.csv'), header=0, index_col=0).transpose().to_dict() diff --git a/baram/openfoam/solver_info_manager.py b/baramFlow/openfoam/solver_info_manager.py similarity index 99% rename from baram/openfoam/solver_info_manager.py rename to baramFlow/openfoam/solver_info_manager.py index a4e0f4fb..8ad2ccf0 100644 --- a/baram/openfoam/solver_info_manager.py +++ b/baramFlow/openfoam/solver_info_manager.py @@ -12,7 +12,7 @@ import numpy as np import pandas as pd -from baram.coredb.project import Project +from baramFlow.coredb.project import Project from PySide6.QtCore import Qt, QTimer, QObject, QThread, Signal diff --git a/baram/openfoam/system/__init__.py b/baramFlow/openfoam/system/__init__.py similarity index 100% rename from baram/openfoam/system/__init__.py rename to baramFlow/openfoam/system/__init__.py diff --git a/baram/openfoam/system/control_dict.py b/baramFlow/openfoam/system/control_dict.py similarity index 94% rename from baram/openfoam/system/control_dict.py rename to baramFlow/openfoam/system/control_dict.py index a32af0e8..3bdc5232 100644 --- a/baram/openfoam/system/control_dict.py +++ b/baramFlow/openfoam/system/control_dict.py @@ -3,18 +3,18 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -import baram.openfoam.solver -from baram.coredb import coredb -from baram.coredb.general_db import GeneralDB -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.cell_zone_db import CellZoneDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB, Phase -from baram.coredb.monitor_db import MonitorDB, FieldHelper, SurfaceReportType, VolumeReportType -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.coredb.run_calculation_db import RunCalculationDB, TimeSteppingMethod -from baram.coredb.reference_values_db import ReferenceValuesDB -from baram.openfoam.file_system import FileSystem +import baramFlow.openfoam.solver +from baramFlow.coredb import coredb +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.cell_zone_db import CellZoneDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB, Phase +from baramFlow.coredb.monitor_db import MonitorDB, FieldHelper, SurfaceReportType, VolumeReportType +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.coredb.run_calculation_db import RunCalculationDB, TimeSteppingMethod +from baramFlow.coredb.reference_values_db import ReferenceValuesDB +from baramFlow.openfoam.file_system import FileSystem SURFACE_MONITOR_OPERATION = { @@ -40,11 +40,11 @@ def _getAvailableFields(): fields = ['U'] - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() if len(solvers) == 0: # configuration not enough yet raise RuntimeError - cap = baram.openfoam.solver.getSolverCapability(solvers[0]) + cap = baramFlow.openfoam.solver.getSolverCapability(solvers[0]) if cap['usePrgh']: fields.append('p_rgh') else: @@ -134,7 +134,7 @@ def build(self): self._db = coredb.CoreDB() xpath = RunCalculationDB.RUN_CALCULATION_XPATH + '/runConditions' - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() if len(solvers) != 1: # configuration not enough yet solvers = ['solver'] # raise RuntimeError diff --git a/baram/openfoam/system/fv_options.py b/baramFlow/openfoam/system/fv_options.py similarity index 98% rename from baram/openfoam/system/fv_options.py rename to baramFlow/openfoam/system/fv_options.py index 32a384b3..0c222a21 100644 --- a/baram/openfoam/system/fv_options.py +++ b/baramFlow/openfoam/system/fv_options.py @@ -5,11 +5,11 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.cell_zone_db import CellZoneDB -from baram.coredb.material_db import MaterialDB -from baram.coredb.models_db import ModelsDB -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import CellZoneDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.openfoam.file_system import FileSystem logger = logging.getLogger(__name__) diff --git a/baram/openfoam/system/fv_schemes.py b/baramFlow/openfoam/system/fv_schemes.py similarity index 97% rename from baram/openfoam/system/fv_schemes.py rename to baramFlow/openfoam/system/fv_schemes.py index f13f735f..a0d05193 100644 --- a/baram/openfoam/system/fv_schemes.py +++ b/baramFlow/openfoam/system/fv_schemes.py @@ -4,9 +4,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -import baram.openfoam.solver -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +import baramFlow.openfoam.solver +from baramFlow.openfoam.file_system import FileSystem class FvSchemes(DictionaryFile): @@ -24,12 +24,12 @@ def build(self): if self._data is not None: return self - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() if len(solvers) != 1: # configuration not enough yet raise RuntimeError solver = solvers[0] - self._cap = baram.openfoam.solver.getSolverCapability(solver) + self._cap = baramFlow.openfoam.solver.getSolverCapability(solver) mid = self._db.getValue(f'.//region[name="{self._rname}"]/material') phase = self._db.getValue(f'.//materials/material[@mid="{mid}"]/phase') diff --git a/baram/openfoam/system/fv_solution.py b/baramFlow/openfoam/system/fv_solution.py similarity index 96% rename from baram/openfoam/system/fv_solution.py rename to baramFlow/openfoam/system/fv_solution.py index e28dc9cc..292479c6 100644 --- a/baram/openfoam/system/fv_solution.py +++ b/baramFlow/openfoam/system/fv_solution.py @@ -3,15 +3,15 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.numerical_db import NumericalDB, PressureVelocityCouplingScheme -from baram.coredb.general_db import GeneralDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import Phase -from baram.coredb.models_db import ModelsDB -from baram.coredb.reference_values_db import ReferenceValuesDB -from baram.coredb.material_db import MaterialDB -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.numerical_db import NumericalDB, PressureVelocityCouplingScheme +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import Phase +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.reference_values_db import ReferenceValuesDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.openfoam.file_system import FileSystem class FvSolution(DictionaryFile): diff --git a/baram/openfoam/system/set_fields_dict.py b/baramFlow/openfoam/system/set_fields_dict.py similarity index 96% rename from baram/openfoam/system/set_fields_dict.py rename to baramFlow/openfoam/system/set_fields_dict.py index 1c1edc0b..007af0be 100644 --- a/baram/openfoam/system/set_fields_dict.py +++ b/baramFlow/openfoam/system/set_fields_dict.py @@ -3,11 +3,11 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB -from baram.coredb.cell_zone_db import CellZoneDB +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.cell_zone_db import CellZoneDB -from baram.openfoam.file_system import FileSystem +from baramFlow.openfoam.file_system import FileSystem class SetFieldsDict(DictionaryFile): diff --git a/baram/test/__init__.py b/baramFlow/test/__init__.py similarity index 100% rename from baram/test/__init__.py rename to baramFlow/test/__init__.py diff --git a/baram/test/test_coredb/__init__.py b/baramFlow/test/test_coredb/__init__.py similarity index 100% rename from baram/test/test_coredb/__init__.py rename to baramFlow/test/test_coredb/__init__.py diff --git a/baram/test/test_coredb/coredb_xml/v1.xml b/baramFlow/test/test_coredb/coredb_xml/v1.xml similarity index 100% rename from baram/test/test_coredb/coredb_xml/v1.xml rename to baramFlow/test/test_coredb/coredb_xml/v1.xml diff --git a/baram/test/test_coredb/coredb_xml/v1a.xml b/baramFlow/test/test_coredb/coredb_xml/v1a.xml similarity index 100% rename from baram/test/test_coredb/coredb_xml/v1a.xml rename to baramFlow/test/test_coredb/coredb_xml/v1a.xml diff --git a/baram/test/test_coredb/test_attribute.py b/baramFlow/test/test_coredb/test_attribute.py similarity index 96% rename from baram/test/test_coredb/test_attribute.py rename to baramFlow/test/test_coredb/test_attribute.py index ac777267..9f936c11 100644 --- a/baram/test/test_coredb/test_attribute.py +++ b/baramFlow/test/test_coredb/test_attribute.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestAttribute(unittest.TestCase): diff --git a/baram/test/test_coredb/test_boundary_condition.py b/baramFlow/test/test_coredb/test_boundary_condition.py similarity index 97% rename from baram/test/test_coredb/test_boundary_condition.py rename to baramFlow/test/test_coredb/test_boundary_condition.py index 4f497a43..d2e62929 100644 --- a/baram/test/test_coredb/test_boundary_condition.py +++ b/baramFlow/test/test_coredb/test_boundary_condition.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestBoundaryCondition(unittest.TestCase): diff --git a/baram/test/test_coredb/test_cell_zones.py b/baramFlow/test/test_coredb/test_cell_zones.py similarity index 98% rename from baram/test/test_coredb/test_cell_zones.py rename to baramFlow/test/test_coredb/test_cell_zones.py index e0a30342..46a3b761 100644 --- a/baram/test/test_coredb/test_cell_zones.py +++ b/baramFlow/test/test_coredb/test_cell_zones.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestCellZones(unittest.TestCase): diff --git a/baram/test/test_coredb/test_config_count.py b/baramFlow/test/test_coredb/test_config_count.py similarity index 98% rename from baram/test/test_coredb/test_config_count.py rename to baramFlow/test/test_coredb/test_config_count.py index 8a81aa05..11bece71 100644 --- a/baram/test/test_coredb/test_config_count.py +++ b/baramFlow/test/test_coredb/test_config_count.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestConfigCount(unittest.TestCase): diff --git a/baram/test/test_coredb/test_context_manager.py b/baramFlow/test/test_coredb/test_context_manager.py similarity index 97% rename from baram/test/test_coredb/test_context_manager.py rename to baramFlow/test/test_coredb/test_context_manager.py index a4b7df57..ebcd959b 100644 --- a/baram/test/test_coredb/test_context_manager.py +++ b/baramFlow/test/test_coredb/test_context_manager.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestContextManager(unittest.TestCase): diff --git a/baram/test/test_coredb/test_enumeration_string.py b/baramFlow/test/test_coredb/test_enumeration_string.py similarity index 95% rename from baram/test/test_coredb/test_enumeration_string.py rename to baramFlow/test/test_coredb/test_enumeration_string.py index 9d492cc2..1380b641 100644 --- a/baram/test/test_coredb/test_enumeration_string.py +++ b/baramFlow/test/test_coredb/test_enumeration_string.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestEnumerationString(unittest.TestCase): diff --git a/baram/test/test_coredb/test_input_number_list_type.py b/baramFlow/test/test_coredb/test_input_number_list_type.py similarity index 96% rename from baram/test/test_coredb/test_input_number_list_type.py rename to baramFlow/test/test_coredb/test_input_number_list_type.py index 5329c07e..b3c51202 100644 --- a/baram/test/test_coredb/test_input_number_list_type.py +++ b/baramFlow/test/test_coredb/test_input_number_list_type.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestInputNumberListType(unittest.TestCase): diff --git a/baram/test/test_coredb/test_input_number_type_with_restriction.py b/baramFlow/test/test_coredb/test_input_number_type_with_restriction.py similarity index 98% rename from baram/test/test_coredb/test_input_number_type_with_restriction.py rename to baramFlow/test/test_coredb/test_input_number_type_with_restriction.py index c4caee90..bb3f3038 100644 --- a/baram/test/test_coredb/test_input_number_type_with_restriction.py +++ b/baramFlow/test/test_coredb/test_input_number_type_with_restriction.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestInputNumberTypeWithRestriction(unittest.TestCase): diff --git a/baram/test/test_coredb/test_input_number_type_without_restriction.py b/baramFlow/test/test_coredb/test_input_number_type_without_restriction.py similarity index 98% rename from baram/test/test_coredb/test_input_number_type_without_restriction.py rename to baramFlow/test/test_coredb/test_input_number_type_without_restriction.py index 4624a188..84469383 100644 --- a/baram/test/test_coredb/test_input_number_type_without_restriction.py +++ b/baramFlow/test/test_coredb/test_input_number_type_without_restriction.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestInputNumberTypeWithoutRestriction(unittest.TestCase): diff --git a/baram/test/test_coredb/test_material.py b/baramFlow/test/test_coredb/test_material.py similarity index 99% rename from baram/test/test_coredb/test_material.py rename to baramFlow/test/test_coredb/test_material.py index 87f99b29..9ec85b90 100644 --- a/baram/test/test_coredb/test_material.py +++ b/baramFlow/test/test_coredb/test_material.py @@ -1,7 +1,7 @@ import unittest import pprint -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestMaterial(unittest.TestCase): diff --git a/baram/test/test_coredb/test_material_db.py b/baramFlow/test/test_coredb/test_material_db.py similarity index 96% rename from baram/test/test_coredb/test_material_db.py rename to baramFlow/test/test_coredb/test_material_db.py index 70363dc4..3ff63b4d 100644 --- a/baram/test/test_coredb/test_material_db.py +++ b/baramFlow/test/test_coredb/test_material_db.py @@ -1,7 +1,7 @@ import unittest -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB, UNIVERSAL_GAL_CONSTANT +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB, UNIVERSAL_GAL_CONSTANT class TestMaterialDB(unittest.TestCase): diff --git a/baram/test/test_coredb/test_migration.py b/baramFlow/test/test_coredb/test_migration.py similarity index 90% rename from baram/test/test_coredb/test_migration.py rename to baramFlow/test/test_coredb/test_migration.py index d2cbb0b1..9e6b2263 100644 --- a/baram/test/test_coredb/test_migration.py +++ b/baramFlow/test/test_coredb/test_migration.py @@ -6,8 +6,8 @@ from lxml import etree -from baram.coredb import migrate -from baram.coredb import coredb +from baramFlow.coredb import migrate +from baramFlow.coredb import coredb class TestMigration(unittest.TestCase): diff --git a/baram/test/test_coredb/test_monitors.py b/baramFlow/test/test_coredb/test_monitors.py similarity index 97% rename from baram/test/test_coredb/test_monitors.py rename to baramFlow/test/test_coredb/test_monitors.py index 08e8c586..9a9aeace 100644 --- a/baram/test/test_coredb/test_monitors.py +++ b/baramFlow/test/test_coredb/test_monitors.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestMonitors(unittest.TestCase): diff --git a/baram/test/test_coredb/test_non_negative_integer.py b/baramFlow/test/test_coredb/test_non_negative_integer.py similarity index 97% rename from baram/test/test_coredb/test_non_negative_integer.py rename to baramFlow/test/test_coredb/test_non_negative_integer.py index 4c61e193..d245b6fb 100644 --- a/baram/test/test_coredb/test_non_negative_integer.py +++ b/baramFlow/test/test_coredb/test_non_negative_integer.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestNonNegativeInteger(unittest.TestCase): diff --git a/baram/test/test_coredb/test_positve_integer.py b/baramFlow/test/test_coredb/test_positve_integer.py similarity index 97% rename from baram/test/test_coredb/test_positve_integer.py rename to baramFlow/test/test_coredb/test_positve_integer.py index 77b4fbc8..28f15d6f 100644 --- a/baram/test/test_coredb/test_positve_integer.py +++ b/baramFlow/test/test_coredb/test_positve_integer.py @@ -1,6 +1,6 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb class TestPositiveInteger(unittest.TestCase): diff --git a/baram/test/test_openfoam/__init__.py b/baramFlow/test/test_openfoam/__init__.py similarity index 100% rename from baram/test/test_openfoam/__init__.py rename to baramFlow/test/test_openfoam/__init__.py diff --git a/baram/test/test_openfoam/test_MRF_properties.py b/baramFlow/test/test_openfoam/test_MRF_properties.py similarity index 93% rename from baram/test/test_openfoam/test_MRF_properties.py rename to baramFlow/test/test_openfoam/test_MRF_properties.py index 077937a7..8d780282 100644 --- a/baram/test/test_openfoam/test_MRF_properties.py +++ b/baramFlow/test/test_openfoam/test_MRF_properties.py @@ -3,8 +3,8 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.constant.MRF_properties import MRFProperties +from baramFlow.coredb import coredb +from baramFlow.openfoam.constant.MRF_properties import MRFProperties class TestMRFProperties(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_alpha.py b/baramFlow/test/test_openfoam/test_alpha.py similarity index 97% rename from baram/test/test_openfoam/test_alpha.py rename to baramFlow/test/test_openfoam/test_alpha.py index edf482a9..d30d45db 100644 --- a/baram/test/test_openfoam/test_alpha.py +++ b/baramFlow/test/test_openfoam/test_alpha.py @@ -1,9 +1,9 @@ import unittest -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.alpha import Alpha +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.alpha import Alpha dimensions = '[0 0 0 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_alphat.py b/baramFlow/test/test_openfoam/test_alphat.py similarity index 97% rename from baram/test/test_openfoam/test_alphat.py rename to baramFlow/test/test_openfoam/test_alphat.py index 2efc2cd6..73f5461f 100644 --- a/baram/test/test_openfoam/test_alphat.py +++ b/baramFlow/test/test_openfoam/test_alphat.py @@ -1,10 +1,10 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.boundary_conditions.alphat import Alphat -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB +from baramFlow.coredb import coredb +from baramFlow.openfoam.boundary_conditions.alphat import Alphat +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB dimensions = '[1 -1 -1 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_control_dict.py b/baramFlow/test/test_openfoam/test_control_dict.py similarity index 98% rename from baram/test/test_openfoam/test_control_dict.py rename to baramFlow/test/test_openfoam/test_control_dict.py index 578e1f84..b6a4c434 100644 --- a/baram/test/test_openfoam/test_control_dict.py +++ b/baramFlow/test/test_openfoam/test_control_dict.py @@ -1,9 +1,9 @@ import unittest -from baram.coredb import coredb -from baram.coredb.monitor_db import MonitorDB, Field, SurfaceReportType, VolumeReportType -from baram.coredb.reference_values_db import ReferenceValuesDB -from baram.openfoam.system.control_dict import ControlDict +from baramFlow.coredb import coredb +from baramFlow.coredb.monitor_db import MonitorDB, Field, SurfaceReportType, VolumeReportType +from baramFlow.coredb.reference_values_db import ReferenceValuesDB +from baramFlow.openfoam.system.control_dict import ControlDict rname = 'testRegion_1' boundary = 'testBoundary_1' diff --git a/baram/test/test_openfoam/test_decomposePar_dict.py b/baramFlow/test/test_openfoam/test_decomposePar_dict.py similarity index 95% rename from baram/test/test_openfoam/test_decomposePar_dict.py rename to baramFlow/test/test_openfoam/test_decomposePar_dict.py index 056d6639..84fbf6f8 100644 --- a/baram/test/test_openfoam/test_decomposePar_dict.py +++ b/baramFlow/test/test_openfoam/test_decomposePar_dict.py @@ -3,7 +3,7 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb from libbaram.openfoam.dictionary.decomposePar_dict import DecomposeParDict diff --git a/baram/test/test_openfoam/test_dynamic_mesh_dict.py b/baramFlow/test/test_openfoam/test_dynamic_mesh_dict.py similarity index 94% rename from baram/test/test_openfoam/test_dynamic_mesh_dict.py rename to baramFlow/test/test_openfoam/test_dynamic_mesh_dict.py index aabf2fba..1bf7dabf 100644 --- a/baram/test/test_openfoam/test_dynamic_mesh_dict.py +++ b/baramFlow/test/test_openfoam/test_dynamic_mesh_dict.py @@ -1,7 +1,7 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.constant.dynamic_mesh_dict import DynamicMeshDict +from baramFlow.coredb import coredb +from baramFlow.openfoam.constant.dynamic_mesh_dict import DynamicMeshDict class TestDynamicMeshDict(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_epsilon.py b/baramFlow/test/test_openfoam/test_epsilon.py similarity index 98% rename from baram/test/test_openfoam/test_epsilon.py rename to baramFlow/test/test_openfoam/test_epsilon.py index 62a51f15..98aa43fc 100644 --- a/baram/test/test_openfoam/test_epsilon.py +++ b/baramFlow/test/test_openfoam/test_epsilon.py @@ -1,11 +1,11 @@ import unittest -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB -from baram.openfoam.boundary_conditions.epsilon import Epsilon +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.openfoam.boundary_conditions.epsilon import Epsilon dimensions = '[0 2 -3 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_fv_options.py b/baramFlow/test/test_openfoam/test_fv_options.py similarity index 99% rename from baram/test/test_openfoam/test_fv_options.py rename to baramFlow/test/test_openfoam/test_fv_options.py index cdde8c7c..7d15b578 100644 --- a/baram/test/test_openfoam/test_fv_options.py +++ b/baramFlow/test/test_openfoam/test_fv_options.py @@ -3,8 +3,8 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.system.fv_options import FvOptions +from baramFlow.coredb import coredb +from baramFlow.openfoam.system.fv_options import FvOptions class TestFvOptions(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_fv_schemes.py b/baramFlow/test/test_openfoam/test_fv_schemes.py similarity index 98% rename from baram/test/test_openfoam/test_fv_schemes.py rename to baramFlow/test/test_openfoam/test_fv_schemes.py index 2ae641ea..3ad6f61b 100644 --- a/baram/test/test_openfoam/test_fv_schemes.py +++ b/baramFlow/test/test_openfoam/test_fv_schemes.py @@ -1,7 +1,7 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.system.fv_schemes import FvSchemes +from baramFlow.coredb import coredb +from baramFlow.openfoam.system.fv_schemes import FvSchemes class TestFvSchemes(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_fv_solution.py b/baramFlow/test/test_openfoam/test_fv_solution.py similarity index 97% rename from baram/test/test_openfoam/test_fv_solution.py rename to baramFlow/test/test_openfoam/test_fv_solution.py index c08e09eb..9afda82d 100644 --- a/baram/test/test_openfoam/test_fv_solution.py +++ b/baramFlow/test/test_openfoam/test_fv_solution.py @@ -1,12 +1,12 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.system.fv_solution import FvSolution -from baram.coredb.general_db import GeneralDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB -from baram.coredb.numerical_db import NumericalDB -from baram.coredb.reference_values_db import ReferenceValuesDB +from baramFlow.coredb import coredb +from baramFlow.openfoam.system.fv_solution import FvSolution +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.numerical_db import NumericalDB +from baramFlow.coredb.reference_values_db import ReferenceValuesDB rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_g.py b/baramFlow/test/test_openfoam/test_g.py similarity index 84% rename from baram/test/test_openfoam/test_g.py rename to baramFlow/test/test_openfoam/test_g.py index 035a0773..8486ce42 100644 --- a/baram/test/test_openfoam/test_g.py +++ b/baramFlow/test/test_openfoam/test_g.py @@ -1,8 +1,8 @@ import unittest -from baram.coredb import coredb -from baram.coredb.models_db import ModelsDB -from baram.openfoam.constant.g import G +from baramFlow.coredb import coredb +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.openfoam.constant.g import G class TestG(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_k.py b/baramFlow/test/test_openfoam/test_k.py similarity index 98% rename from baram/test/test_openfoam/test_k.py rename to baramFlow/test/test_openfoam/test_k.py index d2bf0d72..36380d91 100644 --- a/baram/test/test_openfoam/test_k.py +++ b/baramFlow/test/test_openfoam/test_k.py @@ -1,10 +1,10 @@ import unittest -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.k import K +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.k import K dimensions = '[0 2 -2 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_nuTilda.py b/baramFlow/test/test_openfoam/test_nuTilda.py similarity index 97% rename from baram/test/test_openfoam/test_nuTilda.py rename to baramFlow/test/test_openfoam/test_nuTilda.py index 4755cfd0..1bb12a6b 100644 --- a/baram/test/test_openfoam/test_nuTilda.py +++ b/baramFlow/test/test_openfoam/test_nuTilda.py @@ -1,11 +1,11 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.boundary_conditions.nuTilda import NuTilda -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB +from baramFlow.coredb import coredb +from baramFlow.openfoam.boundary_conditions.nuTilda import NuTilda +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB dimensions = '[0 2 -1 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_nut.py b/baramFlow/test/test_openfoam/test_nut.py similarity index 97% rename from baram/test/test_openfoam/test_nut.py rename to baramFlow/test/test_openfoam/test_nut.py index 28a536a1..e1928a6f 100644 --- a/baram/test/test_openfoam/test_nut.py +++ b/baramFlow/test/test_openfoam/test_nut.py @@ -1,11 +1,11 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.boundary_conditions.nut import Nut -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB +from baramFlow.coredb import coredb +from baramFlow.openfoam.boundary_conditions.nut import Nut +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB dimensions = '[0 2 -1 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_omega.py b/baramFlow/test/test_openfoam/test_omega.py similarity index 98% rename from baram/test/test_openfoam/test_omega.py rename to baramFlow/test/test_openfoam/test_omega.py index 96b21cc9..8897adc8 100644 --- a/baram/test/test_openfoam/test_omega.py +++ b/baramFlow/test/test_openfoam/test_omega.py @@ -1,11 +1,11 @@ import unittest -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB -from baram.openfoam.boundary_conditions.omega import Omega +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.openfoam.boundary_conditions.omega import Omega dimensions = '[0 0 -1 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_operating_conditions.py b/baramFlow/test/test_openfoam/test_operating_conditions.py similarity index 84% rename from baram/test/test_openfoam/test_operating_conditions.py rename to baramFlow/test/test_openfoam/test_operating_conditions.py index ceb0c7c5..225ec686 100644 --- a/baram/test/test_openfoam/test_operating_conditions.py +++ b/baramFlow/test/test_openfoam/test_operating_conditions.py @@ -1,7 +1,7 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.constant.operating_conditions import OperatingConditions +from baramFlow.coredb import coredb +from baramFlow.openfoam.constant.operating_conditions import OperatingConditions class TestOperatingConditions(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_p.py b/baramFlow/test/test_openfoam/test_p.py similarity index 96% rename from baram/test/test_openfoam/test_p.py rename to baramFlow/test/test_openfoam/test_p.py index 63a49fa4..57703108 100644 --- a/baram/test/test_openfoam/test_p.py +++ b/baramFlow/test/test_openfoam/test_p.py @@ -3,15 +3,15 @@ import shutil from pathlib import Path -from baram.coredb import coredb -from baram.coredb.project import Project, _Project -from baram.coredb.filedb import FileDB, BcFileRole -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.general_db import GeneralDB -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.p import P -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project, _Project +from baramFlow.coredb.filedb import FileDB, BcFileRole +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.p import P +from baramFlow.openfoam.file_system import FileSystem dimensions = '[1 -1 -2 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_p_caculated.py b/baramFlow/test/test_openfoam/test_p_caculated.py similarity index 97% rename from baram/test/test_openfoam/test_p_caculated.py rename to baramFlow/test/test_openfoam/test_p_caculated.py index da02c8a2..b36ce0d4 100644 --- a/baram/test/test_openfoam/test_p_caculated.py +++ b/baramFlow/test/test_openfoam/test_p_caculated.py @@ -1,10 +1,10 @@ import unittest -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.general_db import GeneralDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.p import P +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.p import P dimensions = '[1 -1 -2 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_p_rgh.py b/baramFlow/test/test_openfoam/test_p_rgh.py similarity index 97% rename from baram/test/test_openfoam/test_p_rgh.py rename to baramFlow/test/test_openfoam/test_p_rgh.py index 19dac919..a117dabe 100644 --- a/baram/test/test_openfoam/test_p_rgh.py +++ b/baramFlow/test/test_openfoam/test_p_rgh.py @@ -4,14 +4,14 @@ from unittest.mock import MagicMock, patch from pathlib import Path -from baram.coredb import coredb -from baram.coredb.project import Project, _Project -from baram.coredb.filedb import FileDB, BcFileRole -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.general_db import GeneralDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.p import P -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project, _Project +from baramFlow.coredb.filedb import FileDB, BcFileRole +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.p import P +from baramFlow.openfoam.file_system import FileSystem dimensions = '[1 -1 -2 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_solver.py b/baramFlow/test/test_openfoam/test_solver.py similarity index 89% rename from baram/test/test_openfoam/test_solver.py rename to baramFlow/test/test_openfoam/test_solver.py index 81faf452..6e07533e 100644 --- a/baram/test/test_openfoam/test_solver.py +++ b/baramFlow/test/test_openfoam/test_solver.py @@ -1,7 +1,7 @@ import unittest -from baram.coredb import coredb -import baram.openfoam.solver +from baramFlow.coredb import coredb +import baramFlow.openfoam.solver class TestSolver(unittest.TestCase): @@ -25,7 +25,7 @@ def testFindingPCNFoamForTransient(self): self.db.setValue('.//models/multiphaseModels/model', 'off') self.db.setValue('.//models/speciesModels', 'off') - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() self.assertEqual(1, len(solvers)) self.assertIn('PCNFoam', solvers) @@ -39,7 +39,7 @@ def testFindingPCNFoamForSteady(self): self.db.setValue('.//models/multiphaseModels/model', 'off') self.db.setValue('.//models/speciesModels', 'off') - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() self.assertEqual(1, len(solvers)) self.assertIn('PCNFoam', solvers) @@ -53,7 +53,7 @@ def testFindingPCNFoamForIncompressible(self): self.db.setValue('.//models/multiphaseModels/model', 'off') self.db.setValue('.//models/speciesModels', 'off') - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() self.assertNotIn('PCNFoam', solvers) diff --git a/baram/test/test_openfoam/test_solver_info_manager.py b/baramFlow/test/test_openfoam/test_solver_info_manager.py similarity index 98% rename from baram/test/test_openfoam/test_solver_info_manager.py rename to baramFlow/test/test_openfoam/test_solver_info_manager.py index 4a679f03..73b889a4 100644 --- a/baram/test/test_openfoam/test_solver_info_manager.py +++ b/baramFlow/test/test_openfoam/test_solver_info_manager.py @@ -3,7 +3,7 @@ from pathlib import Path -from baram.openfoam.solver_info_manager import readCompleteLineOnly, readOutFile, Worker +from baramFlow.openfoam.solver_info_manager import readCompleteLineOnly, readOutFile, Worker class TestSolverInfoManager(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_t.py b/baramFlow/test/test_openfoam/test_t.py similarity index 97% rename from baram/test/test_openfoam/test_t.py rename to baramFlow/test/test_openfoam/test_t.py index dd96d8d5..98b7ffcc 100644 --- a/baram/test/test_openfoam/test_t.py +++ b/baramFlow/test/test_openfoam/test_t.py @@ -3,15 +3,15 @@ import shutil from pathlib import Path -from baram.coredb import coredb -from baram.coredb.filedb import FileDB, BcFileRole -from baram.coredb.project import Project, _Project -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import Phase -from baram.coredb.models_db import ModelsDB -from baram.openfoam.boundary_conditions.t import T -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.filedb import FileDB, BcFileRole +from baramFlow.coredb.project import Project, _Project +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import Phase +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.openfoam.boundary_conditions.t import T +from baramFlow.openfoam.file_system import FileSystem dimensions = '[0 0 0 1 0 0 0]' rname = "testRegion_1" diff --git a/baram/test/test_openfoam/test_thermophysical_properties.py b/baramFlow/test/test_openfoam/test_thermophysical_properties.py similarity index 96% rename from baram/test/test_openfoam/test_thermophysical_properties.py rename to baramFlow/test/test_openfoam/test_thermophysical_properties.py index df8c090a..443cae03 100644 --- a/baram/test/test_openfoam/test_thermophysical_properties.py +++ b/baramFlow/test/test_openfoam/test_thermophysical_properties.py @@ -1,7 +1,7 @@ import unittest -from baram.coredb import coredb -from baram.openfoam.constant.thermophysical_properties import ThermophysicalProperties +from baramFlow.coredb import coredb +from baramFlow.openfoam.constant.thermophysical_properties import ThermophysicalProperties _DEF_CONTENT = """FoamFile { diff --git a/baram/test/test_openfoam/test_transport_properties.py b/baramFlow/test/test_openfoam/test_transport_properties.py similarity index 85% rename from baram/test/test_openfoam/test_transport_properties.py rename to baramFlow/test/test_openfoam/test_transport_properties.py index c499cdf5..9b2291b6 100644 --- a/baram/test/test_openfoam/test_transport_properties.py +++ b/baramFlow/test/test_openfoam/test_transport_properties.py @@ -3,9 +3,9 @@ import unittest -from baram.coredb import coredb +from baramFlow.coredb import coredb -from baram.openfoam.constant.transport_properties import TransportProperties +from baramFlow.openfoam.constant.transport_properties import TransportProperties class TestTransportProperties(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_turbulence_properties.py b/baramFlow/test/test_openfoam/test_turbulence_properties.py similarity index 95% rename from baram/test/test_openfoam/test_turbulence_properties.py rename to baramFlow/test/test_openfoam/test_turbulence_properties.py index 38aa208d..6b14fc23 100644 --- a/baram/test/test_openfoam/test_turbulence_properties.py +++ b/baramFlow/test/test_openfoam/test_turbulence_properties.py @@ -1,8 +1,8 @@ import unittest -from baram.coredb import coredb -from baram.coredb.models_db import ModelsDB -from baram.openfoam.constant.turbulence_properties import TurbulenceProperties +from baramFlow.coredb import coredb +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.openfoam.constant.turbulence_properties import TurbulenceProperties class TestTurbulenceProperties(unittest.TestCase): diff --git a/baram/test/test_openfoam/test_u.py b/baramFlow/test/test_openfoam/test_u.py similarity index 98% rename from baram/test/test_openfoam/test_u.py rename to baramFlow/test/test_openfoam/test_u.py index 339e2626..87947fae 100644 --- a/baram/test/test_openfoam/test_u.py +++ b/baramFlow/test/test_openfoam/test_u.py @@ -3,13 +3,13 @@ import shutil from pathlib import Path -from baram.coredb import coredb -from baram.coredb.filedb import FileDB, BcFileRole -from baram.coredb.project import Project, _Project -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.region_db import RegionDB -from baram.openfoam.boundary_conditions.u import U -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb import coredb +from baramFlow.coredb.filedb import FileDB, BcFileRole +from baramFlow.coredb.project import Project, _Project +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.openfoam.boundary_conditions.u import U +from baramFlow.openfoam.file_system import FileSystem dimensions = '[0 1 -1 0 0 0 0]' rname = "testRegion_1" diff --git a/baram/view/__init__.py b/baramFlow/view/__init__.py similarity index 100% rename from baram/view/__init__.py rename to baramFlow/view/__init__.py diff --git a/baram/view/case_wizard/__init__.py b/baramFlow/view/case_wizard/__init__.py similarity index 100% rename from baram/view/case_wizard/__init__.py rename to baramFlow/view/case_wizard/__init__.py diff --git a/baram/view/case_wizard/case_wizard.py b/baramFlow/view/case_wizard/case_wizard.py similarity index 97% rename from baram/view/case_wizard/case_wizard.py rename to baramFlow/view/case_wizard/case_wizard.py index 408dd6ea..f13babdf 100644 --- a/baram/view/case_wizard/case_wizard.py +++ b/baramFlow/view/case_wizard/case_wizard.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWizard -from baram.coredb import coredb -from baram.coredb.models_db import MultiphaseModel +from baramFlow.coredb import coredb +from baramFlow.coredb.models_db import MultiphaseModel from .case_wizard_ui import Ui_CaseWizard from .flow_type_page import FlowTypePage from .solver_type_page import SolverTypePage diff --git a/baram/view/case_wizard/case_wizard.ui b/baramFlow/view/case_wizard/case_wizard.ui similarity index 100% rename from baram/view/case_wizard/case_wizard.ui rename to baramFlow/view/case_wizard/case_wizard.ui diff --git a/baram/view/case_wizard/energy_model_page.py b/baramFlow/view/case_wizard/energy_model_page.py similarity index 100% rename from baram/view/case_wizard/energy_model_page.py rename to baramFlow/view/case_wizard/energy_model_page.py diff --git a/baram/view/case_wizard/energy_model_page.ui b/baramFlow/view/case_wizard/energy_model_page.ui similarity index 100% rename from baram/view/case_wizard/energy_model_page.ui rename to baramFlow/view/case_wizard/energy_model_page.ui diff --git a/baram/view/case_wizard/flow_type_page.py b/baramFlow/view/case_wizard/flow_type_page.py similarity index 100% rename from baram/view/case_wizard/flow_type_page.py rename to baramFlow/view/case_wizard/flow_type_page.py diff --git a/baram/view/case_wizard/flow_type_page.ui b/baramFlow/view/case_wizard/flow_type_page.ui similarity index 100% rename from baram/view/case_wizard/flow_type_page.ui rename to baramFlow/view/case_wizard/flow_type_page.ui diff --git a/baram/view/case_wizard/gravity_model_page.py b/baramFlow/view/case_wizard/gravity_model_page.py similarity index 100% rename from baram/view/case_wizard/gravity_model_page.py rename to baramFlow/view/case_wizard/gravity_model_page.py diff --git a/baram/view/case_wizard/gravity_model_page.ui b/baramFlow/view/case_wizard/gravity_model_page.ui similarity index 100% rename from baram/view/case_wizard/gravity_model_page.ui rename to baramFlow/view/case_wizard/gravity_model_page.ui diff --git a/baram/view/case_wizard/multiphase_model_page.py b/baramFlow/view/case_wizard/multiphase_model_page.py similarity index 88% rename from baram/view/case_wizard/multiphase_model_page.py rename to baramFlow/view/case_wizard/multiphase_model_page.py index 6c980ab2..1bdd4992 100644 --- a/baram/view/case_wizard/multiphase_model_page.py +++ b/baramFlow/view/case_wizard/multiphase_model_page.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWizardPage, QLineEdit -from baram.coredb.models_db import MultiphaseModel -from baram.view.widgets.enum_button_group import EnumButtonGroup +from baramFlow.coredb.models_db import MultiphaseModel +from baramFlow.view.widgets.enum_button_group import EnumButtonGroup from .multiphase_model_page_ui import Ui_MultiphaseModelPage diff --git a/baram/view/case_wizard/multiphase_model_page.ui b/baramFlow/view/case_wizard/multiphase_model_page.ui similarity index 100% rename from baram/view/case_wizard/multiphase_model_page.ui rename to baramFlow/view/case_wizard/multiphase_model_page.ui diff --git a/baram/view/case_wizard/solver_type_page.py b/baramFlow/view/case_wizard/solver_type_page.py similarity index 100% rename from baram/view/case_wizard/solver_type_page.py rename to baramFlow/view/case_wizard/solver_type_page.py diff --git a/baram/view/case_wizard/solver_type_page.ui b/baramFlow/view/case_wizard/solver_type_page.ui similarity index 100% rename from baram/view/case_wizard/solver_type_page.ui rename to baramFlow/view/case_wizard/solver_type_page.ui diff --git a/baram/view/case_wizard/species_model_page.py b/baramFlow/view/case_wizard/species_model_page.py similarity index 100% rename from baram/view/case_wizard/species_model_page.py rename to baramFlow/view/case_wizard/species_model_page.py diff --git a/baram/view/case_wizard/species_model_page.ui b/baramFlow/view/case_wizard/species_model_page.ui similarity index 100% rename from baram/view/case_wizard/species_model_page.ui rename to baramFlow/view/case_wizard/species_model_page.ui diff --git a/baram/view/case_wizard/workspace_page.py b/baramFlow/view/case_wizard/workspace_page.py similarity index 97% rename from baram/view/case_wizard/workspace_page.py rename to baramFlow/view/case_wizard/workspace_page.py index c9f40676..32c5b310 100644 --- a/baram/view/case_wizard/workspace_page.py +++ b/baramFlow/view/case_wizard/workspace_page.py @@ -5,7 +5,7 @@ from PySide6.QtWidgets import QWizardPage, QFileDialog -from baram.coredb.app_settings import AppSettings +from baramFlow.coredb.app_settings import AppSettings from .workspace_page_ui import Ui_WorkspacePage diff --git a/baram/view/case_wizard/workspace_page.ui b/baramFlow/view/case_wizard/workspace_page.ui similarity index 100% rename from baram/view/case_wizard/workspace_page.ui rename to baramFlow/view/case_wizard/workspace_page.ui diff --git a/baram/view/main_window/__init__.py b/baramFlow/view/main_window/__init__.py similarity index 100% rename from baram/view/main_window/__init__.py rename to baramFlow/view/main_window/__init__.py diff --git a/baram/view/main_window/chart_dock.py b/baramFlow/view/main_window/chart_dock.py similarity index 94% rename from baram/view/main_window/chart_dock.py rename to baramFlow/view/main_window/chart_dock.py index 47679b1b..df4e2f63 100644 --- a/baram/view/main_window/chart_dock.py +++ b/baramFlow/view/main_window/chart_dock.py @@ -16,13 +16,13 @@ from matplotlib.figure import Figure from matplotlib.lines import Line2D -from baram.openfoam.solver_info_manager import SolverInfoManager -from baram.openfoam.file_system import FileSystem +from baramFlow.openfoam.solver_info_manager import SolverInfoManager +from baramFlow.openfoam.file_system import FileSystem from .tabified_dock import TabifiedDock -from baram.coredb import coredb -from baram.coredb.general_db import GeneralDB -from baram.coredb.run_calculation_db import RunCalculationDB, TimeSteppingMethod -from baram.coredb.project import Project, SolverStatus +from baramFlow.coredb import coredb +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.run_calculation_db import RunCalculationDB, TimeSteppingMethod +from baramFlow.coredb.project import Project, SolverStatus SIDE_MARGIN = 0.05 # 5% margin on left and right diff --git a/baram/view/main_window/console_dock.py b/baramFlow/view/main_window/console_dock.py similarity index 97% rename from baram/view/main_window/console_dock.py rename to baramFlow/view/main_window/console_dock.py index a6f2f7ff..84edc91a 100644 --- a/baram/view/main_window/console_dock.py +++ b/baramFlow/view/main_window/console_dock.py @@ -10,8 +10,8 @@ from PySide6.QtGui import QFontDatabase from .tabified_dock import TabifiedDock -from baram.coredb.project import Project, SolverStatus -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb.project import Project, SolverStatus +from baramFlow.openfoam.file_system import FileSystem class ConsoleDock(TabifiedDock): diff --git a/baram/view/main_window/content_view.py b/baramFlow/view/main_window/content_view.py similarity index 90% rename from baram/view/main_window/content_view.py rename to baramFlow/view/main_window/content_view.py index 7a2cce74..f9cbee6b 100644 --- a/baram/view/main_window/content_view.py +++ b/baramFlow/view/main_window/content_view.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.view.main_window.empty_page import EmptyPage +from baramFlow.view.main_window.empty_page import EmptyPage class ContentView: diff --git a/baram/view/main_window/empty_page.py b/baramFlow/view/main_window/empty_page.py similarity index 100% rename from baram/view/main_window/empty_page.py rename to baramFlow/view/main_window/empty_page.py diff --git a/baram/view/main_window/main_window.py b/baramFlow/view/main_window/main_window.py similarity index 92% rename from baram/view/main_window/main_window.py rename to baramFlow/view/main_window/main_window.py index 0fca9f80..14955ec4 100644 --- a/baram/view/main_window/main_window.py +++ b/baramFlow/view/main_window/main_window.py @@ -20,30 +20,30 @@ from widgets.progress_dialog import ProgressDialog from widgets.parallel.parallel_environment_dialog import ParallelEnvironmentDialog -from baram.app import app -from baram.coredb.project import Project, SolverStatus -from baram.coredb.app_settings import AppSettings -from baram.coredb import coredb -from baram.mesh.mesh_manager import MeshManager, MeshType -from baram.openfoam.file_system import FileSystem -from baram.openfoam.case_generator import CaseGenerator -from baram.openfoam import parallel -from baram.openfoam.polymesh.polymesh_loader import PolyMeshLoader -from baram.openfoam.redistribution_task import RedistributionTask -from baram.view.main_window.menu.settrings.settings_language_dialog import SettingLanguageDialog -from baram.view.main_window.menu.settrings.settings_paraveiw_dialog import SettingsParaViewDialog -from baram.view.main_window.menu.settrings.settings_scaling_dialog import SettingScalingDialog -from baram.view.setup.general.general_page import GeneralPage -from baram.view.setup.materials.material_page import MaterialPage -from baram.view.setup.models.models_page import ModelsPage -from baram.view.setup.cell_zone_conditions.cell_zone_conditions_page import CellZoneConditionsPage -from baram.view.setup.boundary_conditions.boundary_conditions_page import BoundaryConditionsPage -from baram.view.setup.reference_values.reference_values_page import ReferenceValuesPage -from baram.view.solution.numerical_conditions.numerical_conditions_page import NumericalConditionsPage -from baram.view.solution.monitors.monitors_page import MonitorsPage -from baram.view.solution.initialization.initialization_page import InitializationPage -from baram.view.solution.run_conditions.run_conditions_page import RunConditionsPage -from baram.view.solution.run.process_information_page import ProcessInformationPage +from baramFlow.app import app +from baramFlow.coredb.project import Project, SolverStatus +from baramFlow.coredb.app_settings import AppSettings +from baramFlow.coredb import coredb +from baramFlow.mesh.mesh_manager import MeshManager, MeshType +from baramFlow.openfoam.file_system import FileSystem +from baramFlow.openfoam.case_generator import CaseGenerator +from baramFlow.openfoam import parallel +from baramFlow.openfoam.polymesh.polymesh_loader import PolyMeshLoader +from baramFlow.openfoam.redistribution_task import RedistributionTask +from baramFlow.view.main_window.menu.settrings.settings_language_dialog import SettingLanguageDialog +from baramFlow.view.main_window.menu.settrings.settings_paraveiw_dialog import SettingsParaViewDialog +from baramFlow.view.main_window.menu.settrings.settings_scaling_dialog import SettingScalingDialog +from baramFlow.view.setup.general.general_page import GeneralPage +from baramFlow.view.setup.materials.material_page import MaterialPage +from baramFlow.view.setup.models.models_page import ModelsPage +from baramFlow.view.setup.cell_zone_conditions.cell_zone_conditions_page import CellZoneConditionsPage +from baramFlow.view.setup.boundary_conditions.boundary_conditions_page import BoundaryConditionsPage +from baramFlow.view.setup.reference_values.reference_values_page import ReferenceValuesPage +from baramFlow.view.solution.numerical_conditions.numerical_conditions_page import NumericalConditionsPage +from baramFlow.view.solution.monitors.monitors_page import MonitorsPage +from baramFlow.view.solution.initialization.initialization_page import InitializationPage +from baramFlow.view.solution.run_conditions.run_conditions_page import RunConditionsPage +from baramFlow.view.solution.run.process_information_page import ProcessInformationPage from .content_view import ContentView from .main_window_ui import Ui_MainWindow from .navigator_view import NavigatorView, MenuItem @@ -580,6 +580,6 @@ def _renewCase(self): def _runParaView(self, executable, updateSetting=True): casePath = FileSystem.foamFilePath() if Project.instance().meshLoaded else '' - subprocess.Popen([executable, casePath]) + subprocess.Popen([executable, str(casePath)]) if updateSetting: AppSettings.updateParaviewInstalledPath(executable) diff --git a/baram/view/main_window/main_window.ui b/baramFlow/view/main_window/main_window.ui similarity index 99% rename from baram/view/main_window/main_window.ui rename to baramFlow/view/main_window/main_window.ui index 84fa08d8..bfab8349 100644 --- a/baram/view/main_window/main_window.ui +++ b/baramFlow/view/main_window/main_window.ui @@ -17,7 +17,7 @@ - MainWindow + BaramFlow diff --git a/baram/view/main_window/menu/__init__.py b/baramFlow/view/main_window/menu/__init__.py similarity index 100% rename from baram/view/main_window/menu/__init__.py rename to baramFlow/view/main_window/menu/__init__.py diff --git a/baram/view/main_window/menu/help/__init__.py b/baramFlow/view/main_window/menu/help/__init__.py similarity index 100% rename from baram/view/main_window/menu/help/__init__.py rename to baramFlow/view/main_window/menu/help/__init__.py diff --git a/baram/view/main_window/menu/help/about_dialog.py b/baramFlow/view/main_window/menu/help/about_dialog.py similarity index 96% rename from baram/view/main_window/menu/help/about_dialog.py rename to baramFlow/view/main_window/menu/help/about_dialog.py index 7d858553..af7183b4 100644 --- a/baram/view/main_window/menu/help/about_dialog.py +++ b/baramFlow/view/main_window/menu/help/about_dialog.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QDialog -from baram.app import app +from baramFlow.app import app from .about_dialog_ui import Ui_AboutDialog from .license_dialog import LicenseDialog diff --git a/baram/view/main_window/menu/help/about_dialog.ui b/baramFlow/view/main_window/menu/help/about_dialog.ui similarity index 100% rename from baram/view/main_window/menu/help/about_dialog.ui rename to baramFlow/view/main_window/menu/help/about_dialog.ui diff --git a/baram/view/main_window/menu/help/license_dialog.py b/baramFlow/view/main_window/menu/help/license_dialog.py similarity index 100% rename from baram/view/main_window/menu/help/license_dialog.py rename to baramFlow/view/main_window/menu/help/license_dialog.py diff --git a/baram/view/main_window/menu/help/license_dialog.ui b/baramFlow/view/main_window/menu/help/license_dialog.ui similarity index 100% rename from baram/view/main_window/menu/help/license_dialog.ui rename to baramFlow/view/main_window/menu/help/license_dialog.ui diff --git a/baram/view/main_window/menu/mesh/__init__.py b/baramFlow/view/main_window/menu/mesh/__init__.py similarity index 100% rename from baram/view/main_window/menu/mesh/__init__.py rename to baramFlow/view/main_window/menu/mesh/__init__.py diff --git a/baram/view/main_window/menu/mesh/mesh_rotate_dialog.py b/baramFlow/view/main_window/menu/mesh/mesh_rotate_dialog.py similarity index 100% rename from baram/view/main_window/menu/mesh/mesh_rotate_dialog.py rename to baramFlow/view/main_window/menu/mesh/mesh_rotate_dialog.py diff --git a/baram/view/main_window/menu/mesh/mesh_rotate_dialog.ui b/baramFlow/view/main_window/menu/mesh/mesh_rotate_dialog.ui similarity index 100% rename from baram/view/main_window/menu/mesh/mesh_rotate_dialog.ui rename to baramFlow/view/main_window/menu/mesh/mesh_rotate_dialog.ui diff --git a/baram/view/main_window/menu/mesh/mesh_scale_dialog.py b/baramFlow/view/main_window/menu/mesh/mesh_scale_dialog.py similarity index 100% rename from baram/view/main_window/menu/mesh/mesh_scale_dialog.py rename to baramFlow/view/main_window/menu/mesh/mesh_scale_dialog.py diff --git a/baram/view/main_window/menu/mesh/mesh_scale_dialog.ui b/baramFlow/view/main_window/menu/mesh/mesh_scale_dialog.ui similarity index 100% rename from baram/view/main_window/menu/mesh/mesh_scale_dialog.ui rename to baramFlow/view/main_window/menu/mesh/mesh_scale_dialog.ui diff --git a/baram/view/main_window/menu/mesh/mesh_translate_dialog.py b/baramFlow/view/main_window/menu/mesh/mesh_translate_dialog.py similarity index 100% rename from baram/view/main_window/menu/mesh/mesh_translate_dialog.py rename to baramFlow/view/main_window/menu/mesh/mesh_translate_dialog.py diff --git a/baram/view/main_window/menu/mesh/mesh_translate_dialog.ui b/baramFlow/view/main_window/menu/mesh/mesh_translate_dialog.ui similarity index 100% rename from baram/view/main_window/menu/mesh/mesh_translate_dialog.ui rename to baramFlow/view/main_window/menu/mesh/mesh_translate_dialog.ui diff --git a/baram/view/main_window/menu/settrings/__init__.py b/baramFlow/view/main_window/menu/settrings/__init__.py similarity index 100% rename from baram/view/main_window/menu/settrings/__init__.py rename to baramFlow/view/main_window/menu/settrings/__init__.py diff --git a/baram/view/main_window/menu/settrings/settings_language_dialog.py b/baramFlow/view/main_window/menu/settrings/settings_language_dialog.py similarity index 93% rename from baram/view/main_window/menu/settrings/settings_language_dialog.py rename to baramFlow/view/main_window/menu/settrings/settings_language_dialog.py index 74b4ee91..7c96e82d 100644 --- a/baram/view/main_window/menu/settrings/settings_language_dialog.py +++ b/baramFlow/view/main_window/menu/settrings/settings_language_dialog.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QDialog -from baram.app import app -from baram.coredb.app_settings import AppSettings +from baramFlow.app import app +from baramFlow.coredb.app_settings import AppSettings from .settings_language_dialog_ui import Ui_SettingLanguageDialog diff --git a/baram/view/main_window/menu/settrings/settings_language_dialog.ui b/baramFlow/view/main_window/menu/settrings/settings_language_dialog.ui similarity index 100% rename from baram/view/main_window/menu/settrings/settings_language_dialog.ui rename to baramFlow/view/main_window/menu/settrings/settings_language_dialog.ui diff --git a/baram/view/main_window/menu/settrings/settings_paraveiw_dialog.py b/baramFlow/view/main_window/menu/settrings/settings_paraveiw_dialog.py similarity index 96% rename from baram/view/main_window/menu/settrings/settings_paraveiw_dialog.py rename to baramFlow/view/main_window/menu/settrings/settings_paraveiw_dialog.py index e1c5d70c..a71446bd 100644 --- a/baram/view/main_window/menu/settrings/settings_paraveiw_dialog.py +++ b/baramFlow/view/main_window/menu/settrings/settings_paraveiw_dialog.py @@ -6,7 +6,7 @@ from PySide6.QtWidgets import QDialog, QFileDialog, QDialogButtonBox -from baram.coredb.app_settings import AppSettings +from baramFlow.coredb.app_settings import AppSettings from .settings_paraview_dialog_ui import Ui_ParaViewSettingDialog diff --git a/baram/view/main_window/menu/settrings/settings_paraview_dialog.ui b/baramFlow/view/main_window/menu/settrings/settings_paraview_dialog.ui similarity index 100% rename from baram/view/main_window/menu/settrings/settings_paraview_dialog.ui rename to baramFlow/view/main_window/menu/settrings/settings_paraview_dialog.ui diff --git a/baram/view/main_window/menu/settrings/settings_scaling_dialog.py b/baramFlow/view/main_window/menu/settrings/settings_scaling_dialog.py similarity index 93% rename from baram/view/main_window/menu/settrings/settings_scaling_dialog.py rename to baramFlow/view/main_window/menu/settrings/settings_scaling_dialog.py index ee849fc1..4808e024 100644 --- a/baram/view/main_window/menu/settrings/settings_scaling_dialog.py +++ b/baramFlow/view/main_window/menu/settrings/settings_scaling_dialog.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb.app_settings import AppSettings +from baramFlow.coredb.app_settings import AppSettings from .settings_scaling_dialog_ui import Ui_SettingScalingDialog diff --git a/baram/view/main_window/menu/settrings/settings_scaling_dialog.ui b/baramFlow/view/main_window/menu/settrings/settings_scaling_dialog.ui similarity index 100% rename from baram/view/main_window/menu/settrings/settings_scaling_dialog.ui rename to baramFlow/view/main_window/menu/settrings/settings_scaling_dialog.ui diff --git a/baram/view/main_window/monitor_dock.py b/baramFlow/view/main_window/monitor_dock.py similarity index 91% rename from baram/view/main_window/monitor_dock.py rename to baramFlow/view/main_window/monitor_dock.py index f3fb0d25..1a4d4591 100644 --- a/baram/view/main_window/monitor_dock.py +++ b/baramFlow/view/main_window/monitor_dock.py @@ -4,11 +4,11 @@ from PySide6.QtWidgets import QWidget, QScrollArea, QVBoxLayout from PySide6.QtCore import Qt -from baram.coredb import coredb -from baram.coredb.project import Project, SolverStatus -from baram.view.widgets.flow_layout import FlowLayout -from baram.view.widgets.chart_wigdet import ChartWidget -from baram.openfoam.post_processing.monitor import ForceMonitor, PointMonitor, SurfaceMonitor, VolumeMonitor, calculateMaxX +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project, SolverStatus +from baramFlow.view.widgets.flow_layout import FlowLayout +from baramFlow.view.widgets.chart_wigdet import ChartWidget +from baramFlow.openfoam.post_processing.monitor import ForceMonitor, PointMonitor, SurfaceMonitor, VolumeMonitor, calculateMaxX from .tabified_dock import TabifiedDock diff --git a/baram/view/main_window/navigator_view.py b/baramFlow/view/main_window/navigator_view.py similarity index 98% rename from baram/view/main_window/navigator_view.py rename to baramFlow/view/main_window/navigator_view.py index 71de7c55..28f8ca36 100644 --- a/baram/view/main_window/navigator_view.py +++ b/baramFlow/view/main_window/navigator_view.py @@ -6,8 +6,8 @@ from PySide6.QtWidgets import QTreeWidgetItem from PySide6.QtCore import QObject, Signal -from baram.app import app -from baram.coredb.project import Project +from baramFlow.app import app +from baramFlow.coredb.project import Project class MenuItem(Enum): diff --git a/baram/view/main_window/rendering_dock.py b/baramFlow/view/main_window/rendering_dock.py similarity index 100% rename from baram/view/main_window/rendering_dock.py rename to baramFlow/view/main_window/rendering_dock.py diff --git a/baram/view/main_window/rendering_view.py b/baramFlow/view/main_window/rendering_view.py similarity index 95% rename from baram/view/main_window/rendering_view.py rename to baramFlow/view/main_window/rendering_view.py index cc21404f..8f1fd107 100644 --- a/baram/view/main_window/rendering_view.py +++ b/baramFlow/view/main_window/rendering_view.py @@ -8,8 +8,8 @@ from PySide6.QtWidgets import QWidget from vtkmodules.vtkRenderingCore import vtkActor -from baram.coredb.app_settings import AppSettings -from baram.openfoam.file_system import FileSystem +from baramFlow.coredb.app_settings import AppSettings +from baramFlow.openfoam.file_system import FileSystem from .rendering_view_ui import Ui_RenderingView diff --git a/baram/view/main_window/rendering_view.ui b/baramFlow/view/main_window/rendering_view.ui similarity index 100% rename from baram/view/main_window/rendering_view.ui rename to baramFlow/view/main_window/rendering_view.ui diff --git a/baram/view/main_window/start_window.py b/baramFlow/view/main_window/start_window.py similarity index 91% rename from baram/view/main_window/start_window.py rename to baramFlow/view/main_window/start_window.py index 6891c6d3..2e83269f 100644 --- a/baram/view/main_window/start_window.py +++ b/baramFlow/view/main_window/start_window.py @@ -11,10 +11,10 @@ from filelock import Timeout -from baram.app import app -from baram.coredb.app_settings import AppSettings -from baram.coredb.project import Project, ProjectOpenType -from baram.view.widgets.project_selector import ProjectSelector +from baramFlow.app import app +from baramFlow.coredb.app_settings import AppSettings +from baramFlow.coredb.project import Project, ProjectOpenType +from baramFlow.view.widgets.project_selector import ProjectSelector logger = logging.getLogger(__name__) diff --git a/baram/view/main_window/start_window.ui b/baramFlow/view/main_window/start_window.ui similarity index 100% rename from baram/view/main_window/start_window.ui rename to baramFlow/view/main_window/start_window.ui diff --git a/baram/view/main_window/tabified_dock.py b/baramFlow/view/main_window/tabified_dock.py similarity index 100% rename from baram/view/main_window/tabified_dock.py rename to baramFlow/view/main_window/tabified_dock.py diff --git a/baram/view/setup/__init__.py b/baramFlow/view/setup/__init__.py similarity index 100% rename from baram/view/setup/__init__.py rename to baramFlow/view/setup/__init__.py diff --git a/baram/view/setup/boundary_conditions/ABL_inlet_dialog.py b/baramFlow/view/setup/boundary_conditions/ABL_inlet_dialog.py similarity index 95% rename from baram/view/setup/boundary_conditions/ABL_inlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/ABL_inlet_dialog.py index 956ed8b8..b9d69901 100644 --- a/baram/view/setup/boundary_conditions/ABL_inlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/ABL_inlet_dialog.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB from .ABL_inlet_dialog_ui import Ui_ABLInletDialog diff --git a/baram/view/setup/boundary_conditions/ABL_inlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/ABL_inlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/ABL_inlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/ABL_inlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/__init__.py b/baramFlow/view/setup/boundary_conditions/__init__.py similarity index 100% rename from baram/view/setup/boundary_conditions/__init__.py rename to baramFlow/view/setup/boundary_conditions/__init__.py diff --git a/baram/view/setup/boundary_conditions/boundary_conditions_page.py b/baramFlow/view/setup/boundary_conditions/boundary_conditions_page.py similarity index 96% rename from baram/view/setup/boundary_conditions/boundary_conditions_page.py rename to baramFlow/view/setup/boundary_conditions/boundary_conditions_page.py index 940cde1a..d06ae049 100644 --- a/baram/view/setup/boundary_conditions/boundary_conditions_page.py +++ b/baramFlow/view/setup/boundary_conditions/boundary_conditions_page.py @@ -4,11 +4,11 @@ from PySide6.QtWidgets import QTreeWidgetItem, QMessageBox from PySide6.QtCore import Qt -from baram.app import app -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryType, BoundaryDB -from baram.coredb.region_db import DEFAULT_REGION_NAME -from baram.view.widgets.content_page import ContentPage +from baramFlow.app import app +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryType, BoundaryDB +from baramFlow.coredb.region_db import DEFAULT_REGION_NAME +from baramFlow.view.widgets.content_page import ContentPage from .boundary_conditions_page_ui import Ui_BoundaryConditionsPage from .velocity_inlet_dialog import VelocityInletDialog from .flow_rate_inlet_dialog import FlowRateInletDialog diff --git a/baram/view/setup/boundary_conditions/boundary_conditions_page.ui b/baramFlow/view/setup/boundary_conditions/boundary_conditions_page.ui similarity index 100% rename from baram/view/setup/boundary_conditions/boundary_conditions_page.ui rename to baramFlow/view/setup/boundary_conditions/boundary_conditions_page.ui diff --git a/baram/view/setup/boundary_conditions/boundary_type_picker.py b/baramFlow/view/setup/boundary_conditions/boundary_type_picker.py similarity index 96% rename from baram/view/setup/boundary_conditions/boundary_type_picker.py rename to baramFlow/view/setup/boundary_conditions/boundary_type_picker.py index 576e43b9..f385a2c2 100644 --- a/baram/view/setup/boundary_conditions/boundary_type_picker.py +++ b/baramFlow/view/setup/boundary_conditions/boundary_type_picker.py @@ -7,11 +7,11 @@ from PySide6.QtWidgets import QWidget from PySide6.QtCore import Qt, Signal -from baram.app import app -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryType -from baram.coredb.general_db import GeneralDB -from baram.coredb.models_db import ModelsDB +from baramFlow.app import app +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryType +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.models_db import ModelsDB from .boundary_type_picker_ui import Ui_BoundaryTypePicker diff --git a/baram/view/setup/boundary_conditions/boundary_type_picker.ui b/baramFlow/view/setup/boundary_conditions/boundary_type_picker.ui similarity index 100% rename from baram/view/setup/boundary_conditions/boundary_type_picker.ui rename to baramFlow/view/setup/boundary_conditions/boundary_type_picker.ui diff --git a/baram/view/setup/boundary_conditions/boundary_widget.py b/baramFlow/view/setup/boundary_conditions/boundary_widget.py similarity index 94% rename from baram/view/setup/boundary_conditions/boundary_widget.py rename to baramFlow/view/setup/boundary_conditions/boundary_widget.py index bdbc967a..1ba8b561 100644 --- a/baram/view/setup/boundary_conditions/boundary_widget.py +++ b/baramFlow/view/setup/boundary_conditions/boundary_widget.py @@ -5,8 +5,8 @@ from PySide6.QtWidgets import QWidget from PySide6.QtCore import Qt, Signal, QPoint -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB from .boundary_widget_ui import Ui_BoundaryWidget diff --git a/baram/view/setup/boundary_conditions/boundary_widget.ui b/baramFlow/view/setup/boundary_conditions/boundary_widget.ui similarity index 100% rename from baram/view/setup/boundary_conditions/boundary_widget.ui rename to baramFlow/view/setup/boundary_conditions/boundary_widget.ui diff --git a/baram/view/setup/boundary_conditions/conditional_widget_helper.py b/baramFlow/view/setup/boundary_conditions/conditional_widget_helper.py similarity index 91% rename from baram/view/setup/boundary_conditions/conditional_widget_helper.py rename to baramFlow/view/setup/boundary_conditions/conditional_widget_helper.py index 7560ed79..42521d01 100644 --- a/baram/view/setup/boundary_conditions/conditional_widget_helper.py +++ b/baramFlow/view/setup/boundary_conditions/conditional_widget_helper.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baram.coredb.models_db import TurbulenceModel, ModelsDB -from baram.view.widgets.volume_fraction_widget import VolumeFractionWidget +from baramFlow.coredb.models_db import TurbulenceModel, ModelsDB +from baramFlow.view.widgets.volume_fraction_widget import VolumeFractionWidget from .turbulence_k_epsilon_widget import TurbulenceKEpsilonWidget from .turbulence_k_omega_widget import TurbulenceKOmegaWidget from .turbulence_spalart_allmaras_widget import TurbulenceSpalartAllmarasWidget diff --git a/baram/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py b/baramFlow/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py similarity index 86% rename from baram/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py rename to baramFlow/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py index 082e5fe0..2e3034ec 100644 --- a/baram/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/coupled_boundary_condition_dialog.py @@ -3,9 +3,9 @@ from PySide6.QtCore import Signal -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog def changeBoundaryCouple(writer, bcid, newCouple): diff --git a/baram/view/setup/boundary_conditions/cyclic_dialog.py b/baramFlow/view/setup/boundary_conditions/cyclic_dialog.py similarity index 91% rename from baram/view/setup/boundary_conditions/cyclic_dialog.py rename to baramFlow/view/setup/boundary_conditions/cyclic_dialog.py index 50850ecb..2445285a 100644 --- a/baram/view/setup/boundary_conditions/cyclic_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/cyclic_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB, BoundaryType -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .cyclic_dialog_ui import Ui_CyclicDialog from .coupled_boundary_condition_dialog import CoupledBoundaryConditionDialog diff --git a/baram/view/setup/boundary_conditions/cyclic_dialog.ui b/baramFlow/view/setup/boundary_conditions/cyclic_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/cyclic_dialog.ui rename to baramFlow/view/setup/boundary_conditions/cyclic_dialog.ui diff --git a/baram/view/setup/boundary_conditions/fan_dialog.py b/baramFlow/view/setup/boundary_conditions/fan_dialog.py similarity index 93% rename from baram/view/setup/boundary_conditions/fan_dialog.py rename to baramFlow/view/setup/boundary_conditions/fan_dialog.py index 67779bd6..9aed3128 100644 --- a/baram/view/setup/boundary_conditions/fan_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/fan_dialog.py @@ -5,12 +5,12 @@ from PySide6.QtWidgets import QFileDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.project import Project -from baram.coredb.filedb import BcFileRole -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB, BoundaryType -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project +from baramFlow.coredb.filedb import BcFileRole +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .fan_dialog_ui import Ui_FanDialog from .coupled_boundary_condition_dialog import CoupledBoundaryConditionDialog diff --git a/baram/view/setup/boundary_conditions/fan_dialog.ui b/baramFlow/view/setup/boundary_conditions/fan_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/fan_dialog.ui rename to baramFlow/view/setup/boundary_conditions/fan_dialog.ui diff --git a/baram/view/setup/boundary_conditions/farfield_riemann_dialog.py b/baramFlow/view/setup/boundary_conditions/farfield_riemann_dialog.py similarity index 91% rename from baram/view/setup/boundary_conditions/farfield_riemann_dialog.py rename to baramFlow/view/setup/boundary_conditions/farfield_riemann_dialog.py index 293aecc7..84751fcc 100644 --- a/baram/view/setup/boundary_conditions/farfield_riemann_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/farfield_riemann_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .farfield_riemann_dialog_ui import Ui_FarfieldRiemannDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/farfield_riemann_dialog.ui b/baramFlow/view/setup/boundary_conditions/farfield_riemann_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/farfield_riemann_dialog.ui rename to baramFlow/view/setup/boundary_conditions/farfield_riemann_dialog.ui diff --git a/baram/view/setup/boundary_conditions/flow_rate_inlet_dialog.py b/baramFlow/view/setup/boundary_conditions/flow_rate_inlet_dialog.py similarity index 92% rename from baram/view/setup/boundary_conditions/flow_rate_inlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/flow_rate_inlet_dialog.py index 58820428..6b29ebdd 100644 --- a/baram/view/setup/boundary_conditions/flow_rate_inlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/flow_rate_inlet_dialog.py @@ -3,12 +3,12 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import FlowRateInletSpecification, BoundaryDB -from baram.coredb.general_db import GeneralDB -from baram.view.widgets.resizable_dialog import ResizableDialog -from baram.view.widgets.enum_combo_box import EnumComboBox +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import FlowRateInletSpecification, BoundaryDB +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.enum_combo_box import EnumComboBox from .flow_rate_inlet_dialog_ui import Ui_FlowRateInletDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/flow_rate_inlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/flow_rate_inlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/flow_rate_inlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/flow_rate_inlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/free_stream_dialog.py b/baramFlow/view/setup/boundary_conditions/free_stream_dialog.py similarity index 91% rename from baram/view/setup/boundary_conditions/free_stream_dialog.py rename to baramFlow/view/setup/boundary_conditions/free_stream_dialog.py index c9fec376..9f64df57 100644 --- a/baram/view/setup/boundary_conditions/free_stream_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/free_stream_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .free_stream_dialog_ui import Ui_FreeStreamDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/free_stream_dialog.ui b/baramFlow/view/setup/boundary_conditions/free_stream_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/free_stream_dialog.ui rename to baramFlow/view/setup/boundary_conditions/free_stream_dialog.ui diff --git a/baram/view/setup/boundary_conditions/interface_dialog.py b/baramFlow/view/setup/boundary_conditions/interface_dialog.py similarity index 94% rename from baram/view/setup/boundary_conditions/interface_dialog.py rename to baramFlow/view/setup/boundary_conditions/interface_dialog.py index 2007237b..db18b185 100644 --- a/baram/view/setup/boundary_conditions/interface_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/interface_dialog.py @@ -3,13 +3,13 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB, BoundaryType, InterfaceMode -from baram.coredb.general_db import GeneralDB -from baram.coredb.models_db import ModelsDB -from baram.view.widgets.selector_dialog import SelectorDialog -from baram.view.widgets.enum_combo_box import EnumComboBox +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType, InterfaceMode +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.view.widgets.selector_dialog import SelectorDialog +from baramFlow.view.widgets.enum_combo_box import EnumComboBox from .interface_dialog_ui import Ui_InterfaceDialog from .coupled_boundary_condition_dialog import CoupledBoundaryConditionDialog diff --git a/baram/view/setup/boundary_conditions/interface_dialog.ui b/baramFlow/view/setup/boundary_conditions/interface_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/interface_dialog.ui rename to baramFlow/view/setup/boundary_conditions/interface_dialog.ui diff --git a/baram/view/setup/boundary_conditions/open_channel_inlet_dialog.py b/baramFlow/view/setup/boundary_conditions/open_channel_inlet_dialog.py similarity index 86% rename from baram/view/setup/boundary_conditions/open_channel_inlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/open_channel_inlet_dialog.py index 80ba2cec..7345c37a 100644 --- a/baram/view/setup/boundary_conditions/open_channel_inlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/open_channel_inlet_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .open_channel_inlet_dialog_ui import Ui_OpenChannelInletDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/open_channel_inlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/open_channel_inlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/open_channel_inlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/open_channel_inlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/open_channel_outlet_dialog.py b/baramFlow/view/setup/boundary_conditions/open_channel_outlet_dialog.py similarity index 86% rename from baram/view/setup/boundary_conditions/open_channel_outlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/open_channel_outlet_dialog.py index e0e307c9..1f440543 100644 --- a/baram/view/setup/boundary_conditions/open_channel_outlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/open_channel_outlet_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .open_channel_outlet_dialog_ui import Ui_OpenChannelOutletDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/open_channel_outlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/open_channel_outlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/open_channel_outlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/open_channel_outlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/porous_jump_dialog.py b/baramFlow/view/setup/boundary_conditions/porous_jump_dialog.py similarity index 93% rename from baram/view/setup/boundary_conditions/porous_jump_dialog.py rename to baramFlow/view/setup/boundary_conditions/porous_jump_dialog.py index 8fff3177..a268b889 100644 --- a/baram/view/setup/boundary_conditions/porous_jump_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/porous_jump_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB, BoundaryType -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .porous_jump_dialog_ui import Ui_PorousJumpDialog from .coupled_boundary_condition_dialog import CoupledBoundaryConditionDialog diff --git a/baram/view/setup/boundary_conditions/porous_jump_dialog.ui b/baramFlow/view/setup/boundary_conditions/porous_jump_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/porous_jump_dialog.ui rename to baramFlow/view/setup/boundary_conditions/porous_jump_dialog.ui diff --git a/baram/view/setup/boundary_conditions/pressure_inlet_dialog.py b/baramFlow/view/setup/boundary_conditions/pressure_inlet_dialog.py similarity index 90% rename from baram/view/setup/boundary_conditions/pressure_inlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/pressure_inlet_dialog.py index a165ba3d..3f55bc68 100644 --- a/baram/view/setup/boundary_conditions/pressure_inlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/pressure_inlet_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .pressure_inlet_dialog_ui import Ui_PressureInletDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/pressure_inlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/pressure_inlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/pressure_inlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/pressure_inlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/pressure_outlet_dialog.py b/baramFlow/view/setup/boundary_conditions/pressure_outlet_dialog.py similarity index 91% rename from baram/view/setup/boundary_conditions/pressure_outlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/pressure_outlet_dialog.py index b34e8a06..1eb2ba11 100644 --- a/baram/view/setup/boundary_conditions/pressure_outlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/pressure_outlet_dialog.py @@ -3,11 +3,11 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import ModelsDB -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .pressure_outlet_dialog_ui import Ui_PressureOutletDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/pressure_outlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/pressure_outlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/pressure_outlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/pressure_outlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/region_widget.py b/baramFlow/view/setup/boundary_conditions/region_widget.py similarity index 98% rename from baram/view/setup/boundary_conditions/region_widget.py rename to baramFlow/view/setup/boundary_conditions/region_widget.py index 58dd1074..3f639a0a 100644 --- a/baram/view/setup/boundary_conditions/region_widget.py +++ b/baramFlow/view/setup/boundary_conditions/region_widget.py @@ -4,8 +4,8 @@ from PySide6.QtWidgets import QWidget, QHeaderView, QTableWidgetItem, QComboBox from PySide6.QtCore import Signal -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryType, BoundaryDB +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryType, BoundaryDB from .region_widget_ui import Ui_RegionWidget diff --git a/baram/view/setup/boundary_conditions/region_widget.ui b/baramFlow/view/setup/boundary_conditions/region_widget.ui similarity index 100% rename from baram/view/setup/boundary_conditions/region_widget.ui rename to baramFlow/view/setup/boundary_conditions/region_widget.ui diff --git a/baram/view/setup/boundary_conditions/subsonic_inflow_dialog.py b/baramFlow/view/setup/boundary_conditions/subsonic_inflow_dialog.py similarity index 90% rename from baram/view/setup/boundary_conditions/subsonic_inflow_dialog.py rename to baramFlow/view/setup/boundary_conditions/subsonic_inflow_dialog.py index 9946b67c..0efb04b8 100644 --- a/baram/view/setup/boundary_conditions/subsonic_inflow_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/subsonic_inflow_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .subsonic_inflow_dialog_ui import Ui_SubsonicInflowDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/subsonic_inflow_dialog.ui b/baramFlow/view/setup/boundary_conditions/subsonic_inflow_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/subsonic_inflow_dialog.ui rename to baramFlow/view/setup/boundary_conditions/subsonic_inflow_dialog.ui diff --git a/baram/view/setup/boundary_conditions/subsonic_outflow_dialog.py b/baramFlow/view/setup/boundary_conditions/subsonic_outflow_dialog.py similarity index 87% rename from baram/view/setup/boundary_conditions/subsonic_outflow_dialog.py rename to baramFlow/view/setup/boundary_conditions/subsonic_outflow_dialog.py index 818b4047..cf6e4894 100644 --- a/baram/view/setup/boundary_conditions/subsonic_outflow_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/subsonic_outflow_dialog.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB from .subsonic_outflow_dialog_ui import Ui_SubsonicOutflowDialog diff --git a/baram/view/setup/boundary_conditions/subsonic_outflow_dialog.ui b/baramFlow/view/setup/boundary_conditions/subsonic_outflow_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/subsonic_outflow_dialog.ui rename to baramFlow/view/setup/boundary_conditions/subsonic_outflow_dialog.ui diff --git a/baram/view/setup/boundary_conditions/supersonic_inflow_dialog.py b/baramFlow/view/setup/boundary_conditions/supersonic_inflow_dialog.py similarity index 90% rename from baram/view/setup/boundary_conditions/supersonic_inflow_dialog.py rename to baramFlow/view/setup/boundary_conditions/supersonic_inflow_dialog.py index 26d011d9..215f9223 100644 --- a/baram/view/setup/boundary_conditions/supersonic_inflow_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/supersonic_inflow_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .supersonic_inflow_dialog_ui import Ui_SupersonicInflowDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/supersonic_inflow_dialog.ui b/baramFlow/view/setup/boundary_conditions/supersonic_inflow_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/supersonic_inflow_dialog.ui rename to baramFlow/view/setup/boundary_conditions/supersonic_inflow_dialog.ui diff --git a/baram/view/setup/boundary_conditions/temperature_widget.py b/baramFlow/view/setup/boundary_conditions/temperature_widget.py similarity index 96% rename from baram/view/setup/boundary_conditions/temperature_widget.py rename to baramFlow/view/setup/boundary_conditions/temperature_widget.py index e5a2a0be..cc7a5aaf 100644 --- a/baram/view/setup/boundary_conditions/temperature_widget.py +++ b/baramFlow/view/setup/boundary_conditions/temperature_widget.py @@ -5,12 +5,12 @@ from PySide6.QtWidgets import QWidget, QFileDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.filedb import BcFileRole, FileFormatError -from baram.coredb.boundary_db import TemperatureProfile, TemperatureTemporalDistribution -from baram.coredb.models_db import ModelsDB -from baram.coredb.project import Project -from baram.view.widgets.number_input_dialog import PiecewiseLinearDialog, PolynomialDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.filedb import BcFileRole, FileFormatError +from baramFlow.coredb.boundary_db import TemperatureProfile, TemperatureTemporalDistribution +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.project import Project +from baramFlow.view.widgets.number_input_dialog import PiecewiseLinearDialog, PolynomialDialog from .temperature_widget_ui import Ui_temperatureWidget diff --git a/baram/view/setup/boundary_conditions/temperature_widget.ui b/baramFlow/view/setup/boundary_conditions/temperature_widget.ui similarity index 100% rename from baram/view/setup/boundary_conditions/temperature_widget.ui rename to baramFlow/view/setup/boundary_conditions/temperature_widget.ui diff --git a/baram/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py b/baramFlow/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py similarity index 91% rename from baram/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py rename to baramFlow/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py index 6b324ebd..f7e0edf6 100644 --- a/baram/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/thermo_coupled_wall_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB, BoundaryType -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB, BoundaryType +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .thermo_coupled_wall_dialog_ui import Ui_ThermoCoupledWallDailog from .coupled_boundary_condition_dialog import CoupledBoundaryConditionDialog diff --git a/baram/view/setup/boundary_conditions/thermo_coupled_wall_dialog.ui b/baramFlow/view/setup/boundary_conditions/thermo_coupled_wall_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/thermo_coupled_wall_dialog.ui rename to baramFlow/view/setup/boundary_conditions/thermo_coupled_wall_dialog.ui diff --git a/baram/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py b/baramFlow/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py similarity index 97% rename from baram/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py rename to baramFlow/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py index 5431f4c5..943d6a25 100644 --- a/baram/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py +++ b/baramFlow/view/setup/boundary_conditions/turbulence_k_epsilon_widget.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.boundary_db import KEpsilonSpecification +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import KEpsilonSpecification from .turbulence_k_epsilon_widget_ui import Ui_turbulenceKEpsilonWidget diff --git a/baram/view/setup/boundary_conditions/turbulence_k_epsilon_widget.ui b/baramFlow/view/setup/boundary_conditions/turbulence_k_epsilon_widget.ui similarity index 100% rename from baram/view/setup/boundary_conditions/turbulence_k_epsilon_widget.ui rename to baramFlow/view/setup/boundary_conditions/turbulence_k_epsilon_widget.ui diff --git a/baram/view/setup/boundary_conditions/turbulence_k_omega_widget.py b/baramFlow/view/setup/boundary_conditions/turbulence_k_omega_widget.py similarity index 97% rename from baram/view/setup/boundary_conditions/turbulence_k_omega_widget.py rename to baramFlow/view/setup/boundary_conditions/turbulence_k_omega_widget.py index 139a7359..03c4016e 100644 --- a/baram/view/setup/boundary_conditions/turbulence_k_omega_widget.py +++ b/baramFlow/view/setup/boundary_conditions/turbulence_k_omega_widget.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.boundary_db import KOmegaSpecification +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import KOmegaSpecification from .turbulence_k_omega_widget_ui import Ui_turbulenceKOmegaWidget diff --git a/baram/view/setup/boundary_conditions/turbulence_k_omega_widget.ui b/baramFlow/view/setup/boundary_conditions/turbulence_k_omega_widget.ui similarity index 100% rename from baram/view/setup/boundary_conditions/turbulence_k_omega_widget.ui rename to baramFlow/view/setup/boundary_conditions/turbulence_k_omega_widget.ui diff --git a/baram/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py b/baramFlow/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py similarity index 96% rename from baram/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py rename to baramFlow/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py index 3d29118b..7520772d 100644 --- a/baram/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py +++ b/baramFlow/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.boundary_db import SpalartAllmarasSpecification +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import SpalartAllmarasSpecification from .turbulence_spalart_allmaras_widget_ui import Ui_turbulenceSpalartAllmarasWidget diff --git a/baram/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.ui b/baramFlow/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.ui similarity index 100% rename from baram/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.ui rename to baramFlow/view/setup/boundary_conditions/turbulence_spalart_allmaras_widget.ui diff --git a/baram/view/setup/boundary_conditions/velocity_inlet_dialog.py b/baramFlow/view/setup/boundary_conditions/velocity_inlet_dialog.py similarity index 97% rename from baram/view/setup/boundary_conditions/velocity_inlet_dialog.py rename to baramFlow/view/setup/boundary_conditions/velocity_inlet_dialog.py index 059b6c91..55d3739b 100644 --- a/baram/view/setup/boundary_conditions/velocity_inlet_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/velocity_inlet_dialog.py @@ -5,13 +5,13 @@ from PySide6.QtWidgets import QFileDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.filedb import BcFileRole, FileFormatError -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB, VelocitySpecification, VelocityProfile -from baram.coredb.project import Project -from baram.view.widgets.resizable_dialog import ResizableDialog -from baram.view.widgets.number_input_dialog import PiecewiseLinearDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.filedb import BcFileRole, FileFormatError +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB, VelocitySpecification, VelocityProfile +from baramFlow.coredb.project import Project +from baramFlow.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.number_input_dialog import PiecewiseLinearDialog from .velocity_inlet_dialog_ui import Ui_VelocityInletDialog from .conditional_widget_helper import ConditionalWidgetHelper diff --git a/baram/view/setup/boundary_conditions/velocity_inlet_dialog.ui b/baramFlow/view/setup/boundary_conditions/velocity_inlet_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/velocity_inlet_dialog.ui rename to baramFlow/view/setup/boundary_conditions/velocity_inlet_dialog.ui diff --git a/baram/view/setup/boundary_conditions/wall_dialog.py b/baramFlow/view/setup/boundary_conditions/wall_dialog.py similarity index 96% rename from baram/view/setup/boundary_conditions/wall_dialog.py rename to baramFlow/view/setup/boundary_conditions/wall_dialog.py index 65a35eed..1642f933 100644 --- a/baram/view/setup/boundary_conditions/wall_dialog.py +++ b/baramFlow/view/setup/boundary_conditions/wall_dialog.py @@ -3,15 +3,15 @@ from PySide6.QtWidgets import QMessageBox, QWidget, QGridLayout, QLabel, QLineEdit, QFormLayout -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import ModelsDB -from baram.coredb.material_db import MaterialDB -from baram.coredb.boundary_db import BoundaryDB, WallVelocityCondition, WallTemperature, ContactAngleModel, ContactAngleLimit -from baram.coredb.region_db import RegionDB -from baram.coredb.general_db import GeneralDB -from baram.view.widgets.resizable_dialog import ResizableDialog -from baram.view.widgets.enum_combo_box import EnumComboBox +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.boundary_db import BoundaryDB, WallVelocityCondition, WallTemperature, ContactAngleModel, ContactAngleLimit +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.enum_combo_box import EnumComboBox from .wall_dialog_ui import Ui_WallDialog diff --git a/baram/view/setup/boundary_conditions/wall_dialog.ui b/baramFlow/view/setup/boundary_conditions/wall_dialog.ui similarity index 100% rename from baram/view/setup/boundary_conditions/wall_dialog.ui rename to baramFlow/view/setup/boundary_conditions/wall_dialog.ui diff --git a/baram/view/setup/cell_zone_conditions/MRF_widget.py b/baramFlow/view/setup/cell_zone_conditions/MRF_widget.py similarity index 95% rename from baram/view/setup/cell_zone_conditions/MRF_widget.py rename to baramFlow/view/setup/cell_zone_conditions/MRF_widget.py index db5f4851..6f773247 100644 --- a/baram/view/setup/cell_zone_conditions/MRF_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/MRF_widget.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB -from baram.view.widgets.multi_selector_dialog import MultiSelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.view.widgets.multi_selector_dialog import MultiSelectorDialog from .MRF_widget_ui import Ui_MRFWidget diff --git a/baram/view/setup/cell_zone_conditions/MRF_widget.ui b/baramFlow/view/setup/cell_zone_conditions/MRF_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/MRF_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/MRF_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/__init__.py b/baramFlow/view/setup/cell_zone_conditions/__init__.py similarity index 100% rename from baram/view/setup/cell_zone_conditions/__init__.py rename to baramFlow/view/setup/cell_zone_conditions/__init__.py diff --git a/baram/view/setup/cell_zone_conditions/actuator_disk_widget.py b/baramFlow/view/setup/cell_zone_conditions/actuator_disk_widget.py similarity index 98% rename from baram/view/setup/cell_zone_conditions/actuator_disk_widget.py rename to baramFlow/view/setup/cell_zone_conditions/actuator_disk_widget.py index de4ecf94..b757cf32 100644 --- a/baram/view/setup/cell_zone_conditions/actuator_disk_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/actuator_disk_widget.py @@ -5,7 +5,7 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb +from baramFlow.coredb import coredb from .actuator_disk_widget_ui import Ui_ActuatorDiskWidget diff --git a/baram/view/setup/cell_zone_conditions/actuator_disk_widget.ui b/baramFlow/view/setup/cell_zone_conditions/actuator_disk_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/actuator_disk_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/actuator_disk_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py b/baramFlow/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py similarity index 96% rename from baram/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py rename to baramFlow/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py index 186b45d4..7dbfed9b 100644 --- a/baram/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py +++ b/baramFlow/view/setup/cell_zone_conditions/cell_zone_condition_dialog.py @@ -3,13 +3,13 @@ from PySide6.QtWidgets import QDialog, QMessageBox, QVBoxLayout -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import TurbulenceModelHelper, ModelsDB -from baram.coredb.cell_zone_db import CellZoneDB, ZoneType -from baram.coredb.general_db import GeneralDB -from baram.coredb.region_db import DEFAULT_REGION_NAME, RegionDB -from baram.coredb.material_db import MaterialDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import TurbulenceModelHelper, ModelsDB +from baramFlow.coredb.cell_zone_db import CellZoneDB, ZoneType +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.region_db import DEFAULT_REGION_NAME, RegionDB +from baramFlow.coredb.material_db import MaterialDB from .cell_zone_condition_dialog_ui import Ui_CellZoneConditionDialog from .MRF_widget import MRFWidget from .porous_zone_widget import PorousZoneWidget diff --git a/baram/view/setup/cell_zone_conditions/cell_zone_condition_dialog.ui b/baramFlow/view/setup/cell_zone_conditions/cell_zone_condition_dialog.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/cell_zone_condition_dialog.ui rename to baramFlow/view/setup/cell_zone_conditions/cell_zone_condition_dialog.ui diff --git a/baram/view/setup/cell_zone_conditions/cell_zone_conditions_page.py b/baramFlow/view/setup/cell_zone_conditions/cell_zone_conditions_page.py similarity index 92% rename from baram/view/setup/cell_zone_conditions/cell_zone_conditions_page.py rename to baramFlow/view/setup/cell_zone_conditions/cell_zone_conditions_page.py index 26ff057d..b71cace4 100644 --- a/baram/view/setup/cell_zone_conditions/cell_zone_conditions_page.py +++ b/baramFlow/view/setup/cell_zone_conditions/cell_zone_conditions_page.py @@ -4,10 +4,10 @@ from PySide6.QtWidgets import QTreeWidgetItem from PySide6.QtCore import Qt -from baram.coredb import coredb -from baram.coredb.region_db import DEFAULT_REGION_NAME -from baram.coredb.cell_zone_db import CellZoneDB -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.region_db import DEFAULT_REGION_NAME +from baramFlow.coredb.cell_zone_db import CellZoneDB +from baramFlow.view.widgets.content_page import ContentPage from .cell_zone_conditions_page_ui import Ui_CellZoneConditionsPage from .cell_zone_condition_dialog import CellZoneConditionDialog from .cell_zone_widget import CellZoneWidget diff --git a/baram/view/setup/cell_zone_conditions/cell_zone_conditions_page.ui b/baramFlow/view/setup/cell_zone_conditions/cell_zone_conditions_page.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/cell_zone_conditions_page.ui rename to baramFlow/view/setup/cell_zone_conditions/cell_zone_conditions_page.ui diff --git a/baram/view/setup/cell_zone_conditions/cell_zone_widget.py b/baramFlow/view/setup/cell_zone_conditions/cell_zone_widget.py similarity index 90% rename from baram/view/setup/cell_zone_conditions/cell_zone_widget.py rename to baramFlow/view/setup/cell_zone_conditions/cell_zone_widget.py index 3ed071f4..b0bbc915 100644 --- a/baram/view/setup/cell_zone_conditions/cell_zone_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/cell_zone_widget.py @@ -5,8 +5,8 @@ from PySide6.QtWidgets import QWidget from PySide6.QtCore import Signal, QPoint -from baram.coredb import coredb -from baram.coredb.cell_zone_db import ZoneType, CellZoneDB +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import ZoneType, CellZoneDB from .cell_zone_widget_ui import Ui_CellZoneWidget diff --git a/baram/view/setup/cell_zone_conditions/cell_zone_widget.ui b/baramFlow/view/setup/cell_zone_conditions/cell_zone_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/cell_zone_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/cell_zone_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/constant_source_widget.py b/baramFlow/view/setup/cell_zone_conditions/constant_source_widget.py similarity index 95% rename from baram/view/setup/cell_zone_conditions/constant_source_widget.py rename to baramFlow/view/setup/cell_zone_conditions/constant_source_widget.py index 6a980793..a56def63 100644 --- a/baram/view/setup/cell_zone_conditions/constant_source_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/constant_source_widget.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.cell_zone_db import SpecificationMethod +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import SpecificationMethod from .constant_source_widget_ui import Ui_ConstantSourceWidget diff --git a/baram/view/setup/cell_zone_conditions/constant_source_widget.ui b/baramFlow/view/setup/cell_zone_conditions/constant_source_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/constant_source_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/constant_source_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/fixed_value_widget.py b/baramFlow/view/setup/cell_zone_conditions/fixed_value_widget.py similarity index 97% rename from baram/view/setup/cell_zone_conditions/fixed_value_widget.py rename to baramFlow/view/setup/cell_zone_conditions/fixed_value_widget.py index 6721c331..730886ac 100644 --- a/baram/view/setup/cell_zone_conditions/fixed_value_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/fixed_value_widget.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb +from baramFlow.coredb import coredb from .fixed_value_widget_ui import Ui_FixedValueWidget diff --git a/baram/view/setup/cell_zone_conditions/fixed_value_widget.ui b/baramFlow/view/setup/cell_zone_conditions/fixed_value_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/fixed_value_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/fixed_value_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/material_selector_dialog.py b/baramFlow/view/setup/cell_zone_conditions/material_selector_dialog.py similarity index 97% rename from baram/view/setup/cell_zone_conditions/material_selector_dialog.py rename to baramFlow/view/setup/cell_zone_conditions/material_selector_dialog.py index e83053a3..ad2d683d 100644 --- a/baram/view/setup/cell_zone_conditions/material_selector_dialog.py +++ b/baramFlow/view/setup/cell_zone_conditions/material_selector_dialog.py @@ -7,8 +7,8 @@ from PySide6.QtWidgets import QDialog, QListWidgetItem from PySide6.QtCore import Qt -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB, Phase +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB, Phase from .materials_selector_dialog_ui import Ui_MaterialsSelectorDialog diff --git a/baram/view/setup/cell_zone_conditions/materials_selector_dialog.ui b/baramFlow/view/setup/cell_zone_conditions/materials_selector_dialog.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/materials_selector_dialog.ui rename to baramFlow/view/setup/cell_zone_conditions/materials_selector_dialog.ui diff --git a/baram/view/setup/cell_zone_conditions/materials_widget.py b/baramFlow/view/setup/cell_zone_conditions/materials_widget.py similarity index 98% rename from baram/view/setup/cell_zone_conditions/materials_widget.py rename to baramFlow/view/setup/cell_zone_conditions/materials_widget.py index d1d2accd..fafadf69 100644 --- a/baram/view/setup/cell_zone_conditions/materials_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/materials_widget.py @@ -5,9 +5,9 @@ from PySide6.QtWidgets import QWidget, QVBoxLayout, QGridLayout, QCheckBox, QLabel, QLineEdit from PySide6.QtCore import Signal -from baram.coredb import coredb -from baram.coredb.region_db import RegionDB -from baram.coredb.material_db import MaterialDB +from baramFlow.coredb import coredb +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.material_db import MaterialDB from .materials_widget_ui import Ui_MaterialsWidget from .material_selector_dialog import MaterialSectorDialog diff --git a/baram/view/setup/cell_zone_conditions/materials_widget.ui b/baramFlow/view/setup/cell_zone_conditions/materials_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/materials_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/materials_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/operating_conditions_dialog.py b/baramFlow/view/setup/cell_zone_conditions/operating_conditions_dialog.py similarity index 92% rename from baram/view/setup/cell_zone_conditions/operating_conditions_dialog.py rename to baramFlow/view/setup/cell_zone_conditions/operating_conditions_dialog.py index b85cd796..ae360e30 100644 --- a/baram/view/setup/cell_zone_conditions/operating_conditions_dialog.py +++ b/baramFlow/view/setup/cell_zone_conditions/operating_conditions_dialog.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.general_db import GeneralDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.general_db import GeneralDB from .operating_conditions_dialog_ui import Ui_OperatingConditionsDialog diff --git a/baram/view/setup/cell_zone_conditions/operating_conditions_dialog.ui b/baramFlow/view/setup/cell_zone_conditions/operating_conditions_dialog.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/operating_conditions_dialog.ui rename to baramFlow/view/setup/cell_zone_conditions/operating_conditions_dialog.ui diff --git a/baram/view/setup/cell_zone_conditions/porous_zone_widget.py b/baramFlow/view/setup/cell_zone_conditions/porous_zone_widget.py similarity index 98% rename from baram/view/setup/cell_zone_conditions/porous_zone_widget.py rename to baramFlow/view/setup/cell_zone_conditions/porous_zone_widget.py index 690c50f6..f494d994 100644 --- a/baram/view/setup/cell_zone_conditions/porous_zone_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/porous_zone_widget.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.cell_zone_db import PorousZoneModel +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import PorousZoneModel from .porous_zone_widget_ui import Ui_porousZoneWidget diff --git a/baram/view/setup/cell_zone_conditions/porous_zone_widget.ui b/baramFlow/view/setup/cell_zone_conditions/porous_zone_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/porous_zone_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/porous_zone_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/sliding_mesh_widget.py b/baramFlow/view/setup/cell_zone_conditions/sliding_mesh_widget.py similarity index 98% rename from baram/view/setup/cell_zone_conditions/sliding_mesh_widget.py rename to baramFlow/view/setup/cell_zone_conditions/sliding_mesh_widget.py index bf2ebb5b..2bdb7b71 100644 --- a/baram/view/setup/cell_zone_conditions/sliding_mesh_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/sliding_mesh_widget.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb +from baramFlow.coredb import coredb from .sliding_mesh_widget_ui import Ui_SlidingMeshWidget diff --git a/baram/view/setup/cell_zone_conditions/sliding_mesh_widget.ui b/baramFlow/view/setup/cell_zone_conditions/sliding_mesh_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/sliding_mesh_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/sliding_mesh_widget.ui diff --git a/baram/view/setup/cell_zone_conditions/variable_source_widget.py b/baramFlow/view/setup/cell_zone_conditions/variable_source_widget.py similarity index 96% rename from baram/view/setup/cell_zone_conditions/variable_source_widget.py rename to baramFlow/view/setup/cell_zone_conditions/variable_source_widget.py index 2e9570aa..770bc513 100644 --- a/baram/view/setup/cell_zone_conditions/variable_source_widget.py +++ b/baramFlow/view/setup/cell_zone_conditions/variable_source_widget.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QWidget, QMessageBox -from baram.coredb import coredb -from baram.coredb.cell_zone_db import SpecificationMethod, TemporalProfileType -from baram.view.widgets.number_input_dialog import PiecewiseLinearDialog, PolynomialDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.cell_zone_db import SpecificationMethod, TemporalProfileType +from baramFlow.view.widgets.number_input_dialog import PiecewiseLinearDialog, PolynomialDialog from .variable_source_widget_ui import Ui_VariableSourceWidget diff --git a/baram/view/setup/cell_zone_conditions/variable_source_widget.ui b/baramFlow/view/setup/cell_zone_conditions/variable_source_widget.ui similarity index 100% rename from baram/view/setup/cell_zone_conditions/variable_source_widget.ui rename to baramFlow/view/setup/cell_zone_conditions/variable_source_widget.ui diff --git a/baram/view/setup/general/__init__.py b/baramFlow/view/setup/general/__init__.py similarity index 100% rename from baram/view/setup/general/__init__.py rename to baramFlow/view/setup/general/__init__.py diff --git a/baram/view/setup/general/general_page.py b/baramFlow/view/setup/general/general_page.py similarity index 91% rename from baram/view/setup/general/general_page.py rename to baramFlow/view/setup/general/general_page.py index 61b8ae4c..28395949 100644 --- a/baram/view/setup/general/general_page.py +++ b/baramFlow/view/setup/general/general_page.py @@ -5,10 +5,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.general_db import GeneralDB, SolverType -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.general_db import GeneralDB, SolverType +from baramFlow.view.widgets.content_page import ContentPage from .general_page_ui import Ui_GeneralPage diff --git a/baram/view/setup/general/general_page.ui b/baramFlow/view/setup/general/general_page.ui similarity index 100% rename from baram/view/setup/general/general_page.ui rename to baramFlow/view/setup/general/general_page.ui diff --git a/baram/view/setup/materials/__init__.py b/baramFlow/view/setup/materials/__init__.py similarity index 100% rename from baram/view/setup/materials/__init__.py rename to baramFlow/view/setup/materials/__init__.py diff --git a/baram/view/setup/materials/material_card.py b/baramFlow/view/setup/materials/material_card.py similarity index 95% rename from baram/view/setup/materials/material_card.py rename to baramFlow/view/setup/materials/material_card.py index 437ded3e..01a98443 100644 --- a/baram/view/setup/materials/material_card.py +++ b/baramFlow/view/setup/materials/material_card.py @@ -4,9 +4,9 @@ from PySide6.QtWidgets import QWidget from PySide6.QtCore import Signal -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB, Specification, Phase -from baram.coredb.models_db import ModelsDB +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB, Specification, Phase +from baramFlow.coredb.models_db import ModelsDB from .material_card_ui import Ui_MaterialCard from .material_dialog import MaterialDialog diff --git a/baram/view/setup/materials/material_card.ui b/baramFlow/view/setup/materials/material_card.ui similarity index 100% rename from baram/view/setup/materials/material_card.ui rename to baramFlow/view/setup/materials/material_card.ui diff --git a/baram/view/setup/materials/material_dialog.py b/baramFlow/view/setup/materials/material_dialog.py similarity index 97% rename from baram/view/setup/materials/material_dialog.py rename to baramFlow/view/setup/materials/material_dialog.py index 52c66d17..4097f410 100644 --- a/baram/view/setup/materials/material_dialog.py +++ b/baramFlow/view/setup/materials/material_dialog.py @@ -3,16 +3,16 @@ from enum import Enum, auto -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from PySide6.QtCore import Qt from PySide6.QtWidgets import QFormLayout, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.material_db import MaterialDB, Specification, Phase -from baram.coredb.models_db import ModelsDB -from baram.coredb.project import Project -from baram.view.widgets.number_input_dialog import PolynomialDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.material_db import MaterialDB, Specification, Phase +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.project import Project +from baramFlow.view.widgets.number_input_dialog import PolynomialDialog from .material_dialog_ui import Ui_MaterialDialog diff --git a/baram/view/setup/materials/material_dialog.ui b/baramFlow/view/setup/materials/material_dialog.ui similarity index 100% rename from baram/view/setup/materials/material_dialog.ui rename to baramFlow/view/setup/materials/material_dialog.ui diff --git a/baram/view/setup/materials/material_page.py b/baramFlow/view/setup/materials/material_page.py similarity index 89% rename from baram/view/setup/materials/material_page.py rename to baramFlow/view/setup/materials/material_page.py index 58ea97a6..eeb9c9ac 100644 --- a/baram/view/setup/materials/material_page.py +++ b/baramFlow/view/setup/materials/material_page.py @@ -4,13 +4,13 @@ from PySide6.QtWidgets import QVBoxLayout, QMessageBox from PySide6.QtCore import Signal -from baram.coredb import coredb -from baram.coredb.material_db import MaterialDB -from baram.coredb.project import Project -from baram.coredb.coredb import Error -from baram.view.widgets.selector_dialog import SelectorDialog -from baram.view.widgets.multi_selector_dialog import SelectorItem -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.project import Project +from baramFlow.coredb.coredb import Error +from baramFlow.view.widgets.selector_dialog import SelectorDialog +from baramFlow.view.widgets.multi_selector_dialog import SelectorItem +from baramFlow.view.widgets.content_page import ContentPage from .material_page_ui import Ui_MaterialPage from .material_card import MaterialCard diff --git a/baram/view/setup/materials/material_page.ui b/baramFlow/view/setup/materials/material_page.ui similarity index 100% rename from baram/view/setup/materials/material_page.ui rename to baramFlow/view/setup/materials/material_page.ui diff --git a/baram/view/setup/models/__init__.py b/baramFlow/view/setup/models/__init__.py similarity index 100% rename from baram/view/setup/models/__init__.py rename to baramFlow/view/setup/models/__init__.py diff --git a/baram/view/setup/models/energy_dialog.py b/baramFlow/view/setup/models/energy_dialog.py similarity index 88% rename from baram/view/setup/models/energy_dialog.py rename to baramFlow/view/setup/models/energy_dialog.py index 2b8d1a9f..04e19d53 100644 --- a/baram/view/setup/models/energy_dialog.py +++ b/baramFlow/view/setup/models/energy_dialog.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import ModelsDB -from baram.coredb.general_db import GeneralDB +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.general_db import GeneralDB from .energy_dialog_ui import Ui_EnergyDialog diff --git a/baram/view/setup/models/energy_dialog.ui b/baramFlow/view/setup/models/energy_dialog.ui similarity index 100% rename from baram/view/setup/models/energy_dialog.ui rename to baramFlow/view/setup/models/energy_dialog.ui diff --git a/baram/view/setup/models/models_page.py b/baramFlow/view/setup/models/models_page.py similarity index 94% rename from baram/view/setup/models/models_page.py rename to baramFlow/view/setup/models/models_page.py index 31f35fad..b9330eee 100644 --- a/baram/view/setup/models/models_page.py +++ b/baramFlow/view/setup/models/models_page.py @@ -5,9 +5,9 @@ from PySide6.QtWidgets import QListWidgetItem from PySide6.QtGui import QBrush, QColor -from baram.coredb.models_db import ModelsDB, MultiphaseModel, TurbulenceModel -from baram.coredb.general_db import GeneralDB, SolverType -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb.models_db import ModelsDB, MultiphaseModel, TurbulenceModel +from baramFlow.coredb.general_db import GeneralDB, SolverType +from baramFlow.view.widgets.content_page import ContentPage from .models_page_ui import Ui_ModelsPage from .turbulence_dialog import TurbulenceModelDialog from .energy_dialog import EnergyDialog diff --git a/baram/view/setup/models/models_page.ui b/baramFlow/view/setup/models/models_page.ui similarity index 100% rename from baram/view/setup/models/models_page.ui rename to baramFlow/view/setup/models/models_page.ui diff --git a/baram/view/setup/models/multiphase_dialog.py b/baramFlow/view/setup/models/multiphase_dialog.py similarity index 87% rename from baram/view/setup/models/multiphase_dialog.py rename to baramFlow/view/setup/models/multiphase_dialog.py index b7900949..8196a8bb 100644 --- a/baram/view/setup/models/multiphase_dialog.py +++ b/baramFlow/view/setup/models/multiphase_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import ModelsDB, MultiphaseModel -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import ModelsDB, MultiphaseModel +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .multiphase_dialog_ui import Ui_MultiphaseDialog diff --git a/baram/view/setup/models/multiphase_dialog.ui b/baramFlow/view/setup/models/multiphase_dialog.ui similarity index 100% rename from baram/view/setup/models/multiphase_dialog.ui rename to baramFlow/view/setup/models/multiphase_dialog.ui diff --git a/baram/view/setup/models/radiation_dialog.py b/baramFlow/view/setup/models/radiation_dialog.py similarity index 97% rename from baram/view/setup/models/radiation_dialog.py rename to baramFlow/view/setup/models/radiation_dialog.py index f36afc78..b54a871d 100644 --- a/baram/view/setup/models/radiation_dialog.py +++ b/baramFlow/view/setup/models/radiation_dialog.py @@ -5,7 +5,7 @@ from PySide6.QtWidgets import QFormLayout -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .radiation_dialog_ui import Ui_RadiationDialog diff --git a/baram/view/setup/models/radiation_dialog.ui b/baramFlow/view/setup/models/radiation_dialog.ui similarity index 100% rename from baram/view/setup/models/radiation_dialog.ui rename to baramFlow/view/setup/models/radiation_dialog.ui diff --git a/baram/view/setup/models/turbulence_dialog.py b/baramFlow/view/setup/models/turbulence_dialog.py similarity index 95% rename from baram/view/setup/models/turbulence_dialog.py rename to baramFlow/view/setup/models/turbulence_dialog.py index 905d37f9..4d21f21a 100644 --- a/baram/view/setup/models/turbulence_dialog.py +++ b/baramFlow/view/setup/models/turbulence_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import ModelsDB, TurbulenceModel, KEpsilonModel, NearWallTreatment, KOmegaModel -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel, KEpsilonModel, NearWallTreatment, KOmegaModel +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .turbulence_dialog_ui import Ui_TurbulenceDialog diff --git a/baram/view/setup/models/turbulence_dialog.ui b/baramFlow/view/setup/models/turbulence_dialog.ui similarity index 100% rename from baram/view/setup/models/turbulence_dialog.ui rename to baramFlow/view/setup/models/turbulence_dialog.ui diff --git a/baram/view/setup/reference_values/__init__.py b/baramFlow/view/setup/reference_values/__init__.py similarity index 100% rename from baram/view/setup/reference_values/__init__.py rename to baramFlow/view/setup/reference_values/__init__.py diff --git a/baram/view/setup/reference_values/reference_values_page.py b/baramFlow/view/setup/reference_values/reference_values_page.py similarity index 91% rename from baram/view/setup/reference_values/reference_values_page.py rename to baramFlow/view/setup/reference_values/reference_values_page.py index 5e99cc42..d5e4c880 100644 --- a/baram/view/setup/reference_values/reference_values_page.py +++ b/baramFlow/view/setup/reference_values/reference_values_page.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.reference_values_db import ReferenceValuesDB -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.reference_values_db import ReferenceValuesDB +from baramFlow.view.widgets.content_page import ContentPage from .reference_values_page_ui import Ui_ReferenceValuesPage diff --git a/baram/view/setup/reference_values/reference_values_page.ui b/baramFlow/view/setup/reference_values/reference_values_page.ui similarity index 100% rename from baram/view/setup/reference_values/reference_values_page.ui rename to baramFlow/view/setup/reference_values/reference_values_page.ui diff --git a/baram/view/solution/__init__.py b/baramFlow/view/solution/__init__.py similarity index 100% rename from baram/view/solution/__init__.py rename to baramFlow/view/solution/__init__.py diff --git a/baram/view/solution/initialization/__init__.py b/baramFlow/view/solution/initialization/__init__.py similarity index 100% rename from baram/view/solution/initialization/__init__.py rename to baramFlow/view/solution/initialization/__init__.py diff --git a/baram/view/solution/initialization/initialization_page.py b/baramFlow/view/solution/initialization/initialization_page.py similarity index 92% rename from baram/view/solution/initialization/initialization_page.py rename to baramFlow/view/solution/initialization/initialization_page.py index aae0466d..c30fc1b6 100644 --- a/baram/view/solution/initialization/initialization_page.py +++ b/baramFlow/view/solution/initialization/initialization_page.py @@ -8,14 +8,14 @@ from libbaram.run import runParallelUtility from widgets.progress_dialog import ProgressDialog -from baram.app import app -from baram.coredb import coredb -from baram.coredb.project import Project, SolverStatus -from baram.coredb.region_db import DEFAULT_REGION_NAME -from baram.openfoam import parallel -from baram.openfoam.case_generator import CaseGenerator -from baram.openfoam.file_system import FileSystem -from baram.view.widgets.content_page import ContentPage +from baramFlow.app import app +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project, SolverStatus +from baramFlow.coredb.region_db import DEFAULT_REGION_NAME +from baramFlow.openfoam import parallel +from baramFlow.openfoam.case_generator import CaseGenerator +from baramFlow.openfoam.file_system import FileSystem +from baramFlow.view.widgets.content_page import ContentPage from .initialization_page_ui import Ui_InitializationPage from .initialization_widget import InitializationWidget diff --git a/baram/view/solution/initialization/initialization_page.ui b/baramFlow/view/solution/initialization/initialization_page.ui similarity index 100% rename from baram/view/solution/initialization/initialization_page.ui rename to baramFlow/view/solution/initialization/initialization_page.ui diff --git a/baram/view/solution/initialization/initialization_widget.py b/baramFlow/view/solution/initialization/initialization_widget.py similarity index 96% rename from baram/view/solution/initialization/initialization_widget.py rename to baramFlow/view/solution/initialization/initialization_widget.py index 2b2fca44..0da9a9f6 100644 --- a/baram/view/solution/initialization/initialization_widget.py +++ b/baramFlow/view/solution/initialization/initialization_widget.py @@ -9,14 +9,14 @@ from PySide6.QtGui import QIcon from PySide6.QtCore import Signal -from baram.app import app -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.app import app +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel from resources import resource -from baram.mesh.vtk_loader import hexActor, cylinderActor, sphereActor +from baramFlow.mesh.vtk_loader import hexActor, cylinderActor, sphereActor from widgets.flat_push_button import FlatPushButton -from baram.view.widgets.volume_fraction_widget import VolumeFractionWidget +from baramFlow.view.widgets.volume_fraction_widget import VolumeFractionWidget from .initialization_widget_ui import Ui_initializationWidget from .section_dialog import SectionDialog diff --git a/baram/view/solution/initialization/initialization_widget.ui b/baramFlow/view/solution/initialization/initialization_widget.ui similarity index 100% rename from baram/view/solution/initialization/initialization_widget.ui rename to baramFlow/view/solution/initialization/initialization_widget.ui diff --git a/baram/view/solution/initialization/option_dialog.py b/baramFlow/view/solution/initialization/option_dialog.py similarity index 92% rename from baram/view/solution/initialization/option_dialog.py rename to baramFlow/view/solution/initialization/option_dialog.py index 8b7fd3dc..98777259 100644 --- a/baram/view/solution/initialization/option_dialog.py +++ b/baramFlow/view/solution/initialization/option_dialog.py @@ -3,7 +3,7 @@ from enum import Enum, auto -from baram.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.resizable_dialog import ResizableDialog from .option_dialog_ui import Ui_OptionDialog diff --git a/baram/view/solution/initialization/option_dialog.ui b/baramFlow/view/solution/initialization/option_dialog.ui similarity index 100% rename from baram/view/solution/initialization/option_dialog.ui rename to baramFlow/view/solution/initialization/option_dialog.ui diff --git a/baram/view/solution/initialization/section_dialog.py b/baramFlow/view/solution/initialization/section_dialog.py similarity index 98% rename from baram/view/solution/initialization/section_dialog.py rename to baramFlow/view/solution/initialization/section_dialog.py index 41e0cc00..a7cd8bcd 100644 --- a/baram/view/solution/initialization/section_dialog.py +++ b/baramFlow/view/solution/initialization/section_dialog.py @@ -10,11 +10,11 @@ from PySide6.QtWidgets import QSizePolicy, QRadioButton, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter -from baram.view.widgets.resizable_dialog import ResizableDialog -from baram.view.widgets.volume_fraction_widget import VolumeFractionWidget +from baramFlow.view.widgets.resizable_dialog import ResizableDialog +from baramFlow.view.widgets.volume_fraction_widget import VolumeFractionWidget from .section_dialog_ui import Ui_sectionDialog diff --git a/baram/view/solution/initialization/section_dialog.ui b/baramFlow/view/solution/initialization/section_dialog.ui similarity index 100% rename from baram/view/solution/initialization/section_dialog.ui rename to baramFlow/view/solution/initialization/section_dialog.ui diff --git a/baram/view/solution/monitors/__init__.py b/baramFlow/view/solution/monitors/__init__.py similarity index 100% rename from baram/view/solution/monitors/__init__.py rename to baramFlow/view/solution/monitors/__init__.py diff --git a/baram/view/solution/monitors/force_dialog.py b/baramFlow/view/solution/monitors/force_dialog.py similarity index 96% rename from baram/view/solution/monitors/force_dialog.py rename to baramFlow/view/solution/monitors/force_dialog.py index 7f809ed1..79f5f81c 100644 --- a/baram/view/solution/monitors/force_dialog.py +++ b/baramFlow/view/solution/monitors/force_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.monitor_db import MonitorDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.monitor_db import MonitorDB from .force_dialog_ui import Ui_ForceDialog from .region_objects_selector import BoundariesSelector diff --git a/baram/view/solution/monitors/force_dialog.ui b/baramFlow/view/solution/monitors/force_dialog.ui similarity index 100% rename from baram/view/solution/monitors/force_dialog.ui rename to baramFlow/view/solution/monitors/force_dialog.ui diff --git a/baram/view/solution/monitors/forces_widget.py b/baramFlow/view/solution/monitors/forces_widget.py similarity index 97% rename from baram/view/solution/monitors/forces_widget.py rename to baramFlow/view/solution/monitors/forces_widget.py index f35fbbda..a62b7466 100644 --- a/baram/view/solution/monitors/forces_widget.py +++ b/baramFlow/view/solution/monitors/forces_widget.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb +from baramFlow.coredb import coredb from .monitors_widget import MonitorsWidget from .force_dialog import ForceDialog diff --git a/baram/view/solution/monitors/monitor_widget.py b/baramFlow/view/solution/monitors/monitor_widget.py similarity index 95% rename from baram/view/solution/monitors/monitor_widget.py rename to baramFlow/view/solution/monitors/monitor_widget.py index 1ac2b08d..05a8475f 100644 --- a/baram/view/solution/monitors/monitor_widget.py +++ b/baramFlow/view/solution/monitors/monitor_widget.py @@ -4,10 +4,10 @@ from PySide6.QtWidgets import QWidget -from baram.coredb import coredb -from baram.coredb.monitor_db import MonitorDB, FieldHelper -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.cell_zone_db import CellZoneDB +from baramFlow.coredb import coredb +from baramFlow.coredb.monitor_db import MonitorDB, FieldHelper +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.cell_zone_db import CellZoneDB from .force_dialog import ForceDialog from .point_dialog import PointDialog from .surface_dialog import SurfaceDialog diff --git a/baram/view/solution/monitors/monitor_widget.ui b/baramFlow/view/solution/monitors/monitor_widget.ui similarity index 100% rename from baram/view/solution/monitors/monitor_widget.ui rename to baramFlow/view/solution/monitors/monitor_widget.ui diff --git a/baram/view/solution/monitors/monitors_page.py b/baramFlow/view/solution/monitors/monitors_page.py similarity index 97% rename from baram/view/solution/monitors/monitors_page.py rename to baramFlow/view/solution/monitors/monitors_page.py index 11f053a1..bc4d4255 100644 --- a/baram/view/solution/monitors/monitors_page.py +++ b/baramFlow/view/solution/monitors/monitors_page.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QMenu, QListWidgetItem, QMessageBox -from baram.coredb import coredb -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.view.widgets.content_page import ContentPage from .monitors_page_ui import Ui_MonitorsPage from .force_dialog import ForceDialog from .point_dialog import PointDialog diff --git a/baram/view/solution/monitors/monitors_page.ui b/baramFlow/view/solution/monitors/monitors_page.ui similarity index 100% rename from baram/view/solution/monitors/monitors_page.ui rename to baramFlow/view/solution/monitors/monitors_page.ui diff --git a/baram/view/solution/monitors/monitors_widget.py b/baramFlow/view/solution/monitors/monitors_widget.py similarity index 100% rename from baram/view/solution/monitors/monitors_widget.py rename to baramFlow/view/solution/monitors/monitors_widget.py diff --git a/baram/view/solution/monitors/monitors_widget.ui b/baramFlow/view/solution/monitors/monitors_widget.ui similarity index 100% rename from baram/view/solution/monitors/monitors_widget.ui rename to baramFlow/view/solution/monitors/monitors_widget.ui diff --git a/baram/view/solution/monitors/point_dialog.py b/baramFlow/view/solution/monitors/point_dialog.py similarity index 94% rename from baram/view/solution/monitors/point_dialog.py rename to baramFlow/view/solution/monitors/point_dialog.py index 3926148d..a73bf77c 100644 --- a/baram/view/solution/monitors/point_dialog.py +++ b/baramFlow/view/solution/monitors/point_dialog.py @@ -3,11 +3,11 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.monitor_db import MonitorDB, FieldHelper -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.monitor_db import MonitorDB, FieldHelper +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .point_dialog_ui import Ui_PointDialog diff --git a/baram/view/solution/monitors/point_dialog.ui b/baramFlow/view/solution/monitors/point_dialog.ui similarity index 100% rename from baram/view/solution/monitors/point_dialog.ui rename to baramFlow/view/solution/monitors/point_dialog.ui diff --git a/baram/view/solution/monitors/points_widget.py b/baramFlow/view/solution/monitors/points_widget.py similarity index 97% rename from baram/view/solution/monitors/points_widget.py rename to baramFlow/view/solution/monitors/points_widget.py index 8beef8b5..76c0e995 100644 --- a/baram/view/solution/monitors/points_widget.py +++ b/baramFlow/view/solution/monitors/points_widget.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb +from baramFlow.coredb import coredb from .monitors_widget import MonitorsWidget from .point_dialog import PointDialog diff --git a/baram/view/solution/monitors/region_objects_selector.py b/baramFlow/view/solution/monitors/region_objects_selector.py similarity index 98% rename from baram/view/solution/monitors/region_objects_selector.py rename to baramFlow/view/solution/monitors/region_objects_selector.py index b2e001a9..ca1d3c81 100644 --- a/baram/view/solution/monitors/region_objects_selector.py +++ b/baramFlow/view/solution/monitors/region_objects_selector.py @@ -6,8 +6,8 @@ from PySide6.QtWidgets import QDialog, QListWidgetItem from PySide6.QtCore import Qt -from baram.coredb import coredb -from baram.coredb.boundary_db import BoundaryDB +from baramFlow.coredb import coredb +from baramFlow.coredb.boundary_db import BoundaryDB from .region_objects_selector_ui import Ui_RegionObjectsSelector diff --git a/baram/view/solution/monitors/region_objects_selector.ui b/baramFlow/view/solution/monitors/region_objects_selector.ui similarity index 100% rename from baram/view/solution/monitors/region_objects_selector.ui rename to baramFlow/view/solution/monitors/region_objects_selector.ui diff --git a/baram/view/solution/monitors/surface_dialog.py b/baramFlow/view/solution/monitors/surface_dialog.py similarity index 93% rename from baram/view/solution/monitors/surface_dialog.py rename to baramFlow/view/solution/monitors/surface_dialog.py index 341922b4..b5cd75a9 100644 --- a/baram/view/solution/monitors/surface_dialog.py +++ b/baramFlow/view/solution/monitors/surface_dialog.py @@ -3,11 +3,11 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.monitor_db import MonitorDB, SurfaceReportType, FieldHelper -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.monitor_db import MonitorDB, SurfaceReportType, FieldHelper +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .surface_dialog_ui import Ui_SurfaceDialog diff --git a/baram/view/solution/monitors/surface_dialog.ui b/baramFlow/view/solution/monitors/surface_dialog.ui similarity index 100% rename from baram/view/solution/monitors/surface_dialog.ui rename to baramFlow/view/solution/monitors/surface_dialog.ui diff --git a/baram/view/solution/monitors/surfaces_widget.py b/baramFlow/view/solution/monitors/surfaces_widget.py similarity index 97% rename from baram/view/solution/monitors/surfaces_widget.py rename to baramFlow/view/solution/monitors/surfaces_widget.py index abee0f8c..260d80be 100644 --- a/baram/view/solution/monitors/surfaces_widget.py +++ b/baramFlow/view/solution/monitors/surfaces_widget.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb +from baramFlow.coredb import coredb from .monitors_widget import MonitorsWidget from .surface_dialog import SurfaceDialog diff --git a/baram/view/solution/monitors/volume_dialog.py b/baramFlow/view/solution/monitors/volume_dialog.py similarity index 93% rename from baram/view/solution/monitors/volume_dialog.py rename to baramFlow/view/solution/monitors/volume_dialog.py index cf9b1807..30db467b 100644 --- a/baram/view/solution/monitors/volume_dialog.py +++ b/baramFlow/view/solution/monitors/volume_dialog.py @@ -3,11 +3,11 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.cell_zone_db import CellZoneDB -from baram.coredb.monitor_db import MonitorDB, VolumeReportType, FieldHelper -from baram.view.widgets.selector_dialog import SelectorDialog +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.cell_zone_db import CellZoneDB +from baramFlow.coredb.monitor_db import MonitorDB, VolumeReportType, FieldHelper +from baramFlow.view.widgets.selector_dialog import SelectorDialog from .volume_dialog_ui import Ui_VolumeDialog diff --git a/baram/view/solution/monitors/volume_dialog.ui b/baramFlow/view/solution/monitors/volume_dialog.ui similarity index 100% rename from baram/view/solution/monitors/volume_dialog.ui rename to baramFlow/view/solution/monitors/volume_dialog.ui diff --git a/baram/view/solution/monitors/volumes_widget.py b/baramFlow/view/solution/monitors/volumes_widget.py similarity index 97% rename from baram/view/solution/monitors/volumes_widget.py rename to baramFlow/view/solution/monitors/volumes_widget.py index dd177397..23231bd9 100644 --- a/baram/view/solution/monitors/volumes_widget.py +++ b/baramFlow/view/solution/monitors/volumes_widget.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb +from baramFlow.coredb import coredb from .monitors_widget import MonitorsWidget from .volume_dialog import VolumeDialog diff --git a/baram/view/solution/numerical_conditions/__init__.py b/baramFlow/view/solution/numerical_conditions/__init__.py similarity index 100% rename from baram/view/solution/numerical_conditions/__init__.py rename to baramFlow/view/solution/numerical_conditions/__init__.py diff --git a/baram/view/solution/numerical_conditions/advanced_dialog.py b/baramFlow/view/solution/numerical_conditions/advanced_dialog.py similarity index 90% rename from baram/view/solution/numerical_conditions/advanced_dialog.py rename to baramFlow/view/solution/numerical_conditions/advanced_dialog.py index 39885940..2d6393ba 100644 --- a/baram/view/solution/numerical_conditions/advanced_dialog.py +++ b/baramFlow/view/solution/numerical_conditions/advanced_dialog.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.numerical_db import NumericalDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.numerical_db import NumericalDB from .advanced_dialog_ui import Ui_AdvancedDialog diff --git a/baram/view/solution/numerical_conditions/advanced_dialog.ui b/baramFlow/view/solution/numerical_conditions/advanced_dialog.ui similarity index 100% rename from baram/view/solution/numerical_conditions/advanced_dialog.ui rename to baramFlow/view/solution/numerical_conditions/advanced_dialog.ui diff --git a/baram/view/solution/numerical_conditions/numerical_conditions_page.py b/baramFlow/view/solution/numerical_conditions/numerical_conditions_page.py similarity index 97% rename from baram/view/solution/numerical_conditions/numerical_conditions_page.py rename to baramFlow/view/solution/numerical_conditions/numerical_conditions_page.py index 6b3f33e7..540f5f57 100644 --- a/baram/view/solution/numerical_conditions/numerical_conditions_page.py +++ b/baramFlow/view/solution/numerical_conditions/numerical_conditions_page.py @@ -3,13 +3,13 @@ from PySide6.QtWidgets import QMessageBox -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.general_db import GeneralDB -from baram.coredb.numerical_db import PressureVelocityCouplingScheme, ImplicitDiscretizationScheme, UpwindDiscretizationScheme -from baram.coredb.numerical_db import NumericalDB -from baram.coredb.models_db import ModelsDB, TurbulenceModel -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.numerical_db import PressureVelocityCouplingScheme, ImplicitDiscretizationScheme, UpwindDiscretizationScheme +from baramFlow.coredb.numerical_db import NumericalDB +from baramFlow.coredb.models_db import ModelsDB, TurbulenceModel +from baramFlow.view.widgets.content_page import ContentPage from .numerical_conditions_page_ui import Ui_NumericalConditionsPage from .advanced_dialog import AdvancedDialog diff --git a/baram/view/solution/numerical_conditions/numerical_conditions_page.ui b/baramFlow/view/solution/numerical_conditions/numerical_conditions_page.ui similarity index 100% rename from baram/view/solution/numerical_conditions/numerical_conditions_page.ui rename to baramFlow/view/solution/numerical_conditions/numerical_conditions_page.ui diff --git a/baram/view/solution/run/__init__.py b/baramFlow/view/solution/run/__init__.py similarity index 100% rename from baram/view/solution/run/__init__.py rename to baramFlow/view/solution/run/__init__.py diff --git a/baram/view/solution/run/job_information_page.py b/baramFlow/view/solution/run/job_information_page.py similarity index 60% rename from baram/view/solution/run/job_information_page.py rename to baramFlow/view/solution/run/job_information_page.py index 5840694b..50fc7bcf 100644 --- a/baram/view/solution/run/job_information_page.py +++ b/baramFlow/view/solution/run/job_information_page.py @@ -5,10 +5,10 @@ from PySide6.QtWidgets import QWidget, QMessageBox, QFormLayout -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.general_db import GeneralDB -from baram.coredb.run_calculation_db import TimeSteppingMethod, DataWriteFormat, RunCalculationDB +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.run_calculation_db import TimeSteppingMethod, DataWriteFormat, RunCalculationDB from .job_information_page_ui import Ui_JobInformationPage class JobInformationPage(QWidget): diff --git a/baram/view/solution/run/job_information_page.ui b/baramFlow/view/solution/run/job_information_page.ui similarity index 100% rename from baram/view/solution/run/job_information_page.ui rename to baramFlow/view/solution/run/job_information_page.ui diff --git a/baram/view/solution/run/process_information_page.py b/baramFlow/view/solution/run/process_information_page.py similarity index 90% rename from baram/view/solution/run/process_information_page.py rename to baramFlow/view/solution/run/process_information_page.py index ab2fa141..462ab38a 100644 --- a/baram/view/solution/run/process_information_page.py +++ b/baramFlow/view/solution/run/process_information_page.py @@ -10,16 +10,16 @@ from libbaram.run import launchSolver from widgets.progress_dialog import ProgressDialog -from baram.coredb import coredb -from baram.coredb.project import Project, SolverStatus -from baram.openfoam import parallel -from baram.openfoam.case_generator import CaseGenerator -from baram.openfoam.system.fv_solution import FvSolution -from baram.openfoam.system.control_dict import ControlDict -from baram.openfoam.system.fv_schemes import FvSchemes -import baram.openfoam.solver -from baram.openfoam.file_system import FileSystem -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.project import Project, SolverStatus +from baramFlow.openfoam import parallel +from baramFlow.openfoam.case_generator import CaseGenerator +from baramFlow.openfoam.system.fv_solution import FvSolution +from baramFlow.openfoam.system.control_dict import ControlDict +from baramFlow.openfoam.system.fv_schemes import FvSchemes +import baramFlow.openfoam.solver +from baramFlow.openfoam.file_system import FileSystem +from baramFlow.view.widgets.content_page import ContentPage from .process_information_page_ui import Ui_ProcessInformationPage @@ -77,7 +77,7 @@ async def _startCalculationClicked(self): return caseRoot = FileSystem.caseRoot() - solvers = baram.openfoam.solver.findSolvers() + solvers = baramFlow.openfoam.solver.findSolvers() process = launchSolver(solvers[0], caseRoot, self._project.uuid, parallel.getEnvironment()) if process: diff --git a/baram/view/solution/run/process_information_page.ui b/baramFlow/view/solution/run/process_information_page.ui similarity index 100% rename from baram/view/solution/run/process_information_page.ui rename to baramFlow/view/solution/run/process_information_page.ui diff --git a/baram/view/solution/run_conditions/__init__.py b/baramFlow/view/solution/run_conditions/__init__.py similarity index 100% rename from baram/view/solution/run_conditions/__init__.py rename to baramFlow/view/solution/run_conditions/__init__.py diff --git a/baram/view/solution/run_conditions/edit_hostfile_dialog.py b/baramFlow/view/solution/run_conditions/edit_hostfile_dialog.py similarity index 98% rename from baram/view/solution/run_conditions/edit_hostfile_dialog.py rename to baramFlow/view/solution/run_conditions/edit_hostfile_dialog.py index 6645c288..3f3d3d8e 100644 --- a/baram/view/solution/run_conditions/edit_hostfile_dialog.py +++ b/baramFlow/view/solution/run_conditions/edit_hostfile_dialog.py @@ -4,7 +4,7 @@ from PySide6.QtGui import QFontDatabase from PySide6.QtWidgets import QDialog, QFileDialog -from baram.coredb import coredb +from baramFlow.coredb import coredb from .edit_hostfile_dialog_ui import Ui_EditHostfileDialog diff --git a/baram/view/solution/run_conditions/edit_hostfile_dialog.ui b/baramFlow/view/solution/run_conditions/edit_hostfile_dialog.ui similarity index 100% rename from baram/view/solution/run_conditions/edit_hostfile_dialog.ui rename to baramFlow/view/solution/run_conditions/edit_hostfile_dialog.ui diff --git a/baram/view/solution/run_conditions/run_conditions_page.py b/baramFlow/view/solution/run_conditions/run_conditions_page.py similarity index 95% rename from baram/view/solution/run_conditions/run_conditions_page.py rename to baramFlow/view/solution/run_conditions/run_conditions_page.py index 42d9fef6..2e1f9e71 100644 --- a/baram/view/solution/run_conditions/run_conditions_page.py +++ b/baramFlow/view/solution/run_conditions/run_conditions_page.py @@ -5,12 +5,12 @@ from PySide6.QtWidgets import QMessageBox, QFormLayout -from baram.coredb import coredb -from baram.coredb.coredb_writer import CoreDBWriter -from baram.coredb.general_db import GeneralDB -from baram.coredb.run_calculation_db import TimeSteppingMethod, DataWriteFormat, RunCalculationDB -from baram.coredb.models_db import ModelsDB, MultiphaseModel -from baram.view.widgets.content_page import ContentPage +from baramFlow.coredb import coredb +from baramFlow.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.run_calculation_db import TimeSteppingMethod, DataWriteFormat, RunCalculationDB +from baramFlow.coredb.models_db import ModelsDB, MultiphaseModel +from baramFlow.view.widgets.content_page import ContentPage from .run_conditions_page_ui import Ui_RunConditionsPage diff --git a/baram/view/solution/run_conditions/run_conditions_page.ui b/baramFlow/view/solution/run_conditions/run_conditions_page.ui similarity index 100% rename from baram/view/solution/run_conditions/run_conditions_page.ui rename to baramFlow/view/solution/run_conditions/run_conditions_page.ui diff --git a/baram/view/widgets/__init__.py b/baramFlow/view/widgets/__init__.py similarity index 100% rename from baram/view/widgets/__init__.py rename to baramFlow/view/widgets/__init__.py diff --git a/baram/view/widgets/chart_wigdet.py b/baramFlow/view/widgets/chart_wigdet.py similarity index 97% rename from baram/view/widgets/chart_wigdet.py rename to baramFlow/view/widgets/chart_wigdet.py index d8624e5c..8373f518 100644 --- a/baram/view/widgets/chart_wigdet.py +++ b/baramFlow/view/widgets/chart_wigdet.py @@ -15,9 +15,9 @@ from matplotlib.figure import Figure from matplotlib.lines import Line2D -from baram.coredb import coredb -from baram.coredb.general_db import GeneralDB -from baram.coredb.run_calculation_db import TimeSteppingMethod, RunCalculationDB +from baramFlow.coredb import coredb +from baramFlow.coredb.general_db import GeneralDB +from baramFlow.coredb.run_calculation_db import TimeSteppingMethod, RunCalculationDB SIDE_MARGIN = 0.05 # 5% margin between line end and right axis diff --git a/baram/view/widgets/content_page.py b/baramFlow/view/widgets/content_page.py similarity index 100% rename from baram/view/widgets/content_page.py rename to baramFlow/view/widgets/content_page.py diff --git a/baram/view/widgets/enum_button_group.py b/baramFlow/view/widgets/enum_button_group.py similarity index 100% rename from baram/view/widgets/enum_button_group.py rename to baramFlow/view/widgets/enum_button_group.py diff --git a/baram/view/widgets/enum_combo_box.py b/baramFlow/view/widgets/enum_combo_box.py similarity index 100% rename from baram/view/widgets/enum_combo_box.py rename to baramFlow/view/widgets/enum_combo_box.py diff --git a/baram/view/widgets/flow_layout.py b/baramFlow/view/widgets/flow_layout.py similarity index 100% rename from baram/view/widgets/flow_layout.py rename to baramFlow/view/widgets/flow_layout.py diff --git a/baram/view/widgets/multi_selector_dialog.py b/baramFlow/view/widgets/multi_selector_dialog.py similarity index 100% rename from baram/view/widgets/multi_selector_dialog.py rename to baramFlow/view/widgets/multi_selector_dialog.py diff --git a/baram/view/widgets/multi_selector_dialog.ui b/baramFlow/view/widgets/multi_selector_dialog.ui similarity index 100% rename from baram/view/widgets/multi_selector_dialog.ui rename to baramFlow/view/widgets/multi_selector_dialog.ui diff --git a/baram/view/widgets/new_project_dialog.py b/baramFlow/view/widgets/new_project_dialog.py similarity index 97% rename from baram/view/widgets/new_project_dialog.py rename to baramFlow/view/widgets/new_project_dialog.py index 7e408894..7ee8ae38 100644 --- a/baram/view/widgets/new_project_dialog.py +++ b/baramFlow/view/widgets/new_project_dialog.py @@ -5,7 +5,7 @@ from PySide6.QtWidgets import QDialog, QFileDialog, QDialogButtonBox -from baram.coredb.app_settings import AppSettings +from baramFlow.coredb.app_settings import AppSettings from .new_project_dialog_ui import Ui_NewProjectDialog diff --git a/baram/view/widgets/new_project_dialog.ui b/baramFlow/view/widgets/new_project_dialog.ui similarity index 100% rename from baram/view/widgets/new_project_dialog.ui rename to baramFlow/view/widgets/new_project_dialog.ui diff --git a/baram/view/widgets/number_input_dialog.py b/baramFlow/view/widgets/number_input_dialog.py similarity index 100% rename from baram/view/widgets/number_input_dialog.py rename to baramFlow/view/widgets/number_input_dialog.py diff --git a/baram/view/widgets/number_input_dialog.ui b/baramFlow/view/widgets/number_input_dialog.ui similarity index 100% rename from baram/view/widgets/number_input_dialog.ui rename to baramFlow/view/widgets/number_input_dialog.ui diff --git a/baram/view/widgets/progress_dialog.py b/baramFlow/view/widgets/progress_dialog.py similarity index 100% rename from baram/view/widgets/progress_dialog.py rename to baramFlow/view/widgets/progress_dialog.py diff --git a/baram/view/widgets/progress_dialog.ui b/baramFlow/view/widgets/progress_dialog.ui similarity index 100% rename from baram/view/widgets/progress_dialog.ui rename to baramFlow/view/widgets/progress_dialog.ui diff --git a/baram/view/widgets/progress_dialog_simple.py b/baramFlow/view/widgets/progress_dialog_simple.py similarity index 100% rename from baram/view/widgets/progress_dialog_simple.py rename to baramFlow/view/widgets/progress_dialog_simple.py diff --git a/baram/view/widgets/project_selector.py b/baramFlow/view/widgets/project_selector.py similarity index 96% rename from baram/view/widgets/project_selector.py rename to baramFlow/view/widgets/project_selector.py index 7bf809b6..83699c35 100644 --- a/baram/view/widgets/project_selector.py +++ b/baramFlow/view/widgets/project_selector.py @@ -6,9 +6,9 @@ from libbaram.utils import getFit -from baram.app import app -from baram.coredb.app_settings import AppSettings -from baram.coredb.project_settings import ProjectSettings +from baramFlow.app import app +from baramFlow.coredb.app_settings import AppSettings +from baramFlow.coredb.project_settings import ProjectSettings from .project_selector_ui import Ui_ProjectSelector from .project_widget import ProjectWidget diff --git a/baram/view/widgets/project_selector.ui b/baramFlow/view/widgets/project_selector.ui similarity index 100% rename from baram/view/widgets/project_selector.ui rename to baramFlow/view/widgets/project_selector.ui diff --git a/baram/view/widgets/project_widget.py b/baramFlow/view/widgets/project_widget.py similarity index 100% rename from baram/view/widgets/project_widget.py rename to baramFlow/view/widgets/project_widget.py diff --git a/baram/view/widgets/project_widget.ui b/baramFlow/view/widgets/project_widget.ui similarity index 100% rename from baram/view/widgets/project_widget.ui rename to baramFlow/view/widgets/project_widget.ui diff --git a/baram/view/widgets/resizable_dialog.py b/baramFlow/view/widgets/resizable_dialog.py similarity index 100% rename from baram/view/widgets/resizable_dialog.py rename to baramFlow/view/widgets/resizable_dialog.py diff --git a/baram/view/widgets/selector_dialog.py b/baramFlow/view/widgets/selector_dialog.py similarity index 100% rename from baram/view/widgets/selector_dialog.py rename to baramFlow/view/widgets/selector_dialog.py diff --git a/baram/view/widgets/selector_dialog.ui b/baramFlow/view/widgets/selector_dialog.ui similarity index 100% rename from baram/view/widgets/selector_dialog.ui rename to baramFlow/view/widgets/selector_dialog.ui diff --git a/baram/view/widgets/volume_fraction_widget.py b/baramFlow/view/widgets/volume_fraction_widget.py similarity index 90% rename from baram/view/widgets/volume_fraction_widget.py rename to baramFlow/view/widgets/volume_fraction_widget.py index 99399b07..f1c40cd4 100644 --- a/baram/view/widgets/volume_fraction_widget.py +++ b/baramFlow/view/widgets/volume_fraction_widget.py @@ -3,12 +3,12 @@ from PySide6.QtWidgets import QGroupBox, QFormLayout, QLineEdit, QMessageBox -from baram.coredb import coredb -from baram.coredb.models_db import ModelsDB -from baram.coredb.region_db import RegionDB -from baram.coredb.boundary_db import BoundaryDB -from baram.coredb.material_db import MaterialDB -from baram.coredb.coredb_writer import CoreDBWriter +from baramFlow.coredb import coredb +from baramFlow.coredb.models_db import ModelsDB +from baramFlow.coredb.region_db import RegionDB +from baramFlow.coredb.boundary_db import BoundaryDB +from baramFlow.coredb.material_db import MaterialDB +from baramFlow.coredb.coredb_writer import CoreDBWriter class FractionRow: diff --git a/baramSnappy/__init__.py b/baramMesh/__init__.py similarity index 100% rename from baramSnappy/__init__.py rename to baramMesh/__init__.py diff --git a/baramSnappy/app.py b/baramMesh/app.py similarity index 92% rename from baramSnappy/app.py rename to baramMesh/app.py index e89a5e03..f9db7590 100644 --- a/baramSnappy/app.py +++ b/baramMesh/app.py @@ -6,11 +6,11 @@ from PySide6.QtCore import QObject, QTranslator, QCoreApplication, QLocale from PySide6.QtWidgets import QApplication -from baramSnappy.db.project import Project +from baramMesh.db.project import Project from resources import resource -from baramSnappy.settings.app_settings import AppSettings -from baramSnappy.settings.project_manager import ProjectManager -from baramSnappy.openfoam.file_system import FileSystem +from baramMesh.settings.app_settings import AppSettings +from baramMesh.settings.project_manager import ProjectManager +from baramMesh.openfoam.file_system import FileSystem class App(QObject): diff --git a/baramSnappy/db/__init__.py b/baramMesh/db/__init__.py similarity index 100% rename from baramSnappy/db/__init__.py rename to baramMesh/db/__init__.py diff --git a/baramSnappy/db/configurations.py b/baramMesh/db/configurations.py similarity index 100% rename from baramSnappy/db/configurations.py rename to baramMesh/db/configurations.py diff --git a/baramSnappy/db/configurations_schema.py b/baramMesh/db/configurations_schema.py similarity index 100% rename from baramSnappy/db/configurations_schema.py rename to baramMesh/db/configurations_schema.py diff --git a/baramSnappy/db/file_db.py b/baramMesh/db/file_db.py similarity index 100% rename from baramSnappy/db/file_db.py rename to baramMesh/db/file_db.py diff --git a/baramSnappy/db/migrate.py b/baramMesh/db/migrate.py similarity index 100% rename from baramSnappy/db/migrate.py rename to baramMesh/db/migrate.py diff --git a/baramSnappy/db/project.py b/baramMesh/db/project.py similarity index 87% rename from baramSnappy/db/project.py rename to baramMesh/db/project.py index bb8806b5..78b5cec7 100644 --- a/baramSnappy/db/project.py +++ b/baramMesh/db/project.py @@ -3,9 +3,9 @@ from PySide6.QtCore import QObject -from baramSnappy.settings.local_settings import LocalSettings, LocalSettingKey -from baramSnappy.db.configurations import Configurations -from baramSnappy.db.configurations_schema import schema +from baramMesh.settings.local_settings import LocalSettings, LocalSettingKey +from baramMesh.db.configurations import Configurations +from baramMesh.db.configurations_schema import schema class Project(QObject): diff --git a/baramSnappy/db/simple_db.py b/baramMesh/db/simple_db.py similarity index 100% rename from baramSnappy/db/simple_db.py rename to baramMesh/db/simple_db.py diff --git a/baramSnappy/db/simple_schema.py b/baramMesh/db/simple_schema.py similarity index 100% rename from baramSnappy/db/simple_schema.py rename to baramMesh/db/simple_schema.py diff --git a/baramSnappy/main.py b/baramMesh/main.py similarity index 81% rename from baramSnappy/main.py rename to baramMesh/main.py index 38dc1e56..9931c2b7 100644 --- a/baramSnappy/main.py +++ b/baramMesh/main.py @@ -17,9 +17,9 @@ # noinspection PyUnresolvedReferences import resource_rc -from baramSnappy.app import app -from baramSnappy.settings.app_properties import AppProperties -from baramSnappy.view.main_window.main_window import MainWindow +from baramMesh.app import app +from baramMesh.settings.app_properties import AppProperties +from baramMesh.view.main_window.main_window import MainWindow logger = logging.getLogger() @@ -43,10 +43,10 @@ def handle_exception(eType, eValue, eTraceback): def main(): app.setupApplication(AppProperties({ - 'name': 'baram-snappy', - 'fullName': QApplication.translate('Main', 'Baram-snappy'), - 'iconResource': 'baram.ico', - 'logoResource': 'baram.ico', + 'name': 'BaramMesh', + 'fullName': QApplication.translate('Main', 'BaramMesh'), + 'iconResource': 'baramMesh.ico', + 'logoResource': 'baramMesh.ico', })) os.environ["QT_SCALE_FACTOR"] = app.settings.getScale() diff --git a/baramSnappy/openfoam/__init__.py b/baramMesh/openfoam/__init__.py similarity index 100% rename from baramSnappy/openfoam/__init__.py rename to baramMesh/openfoam/__init__.py diff --git a/baramSnappy/openfoam/constant/__init__.py b/baramMesh/openfoam/constant/__init__.py similarity index 100% rename from baramSnappy/openfoam/constant/__init__.py rename to baramMesh/openfoam/constant/__init__.py diff --git a/baramSnappy/openfoam/constant/region_properties.py b/baramMesh/openfoam/constant/region_properties.py similarity index 91% rename from baramSnappy/openfoam/constant/region_properties.py rename to baramMesh/openfoam/constant/region_properties.py index 761a47aa..c2739de0 100644 --- a/baramSnappy/openfoam/constant/region_properties.py +++ b/baramMesh/openfoam/constant/region_properties.py @@ -4,8 +4,8 @@ from libbaram.openfoam.constants import Directory from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import RegionType +from baramMesh.app import app +from baramMesh.db.configurations_schema import RegionType class RegionProperties(DictionaryFile): diff --git a/baramSnappy/openfoam/file_system.py b/baramMesh/openfoam/file_system.py similarity index 100% rename from baramSnappy/openfoam/file_system.py rename to baramMesh/openfoam/file_system.py diff --git a/baramSnappy/openfoam/poly_mesh/__init__.py b/baramMesh/openfoam/poly_mesh/__init__.py similarity index 100% rename from baramSnappy/openfoam/poly_mesh/__init__.py rename to baramMesh/openfoam/poly_mesh/__init__.py diff --git a/baramSnappy/openfoam/poly_mesh/poly_mesh_loader.py b/baramMesh/openfoam/poly_mesh/poly_mesh_loader.py similarity index 100% rename from baramSnappy/openfoam/poly_mesh/poly_mesh_loader.py rename to baramMesh/openfoam/poly_mesh/poly_mesh_loader.py diff --git a/baramSnappy/openfoam/redistribution_task.py b/baramMesh/openfoam/redistribution_task.py similarity index 99% rename from baramSnappy/openfoam/redistribution_task.py rename to baramMesh/openfoam/redistribution_task.py index 5d01d4d9..4168f52d 100644 --- a/baramSnappy/openfoam/redistribution_task.py +++ b/baramMesh/openfoam/redistribution_task.py @@ -11,7 +11,7 @@ from libbaram.run import runUtility from libbaram.openfoam.dictionary.decomposePar_dict import DecomposeParDict -from baramSnappy.app import app +from baramMesh.app import app logger = logging.getLogger(__name__) diff --git a/baramSnappy/openfoam/system/__init__.py b/baramMesh/openfoam/system/__init__.py similarity index 100% rename from baramSnappy/openfoam/system/__init__.py rename to baramMesh/openfoam/system/__init__.py diff --git a/baramSnappy/openfoam/system/block_mesh_dict.py b/baramMesh/openfoam/system/block_mesh_dict.py similarity index 95% rename from baramSnappy/openfoam/system/block_mesh_dict.py rename to baramMesh/openfoam/system/block_mesh_dict.py index f2e2fa16..0ecc0d0a 100644 --- a/baramSnappy/openfoam/system/block_mesh_dict.py +++ b/baramMesh/openfoam/system/block_mesh_dict.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import Shape -from baramSnappy.db.simple_db import elementToVector +from baramMesh.app import app +from baramMesh.db.configurations_schema import Shape +from baramMesh.db.simple_db import elementToVector class BlockMeshDict(DictionaryFile): diff --git a/baramSnappy/openfoam/system/snappy_hex_mesh_dict.py b/baramMesh/openfoam/system/snappy_hex_mesh_dict.py similarity index 98% rename from baramSnappy/openfoam/system/snappy_hex_mesh_dict.py rename to baramMesh/openfoam/system/snappy_hex_mesh_dict.py index 39ceb647..c6e58415 100644 --- a/baramSnappy/openfoam/system/snappy_hex_mesh_dict.py +++ b/baramMesh/openfoam/system/snappy_hex_mesh_dict.py @@ -3,9 +3,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import GeometryType, Shape, CFDType, ThicknessModel -from baramSnappy.db.simple_db import elementToVector +from baramMesh.app import app +from baramMesh.db.configurations_schema import GeometryType, Shape, CFDType, ThicknessModel +from baramMesh.db.simple_db import elementToVector class SnappyHexMeshDict(DictionaryFile): diff --git a/baramSnappy/openfoam/system/surface_patch_dict.py b/baramMesh/openfoam/system/surface_patch_dict.py similarity index 96% rename from baramSnappy/openfoam/system/surface_patch_dict.py rename to baramMesh/openfoam/system/surface_patch_dict.py index c56beb65..a711df2d 100644 --- a/baramSnappy/openfoam/system/surface_patch_dict.py +++ b/baramMesh/openfoam/system/surface_patch_dict.py @@ -5,7 +5,7 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baramSnappy.app import app +from baramMesh.app import app @dataclass diff --git a/baramSnappy/openfoam/system/topo_set_dict.py b/baramMesh/openfoam/system/topo_set_dict.py similarity index 98% rename from baramSnappy/openfoam/system/topo_set_dict.py rename to baramMesh/openfoam/system/topo_set_dict.py index a90c6cd5..694eb553 100644 --- a/baramSnappy/openfoam/system/topo_set_dict.py +++ b/baramMesh/openfoam/system/topo_set_dict.py @@ -5,9 +5,9 @@ from libbaram.openfoam.dictionary.dictionary_file import DictionaryFile -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import CFDType, Shape -from baramSnappy.db.simple_db import elementToVector +from baramMesh.app import app +from baramMesh.db.configurations_schema import CFDType, Shape +from baramMesh.db.simple_db import elementToVector def pointToEntry(point): diff --git a/baramSnappy/rendering/__init__.py b/baramMesh/rendering/__init__.py similarity index 100% rename from baramSnappy/rendering/__init__.py rename to baramMesh/rendering/__init__.py diff --git a/baramSnappy/rendering/actor_info.py b/baramMesh/rendering/actor_info.py similarity index 100% rename from baramSnappy/rendering/actor_info.py rename to baramMesh/rendering/actor_info.py diff --git a/baramSnappy/rendering/plane_widget.py b/baramMesh/rendering/plane_widget.py similarity index 100% rename from baramSnappy/rendering/plane_widget.py rename to baramMesh/rendering/plane_widget.py diff --git a/baramSnappy/rendering/point_widget.py b/baramMesh/rendering/point_widget.py similarity index 98% rename from baramSnappy/rendering/point_widget.py rename to baramMesh/rendering/point_widget.py index 9253996a..8c228a63 100644 --- a/baramSnappy/rendering/point_widget.py +++ b/baramMesh/rendering/point_widget.py @@ -6,7 +6,7 @@ from vtkmodules.vtkCommonCore import vtkCommand from vtkmodules.vtkInteractionWidgets import vtkPointWidget -from baramSnappy.app import app +from baramMesh.app import app class PointWidget(QObject): diff --git a/baramSnappy/rendering/rendering_manager.py b/baramMesh/rendering/rendering_manager.py similarity index 100% rename from baramSnappy/rendering/rendering_manager.py rename to baramMesh/rendering/rendering_manager.py diff --git a/baramSnappy/rendering/vtk_loader.py b/baramMesh/rendering/vtk_loader.py similarity index 100% rename from baramSnappy/rendering/vtk_loader.py rename to baramMesh/rendering/vtk_loader.py diff --git a/baramSnappy/settings/__init__.py b/baramMesh/settings/__init__.py similarity index 100% rename from baramSnappy/settings/__init__.py rename to baramMesh/settings/__init__.py diff --git a/baramSnappy/settings/app_properties.py b/baramMesh/settings/app_properties.py similarity index 100% rename from baramSnappy/settings/app_properties.py rename to baramMesh/settings/app_properties.py diff --git a/baramSnappy/settings/app_settings.py b/baramMesh/settings/app_settings.py similarity index 92% rename from baramSnappy/settings/app_settings.py rename to baramMesh/settings/app_settings.py index 806e260b..6e3f5412 100644 --- a/baramSnappy/settings/app_settings.py +++ b/baramMesh/settings/app_settings.py @@ -38,6 +38,15 @@ def __init__(self, name): self._lock = None + # ToDo: For compatibility. Remove this code block after 20240101 + # Migration from previous name of "BaramMesh" + # Begin + if name == 'BaramMesh': + oldPath = Path.home().joinpath('.baram-snappy') + if not self._settingsPath.exists() and oldPath.is_dir(): + oldPath.replace(self._settingsPath) + # End + self._settingsPath.mkdir(exist_ok=True) def acquireLock(self, timeout): diff --git a/baramSnappy/settings/local_settings.py b/baramMesh/settings/local_settings.py similarity index 100% rename from baramSnappy/settings/local_settings.py rename to baramMesh/settings/local_settings.py diff --git a/baramSnappy/settings/project_manager.py b/baramMesh/settings/project_manager.py similarity index 89% rename from baramSnappy/settings/project_manager.py rename to baramMesh/settings/project_manager.py index d7a0fddc..33bd66f0 100644 --- a/baramSnappy/settings/project_manager.py +++ b/baramMesh/settings/project_manager.py @@ -3,7 +3,7 @@ from PySide6.QtCore import QObject -from baramSnappy.db.project import Project +from baramMesh.db.project import Project class ProjectManager(QObject): diff --git a/baramSnappy/settings/project_settings.py b/baramMesh/settings/project_settings.py similarity index 98% rename from baramSnappy/settings/project_settings.py rename to baramMesh/settings/project_settings.py index c1e95c87..448d1f00 100644 --- a/baramSnappy/settings/project_settings.py +++ b/baramMesh/settings/project_settings.py @@ -6,7 +6,7 @@ import yaml -from baramSnappy.app import app +from baramMesh.app import app SETTINGS_FILE_NAME = 'case.cfg.yaml' diff --git a/baramSnappy/view/__init__.py b/baramMesh/view/__init__.py similarity index 100% rename from baramSnappy/view/__init__.py rename to baramMesh/view/__init__.py diff --git a/baramSnappy/view/base_grid/__init__.py b/baramMesh/view/base_grid/__init__.py similarity index 100% rename from baramSnappy/view/base_grid/__init__.py rename to baramMesh/view/base_grid/__init__.py diff --git a/baramSnappy/view/base_grid/base_grid_page.py b/baramMesh/view/base_grid/base_grid_page.py similarity index 95% rename from baramSnappy/view/base_grid/base_grid_page.py rename to baramMesh/view/base_grid/base_grid_page.py index 6d78a16e..ce85a546 100644 --- a/baramSnappy/view/base_grid/base_grid_page.py +++ b/baramMesh/view/base_grid/base_grid_page.py @@ -7,13 +7,13 @@ from libbaram.run import runUtility from widgets.progress_dialog import ProgressDialog -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import GeometryType, Shape, CFDType -from baramSnappy.db.simple_db import elementToVector -from baramSnappy.db.simple_schema import DBError -from baramSnappy.openfoam.redistribution_task import RedistributionTask -from baramSnappy.openfoam.system.block_mesh_dict import BlockMeshDict -from baramSnappy.view.step_page import StepPage +from baramMesh.app import app +from baramMesh.db.configurations_schema import GeometryType, Shape, CFDType +from baramMesh.db.simple_db import elementToVector +from baramMesh.db.simple_schema import DBError +from baramMesh.openfoam.redistribution_task import RedistributionTask +from baramMesh.openfoam.system.block_mesh_dict import BlockMeshDict +from baramMesh.view.step_page import StepPage class BaseGridPage(StepPage): diff --git a/baramSnappy/view/boundaryLayer/__init__.py b/baramMesh/view/boundaryLayer/__init__.py similarity index 100% rename from baramSnappy/view/boundaryLayer/__init__.py rename to baramMesh/view/boundaryLayer/__init__.py diff --git a/baramSnappy/view/boundaryLayer/boundar_layer_advanced_dialog.ui b/baramMesh/view/boundaryLayer/boundar_layer_advanced_dialog.ui similarity index 100% rename from baramSnappy/view/boundaryLayer/boundar_layer_advanced_dialog.ui rename to baramMesh/view/boundaryLayer/boundar_layer_advanced_dialog.ui diff --git a/baramSnappy/view/boundaryLayer/boundary_layer_advanced_dialog.py b/baramMesh/view/boundaryLayer/boundary_layer_advanced_dialog.py similarity index 97% rename from baramSnappy/view/boundaryLayer/boundary_layer_advanced_dialog.py rename to baramMesh/view/boundaryLayer/boundary_layer_advanced_dialog.py index 4c63ea00..8d61954b 100644 --- a/baramSnappy/view/boundaryLayer/boundary_layer_advanced_dialog.py +++ b/baramMesh/view/boundaryLayer/boundary_layer_advanced_dialog.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError from .boundar_layer_advanced_dialog_ui import Ui_BoundaryLayerAdvancedDialog diff --git a/baramSnappy/view/boundaryLayer/boundary_layer_page.py b/baramMesh/view/boundaryLayer/boundary_layer_page.py similarity index 97% rename from baramSnappy/view/boundaryLayer/boundary_layer_page.py rename to baramMesh/view/boundaryLayer/boundary_layer_page.py index ccbb46e7..5669ed1e 100644 --- a/baramSnappy/view/boundaryLayer/boundary_layer_page.py +++ b/baramMesh/view/boundaryLayer/boundary_layer_page.py @@ -9,11 +9,11 @@ from libbaram.process import Processor, ProcessError from widgets.progress_dialog import ProgressDialog -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.openfoam.system.snappy_hex_mesh_dict import SnappyHexMeshDict -from baramSnappy.view.step_page import StepPage -from baramSnappy.view.widgets.list_table import ListItemWithButtons +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.openfoam.system.snappy_hex_mesh_dict import SnappyHexMeshDict +from baramMesh.view.step_page import StepPage +from baramMesh.view.widgets.list_table import ListItemWithButtons from .boundary_setting_dialog import BoundarySettingDialog from .boundary_layer_advanced_dialog import BoundaryLayerAdvancedDialog diff --git a/baramSnappy/view/boundaryLayer/boundary_setting_dialog.py b/baramMesh/view/boundaryLayer/boundary_setting_dialog.py similarity index 96% rename from baramSnappy/view/boundaryLayer/boundary_setting_dialog.py rename to baramMesh/view/boundaryLayer/boundary_setting_dialog.py index 134335c6..70a32b05 100644 --- a/baramSnappy/view/boundaryLayer/boundary_setting_dialog.py +++ b/baramMesh/view/boundaryLayer/boundary_setting_dialog.py @@ -3,10 +3,10 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.db.configurations_schema import CFDType -from baramSnappy.view.widgets.multi_selector_dialog import SelectorItem, MultiSelectorDialog +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.db.configurations_schema import CFDType +from baramMesh.view.widgets.multi_selector_dialog import SelectorItem, MultiSelectorDialog from .thickness_form import ThicknessForm from .boundary_setting_dialog_ui import Ui_BoundarySettingDialog diff --git a/baramSnappy/view/boundaryLayer/boundary_setting_dialog.ui b/baramMesh/view/boundaryLayer/boundary_setting_dialog.ui similarity index 100% rename from baramSnappy/view/boundaryLayer/boundary_setting_dialog.ui rename to baramMesh/view/boundaryLayer/boundary_setting_dialog.ui diff --git a/baramSnappy/view/boundaryLayer/layer_item.py b/baramMesh/view/boundaryLayer/layer_item.py similarity index 94% rename from baramSnappy/view/boundaryLayer/layer_item.py rename to baramMesh/view/boundaryLayer/layer_item.py index 70198068..2f586e7f 100644 --- a/baramSnappy/view/boundaryLayer/layer_item.py +++ b/baramMesh/view/boundaryLayer/layer_item.py @@ -6,8 +6,8 @@ from PySide6.QtCore import Qt from PySide6.QtWidgets import QTreeWidgetItem -from baramSnappy.app import app -from baramSnappy.view.widgets.icon_check_box import IconCheckBox +from baramMesh.app import app +from baramMesh.view.widgets.icon_check_box import IconCheckBox class Column(IntEnum): diff --git a/baramSnappy/view/boundaryLayer/thickness_form.py b/baramMesh/view/boundaryLayer/thickness_form.py similarity index 98% rename from baramSnappy/view/boundaryLayer/thickness_form.py rename to baramMesh/view/boundaryLayer/thickness_form.py index 3f230401..ab1409f9 100644 --- a/baramSnappy/view/boundaryLayer/thickness_form.py +++ b/baramMesh/view/boundaryLayer/thickness_form.py @@ -8,7 +8,7 @@ from widgets.radio_group import RadioGroup -from baramSnappy.db.configurations_schema import ThicknessModel +from baramMesh.db.configurations_schema import ThicknessModel class ThicknessRow(Enum): diff --git a/baramSnappy/view/castellation/__init__.py b/baramMesh/view/castellation/__init__.py similarity index 100% rename from baramSnappy/view/castellation/__init__.py rename to baramMesh/view/castellation/__init__.py diff --git a/baramSnappy/view/castellation/castellation_page.py b/baramMesh/view/castellation/castellation_page.py similarity index 97% rename from baramSnappy/view/castellation/castellation_page.py rename to baramMesh/view/castellation/castellation_page.py index aedf4131..5b98af82 100644 --- a/baramSnappy/view/castellation/castellation_page.py +++ b/baramMesh/view/castellation/castellation_page.py @@ -14,13 +14,13 @@ from libbaram.process import Processor, ProcessError from widgets.progress_dialog import ProgressDialog -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import GeometryType, Shape, CFDType -from baramSnappy.db.simple_db import elementToVector -from baramSnappy.db.simple_schema import DBError -from baramSnappy.openfoam.system.snappy_hex_mesh_dict import SnappyHexMeshDict -from baramSnappy.view.step_page import StepPage -from baramSnappy.view.widgets.list_table import ListItemWithButtons +from baramMesh.app import app +from baramMesh.db.configurations_schema import GeometryType, Shape, CFDType +from baramMesh.db.simple_db import elementToVector +from baramMesh.db.simple_schema import DBError +from baramMesh.openfoam.system.snappy_hex_mesh_dict import SnappyHexMeshDict +from baramMesh.view.step_page import StepPage +from baramMesh.view.widgets.list_table import ListItemWithButtons from .surface_refinement_dialog import SurfaceRefinementDialog from .volume_refinement_dialog import VolumeRefinementDialog diff --git a/baramSnappy/view/castellation/castellation_page.ui b/baramMesh/view/castellation/castellation_page.ui similarity index 100% rename from baramSnappy/view/castellation/castellation_page.ui rename to baramMesh/view/castellation/castellation_page.ui diff --git a/baramSnappy/view/castellation/refinement_item.py b/baramMesh/view/castellation/refinement_item.py similarity index 95% rename from baramSnappy/view/castellation/refinement_item.py rename to baramMesh/view/castellation/refinement_item.py index a732ce92..9ba1cc2a 100644 --- a/baramSnappy/view/castellation/refinement_item.py +++ b/baramMesh/view/castellation/refinement_item.py @@ -6,8 +6,8 @@ from PySide6.QtCore import Qt from PySide6.QtWidgets import QTreeWidgetItem -from baramSnappy.app import app -from baramSnappy.view.widgets.icon_check_box import IconCheckBox +from baramMesh.app import app +from baramMesh.view.widgets.icon_check_box import IconCheckBox class Column(IntEnum): diff --git a/baramSnappy/view/castellation/surface_refinement_dialog.py b/baramMesh/view/castellation/surface_refinement_dialog.py similarity index 94% rename from baramSnappy/view/castellation/surface_refinement_dialog.py rename to baramMesh/view/castellation/surface_refinement_dialog.py index 0ee29499..35d7aa1f 100644 --- a/baramSnappy/view/castellation/surface_refinement_dialog.py +++ b/baramMesh/view/castellation/surface_refinement_dialog.py @@ -3,11 +3,11 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.db.configurations_schema import GeometryType -from baramSnappy.view.widgets.multi_selector_dialog import MultiSelectorDialog -from baramSnappy.view.widgets.multi_selector_dialog import SelectorItem +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.db.configurations_schema import GeometryType +from baramMesh.view.widgets.multi_selector_dialog import MultiSelectorDialog +from baramMesh.view.widgets.multi_selector_dialog import SelectorItem from .surface_refinement_dialog_ui import Ui_SurfaceRefinementDialog diff --git a/baramSnappy/view/castellation/surface_refinement_dialog.ui b/baramMesh/view/castellation/surface_refinement_dialog.ui similarity index 100% rename from baramSnappy/view/castellation/surface_refinement_dialog.ui rename to baramMesh/view/castellation/surface_refinement_dialog.ui diff --git a/baramSnappy/view/castellation/volume_refinement_dialog.py b/baramMesh/view/castellation/volume_refinement_dialog.py similarity index 93% rename from baramSnappy/view/castellation/volume_refinement_dialog.py rename to baramMesh/view/castellation/volume_refinement_dialog.py index 7e50b779..4dead47b 100644 --- a/baramSnappy/view/castellation/volume_refinement_dialog.py +++ b/baramMesh/view/castellation/volume_refinement_dialog.py @@ -3,11 +3,11 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.db.configurations_schema import GeometryType -from baramSnappy.view.widgets.multi_selector_dialog import MultiSelectorDialog -from baramSnappy.view.widgets.multi_selector_dialog import SelectorItem +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.db.configurations_schema import GeometryType +from baramMesh.view.widgets.multi_selector_dialog import MultiSelectorDialog +from baramMesh.view.widgets.multi_selector_dialog import SelectorItem from .volume_refinement_dialog_ui import Ui_VolumeeRefinementDialog diff --git a/baramSnappy/view/castellation/volume_refinement_dialog.ui b/baramMesh/view/castellation/volume_refinement_dialog.ui similarity index 100% rename from baramSnappy/view/castellation/volume_refinement_dialog.ui rename to baramMesh/view/castellation/volume_refinement_dialog.ui diff --git a/baramSnappy/view/display_control/__init__.py b/baramMesh/view/display_control/__init__.py similarity index 100% rename from baramSnappy/view/display_control/__init__.py rename to baramMesh/view/display_control/__init__.py diff --git a/baramSnappy/view/display_control/cut_tool.py b/baramMesh/view/display_control/cut_tool.py similarity index 98% rename from baramSnappy/view/display_control/cut_tool.py rename to baramMesh/view/display_control/cut_tool.py index da76768d..842dd2a0 100644 --- a/baramSnappy/view/display_control/cut_tool.py +++ b/baramMesh/view/display_control/cut_tool.py @@ -8,8 +8,8 @@ from PySide6.QtGui import QDoubleValidator from vtkmodules.vtkCommonDataModel import vtkPlane -from baramSnappy.app import app -from baramSnappy.rendering.plane_widget import PlaneWidget +from baramMesh.app import app +from baramMesh.rendering.plane_widget import PlaneWidget @dataclass diff --git a/baramSnappy/view/display_control/display_control.py b/baramMesh/view/display_control/display_control.py similarity index 98% rename from baramSnappy/view/display_control/display_control.py rename to baramMesh/view/display_control/display_control.py index 37f4b48e..688ef8a5 100644 --- a/baramSnappy/view/display_control/display_control.py +++ b/baramMesh/view/display_control/display_control.py @@ -6,9 +6,9 @@ from PySide6.QtGui import QColor from PySide6.QtWidgets import QMenu, QColorDialog, QHeaderView -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import Step -from baramSnappy.rendering.actor_info import DisplayMode, Properties +from baramMesh.app import app +from baramMesh.db.configurations_schema import Step +from baramMesh.rendering.actor_info import DisplayMode, Properties from widgets.rendering_widget import RenderingWidget from .opacity_dialog import OpacityDialog diff --git a/baramSnappy/view/display_control/display_item.py b/baramMesh/view/display_control/display_item.py similarity index 98% rename from baramSnappy/view/display_control/display_item.py rename to baramMesh/view/display_control/display_item.py index 31610a3c..4915b2d0 100644 --- a/baramSnappy/view/display_control/display_item.py +++ b/baramMesh/view/display_control/display_item.py @@ -6,7 +6,7 @@ from PySide6.QtCore import QCoreApplication from PySide6.QtWidgets import QTreeWidgetItem, QLabel, QWidget, QHBoxLayout -from baramSnappy.rendering.actor_info import ActorType +from baramMesh.rendering.actor_info import ActorType class Column(IntEnum): diff --git a/baramSnappy/view/display_control/opacity_dialog.py b/baramMesh/view/display_control/opacity_dialog.py similarity index 100% rename from baramSnappy/view/display_control/opacity_dialog.py rename to baramMesh/view/display_control/opacity_dialog.py diff --git a/baramSnappy/view/display_control/opacity_dialog.ui b/baramMesh/view/display_control/opacity_dialog.ui similarity index 100% rename from baramSnappy/view/display_control/opacity_dialog.ui rename to baramMesh/view/display_control/opacity_dialog.ui diff --git a/baramSnappy/view/export/__init__.py b/baramMesh/view/export/__init__.py similarity index 100% rename from baramSnappy/view/export/__init__.py rename to baramMesh/view/export/__init__.py diff --git a/baramSnappy/view/export/export_page.py b/baramMesh/view/export/export_page.py similarity index 94% rename from baramSnappy/view/export/export_page.py rename to baramMesh/view/export/export_page.py index 98858617..9505e546 100644 --- a/baramSnappy/view/export/export_page.py +++ b/baramMesh/view/export/export_page.py @@ -14,12 +14,12 @@ from resources import resource from widgets.progress_dialog import ProgressDialog -from baramSnappy.app import app -from baramSnappy.openfoam.file_system import FileSystem -from baramSnappy.openfoam.constant.region_properties import RegionProperties -from baramSnappy.openfoam.redistribution_task import RedistributionTask -from baramSnappy.openfoam.system.topo_set_dict import TopoSetDict -from baramSnappy.view.step_page import StepPage +from baramMesh.app import app +from baramMesh.openfoam.file_system import FileSystem +from baramMesh.openfoam.constant.region_properties import RegionProperties +from baramMesh.openfoam.redistribution_task import RedistributionTask +from baramMesh.openfoam.system.topo_set_dict import TopoSetDict +from baramMesh.view.step_page import StepPage class ExportPage(StepPage): diff --git a/baramSnappy/view/geometry/__init__.py b/baramMesh/view/geometry/__init__.py similarity index 100% rename from baramSnappy/view/geometry/__init__.py rename to baramMesh/view/geometry/__init__.py diff --git a/baramSnappy/view/geometry/geometry_add_dialog.py b/baramMesh/view/geometry/geometry_add_dialog.py similarity index 100% rename from baramSnappy/view/geometry/geometry_add_dialog.py rename to baramMesh/view/geometry/geometry_add_dialog.py diff --git a/baramSnappy/view/geometry/geometry_add_dialog.ui b/baramMesh/view/geometry/geometry_add_dialog.ui similarity index 100% rename from baramSnappy/view/geometry/geometry_add_dialog.ui rename to baramMesh/view/geometry/geometry_add_dialog.ui diff --git a/baramSnappy/view/geometry/geometry_import_dialog.py b/baramMesh/view/geometry/geometry_import_dialog.py similarity index 100% rename from baramSnappy/view/geometry/geometry_import_dialog.py rename to baramMesh/view/geometry/geometry_import_dialog.py diff --git a/baramSnappy/view/geometry/geometry_import_dialog.ui b/baramMesh/view/geometry/geometry_import_dialog.ui similarity index 100% rename from baramSnappy/view/geometry/geometry_import_dialog.ui rename to baramMesh/view/geometry/geometry_import_dialog.ui diff --git a/baramSnappy/view/geometry/geometry_list.py b/baramMesh/view/geometry/geometry_list.py similarity index 98% rename from baramSnappy/view/geometry/geometry_list.py rename to baramMesh/view/geometry/geometry_list.py index 584edf1d..3343517d 100644 --- a/baramSnappy/view/geometry/geometry_list.py +++ b/baramMesh/view/geometry/geometry_list.py @@ -7,7 +7,7 @@ from PySide6.QtCore import Signal, QObject, QCoreApplication from PySide6.QtGui import QIcon -from baramSnappy.db.configurations_schema import CFDType, GeometryType +from baramMesh.db.configurations_schema import CFDType, GeometryType VOLUME_ICON_FILE = ':/icons/prism-outline.svg' SURFACE_ICON_FILE = ':/icons/prism.svg' diff --git a/baramSnappy/view/geometry/geometry_manager.py b/baramMesh/view/geometry/geometry_manager.py similarity index 94% rename from baramSnappy/view/geometry/geometry_manager.py rename to baramMesh/view/geometry/geometry_manager.py index f2d77b71..35986ea1 100644 --- a/baramSnappy/view/geometry/geometry_manager.py +++ b/baramMesh/view/geometry/geometry_manager.py @@ -3,12 +3,12 @@ from PySide6.QtCore import Signal -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import GeometryType, Shape -from baramSnappy.db.simple_db import elementToVector -from baramSnappy.rendering.actor_info import ActorInfo, ActorType -from baramSnappy.rendering.vtk_loader import hexPolyData, cylinderPolyData, spherePolyData, polygonPolyData -from baramSnappy.view.main_window.actor_manager import ActorManager +from baramMesh.app import app +from baramMesh.db.configurations_schema import GeometryType, Shape +from baramMesh.db.simple_db import elementToVector +from baramMesh.rendering.actor_info import ActorInfo, ActorType +from baramMesh.rendering.vtk_loader import hexPolyData, cylinderPolyData, spherePolyData, polygonPolyData +from baramMesh.view.main_window.actor_manager import ActorManager def platePolyData(shape, volume): diff --git a/baramSnappy/view/geometry/geometry_page.py b/baramMesh/view/geometry/geometry_page.py similarity index 98% rename from baramSnappy/view/geometry/geometry_page.py rename to baramMesh/view/geometry/geometry_page.py index e147b209..01fcc60f 100644 --- a/baramSnappy/view/geometry/geometry_page.py +++ b/baramMesh/view/geometry/geometry_page.py @@ -7,9 +7,9 @@ from libbaram.run import OpenFOAMError -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import CFDType, Shape, GeometryType -from baramSnappy.view.step_page import StepPage +from baramMesh.app import app +from baramMesh.db.configurations_schema import CFDType, Shape, GeometryType +from baramMesh.view.step_page import StepPage from .geometry_add_dialog import GeometryAddDialog from .stl_file_loader import STLFileLoader from .geometry_import_dialog import ImportDialog diff --git a/baramSnappy/view/geometry/geometry_page.ui b/baramMesh/view/geometry/geometry_page.ui similarity index 100% rename from baramSnappy/view/geometry/geometry_page.ui rename to baramMesh/view/geometry/geometry_page.ui diff --git a/baramSnappy/view/geometry/stl_file_loader.py b/baramMesh/view/geometry/stl_file_loader.py similarity index 92% rename from baramSnappy/view/geometry/stl_file_loader.py rename to baramMesh/view/geometry/stl_file_loader.py index 18cd3e25..b3558f65 100644 --- a/baramSnappy/view/geometry/stl_file_loader.py +++ b/baramMesh/view/geometry/stl_file_loader.py @@ -5,9 +5,9 @@ from libbaram.run import runUtility, OpenFOAMError -from baramSnappy.app import app -from baramSnappy.openfoam.system.surface_patch_dict import SurfacePatchDict, SurfacePatchData -from baramSnappy.rendering.vtk_loader import loadSTLFile +from baramMesh.app import app +from baramMesh.openfoam.system.surface_patch_dict import SurfacePatchDict, SurfacePatchData +from baramMesh.rendering.vtk_loader import loadSTLFile import qasync diff --git a/baramSnappy/view/geometry/surface_dialog.py b/baramMesh/view/geometry/surface_dialog.py similarity index 96% rename from baramSnappy/view/geometry/surface_dialog.py rename to baramMesh/view/geometry/surface_dialog.py index 2ff95101..9bd3d3f0 100644 --- a/baramSnappy/view/geometry/surface_dialog.py +++ b/baramMesh/view/geometry/surface_dialog.py @@ -5,9 +5,9 @@ from widgets.radio_group import RadioGroup -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.db.configurations_schema import CFDType +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.db.configurations_schema import CFDType from .surface_dialog_ui import Ui_SurfaceDialog diff --git a/baramSnappy/view/geometry/surface_dialog.ui b/baramMesh/view/geometry/surface_dialog.ui similarity index 100% rename from baramSnappy/view/geometry/surface_dialog.ui rename to baramMesh/view/geometry/surface_dialog.ui diff --git a/baramSnappy/view/geometry/volume_dialog.py b/baramMesh/view/geometry/volume_dialog.py similarity index 98% rename from baramSnappy/view/geometry/volume_dialog.py rename to baramMesh/view/geometry/volume_dialog.py index 4a80feb4..31dfb5bc 100644 --- a/baramSnappy/view/geometry/volume_dialog.py +++ b/baramMesh/view/geometry/volume_dialog.py @@ -6,9 +6,9 @@ from widgets.radio_group import RadioGroup -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.db.configurations_schema import Shape, GeometryType, CFDType +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.db.configurations_schema import Shape, GeometryType, CFDType from .volume_dialog_ui import Ui_VolumeDialog diff --git a/baramSnappy/view/geometry/volume_dialog.ui b/baramMesh/view/geometry/volume_dialog.ui similarity index 100% rename from baramSnappy/view/geometry/volume_dialog.ui rename to baramMesh/view/geometry/volume_dialog.ui diff --git a/baramSnappy/view/main_window/__init__.py b/baramMesh/view/main_window/__init__.py similarity index 100% rename from baramSnappy/view/main_window/__init__.py rename to baramMesh/view/main_window/__init__.py diff --git a/baramSnappy/view/main_window/actor_manager.py b/baramMesh/view/main_window/actor_manager.py similarity index 96% rename from baramSnappy/view/main_window/actor_manager.py rename to baramMesh/view/main_window/actor_manager.py index 84ab379d..7c26eb25 100644 --- a/baramSnappy/view/main_window/actor_manager.py +++ b/baramMesh/view/main_window/actor_manager.py @@ -6,8 +6,8 @@ from PySide6.QtCore import QObject -from baramSnappy.app import app -from baramSnappy.rendering.actor_info import Bounds +from baramMesh.app import app +from baramMesh.rendering.actor_info import Bounds class ActorGroup(Enum): diff --git a/baramSnappy/view/main_window/console_view.py b/baramMesh/view/main_window/console_view.py similarity index 100% rename from baramSnappy/view/main_window/console_view.py rename to baramMesh/view/main_window/console_view.py diff --git a/baramSnappy/view/main_window/main_window.py b/baramMesh/view/main_window/main_window.py similarity index 93% rename from baramSnappy/view/main_window/main_window.py rename to baramMesh/view/main_window/main_window.py index 181a6523..98917310 100644 --- a/baramSnappy/view/main_window/main_window.py +++ b/baramMesh/view/main_window/main_window.py @@ -13,16 +13,16 @@ from widgets.parallel.parallel_environment_dialog import ParallelEnvironmentDialog from widgets.progress_dialog import ProgressDialog -from baramSnappy.app import app -from baramSnappy.openfoam.redistribution_task import RedistributionTask -from baramSnappy.view.display_control.display_control import DisplayControl -from baramSnappy.view.widgets.project_dialog import ProjectDialog -from baramSnappy.view.widgets.new_project_dialog import NewProjectDialog -from baramSnappy.view.widgets.settings_scaling_dialog import SettingScalingDialog -from baramSnappy.view.widgets.language_dialog import LanugageDialog -from baramSnappy.view.menu.mesh_quality.mesh_quality_parameters_dialog import MeshQualityParametersDialog -from baramSnappy.view.menu.help.about_dialog import AboutDialog -from baramSnappy.view.geometry.geometry_manager import GeometryManager +from baramMesh.app import app +from baramMesh.openfoam.redistribution_task import RedistributionTask +from baramMesh.view.display_control.display_control import DisplayControl +from baramMesh.view.widgets.project_dialog import ProjectDialog +from baramMesh.view.widgets.new_project_dialog import NewProjectDialog +from baramMesh.view.widgets.settings_scaling_dialog import SettingScalingDialog +from baramMesh.view.widgets.language_dialog import LanugageDialog +from baramMesh.view.menu.mesh_quality.mesh_quality_parameters_dialog import MeshQualityParametersDialog +from baramMesh.view.menu.help.about_dialog import AboutDialog +from baramMesh.view.geometry.geometry_manager import GeometryManager from .recent_files_menu import RecentFilesMenu from .naviagtion_view import NavigationView from .rendering_tool import RenderingTool diff --git a/baramSnappy/view/main_window/main_window.ui b/baramMesh/view/main_window/main_window.ui similarity index 99% rename from baramSnappy/view/main_window/main_window.ui rename to baramMesh/view/main_window/main_window.ui index e0c02bc5..a445b234 100644 --- a/baramSnappy/view/main_window/main_window.ui +++ b/baramMesh/view/main_window/main_window.ui @@ -11,7 +11,7 @@ - Baram Snappy + BaramMesh @@ -3114,12 +3114,12 @@ FolderHeader QCheckBox -
baramSnappy.view.widgets.folder_header
+
baramMesh.view.widgets.folder_header
 ListTable QFrame -
baramSnappy.view.widgets.list_table
+
baramMesh.view.widgets.list_table
1 diff --git a/baramSnappy/view/main_window/mesh_manager.py b/baramMesh/view/main_window/mesh_manager.py similarity index 87% rename from baramSnappy/view/main_window/mesh_manager.py rename to baramMesh/view/main_window/mesh_manager.py index 5b38ffa0..f902ebde 100644 --- a/baramSnappy/view/main_window/mesh_manager.py +++ b/baramMesh/view/main_window/mesh_manager.py @@ -6,10 +6,10 @@ from widgets.progress_dialog import ProgressDialog -from baramSnappy.app import app -from baramSnappy.openfoam.poly_mesh.poly_mesh_loader import PolyMeshLoader -from baramSnappy.rendering.actor_info import ActorInfo, ActorType -from baramSnappy.view.main_window.actor_manager import ActorManager +from baramMesh.app import app +from baramMesh.openfoam.poly_mesh.poly_mesh_loader import PolyMeshLoader +from baramMesh.rendering.actor_info import ActorInfo, ActorType +from baramMesh.view.main_window.actor_manager import ActorManager class MeshManager(ActorManager): diff --git a/baramSnappy/view/main_window/naviagtion_view.py b/baramMesh/view/main_window/naviagtion_view.py similarity index 96% rename from baramSnappy/view/main_window/naviagtion_view.py rename to baramMesh/view/main_window/naviagtion_view.py index 86975c5b..5adf6ad9 100644 --- a/baramSnappy/view/main_window/naviagtion_view.py +++ b/baramMesh/view/main_window/naviagtion_view.py @@ -3,7 +3,7 @@ from PySide6.QtCore import QObject, Signal -from baramSnappy.db.configurations_schema import Step +from baramMesh.db.configurations_schema import Step steps = { diff --git a/baramSnappy/view/main_window/recent_files_menu.py b/baramMesh/view/main_window/recent_files_menu.py similarity index 100% rename from baramSnappy/view/main_window/recent_files_menu.py rename to baramMesh/view/main_window/recent_files_menu.py diff --git a/baramSnappy/view/main_window/rendering_tool.py b/baramMesh/view/main_window/rendering_tool.py similarity index 90% rename from baramSnappy/view/main_window/rendering_tool.py rename to baramMesh/view/main_window/rendering_tool.py index d550d964..3730074b 100644 --- a/baramSnappy/view/main_window/rendering_tool.py +++ b/baramMesh/view/main_window/rendering_tool.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from baramSnappy.view.main_window.main_window_ui import Ui_MainWindow +from baramMesh.view.main_window.main_window_ui import Ui_MainWindow class RenderingTool: diff --git a/baramSnappy/view/main_window/step_manager.py b/baramMesh/view/main_window/step_manager.py similarity index 87% rename from baramSnappy/view/main_window/step_manager.py rename to baramMesh/view/main_window/step_manager.py index 8d006803..4e5a9af9 100644 --- a/baramSnappy/view/main_window/step_manager.py +++ b/baramMesh/view/main_window/step_manager.py @@ -5,16 +5,16 @@ from libbaram.utils import rmtree -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import Step -from baramSnappy.view.step_page import StepPage -from baramSnappy.view.geometry.geometry_page import GeometryPage -from baramSnappy.view.base_grid.base_grid_page import BaseGridPage -from baramSnappy.view.castellation.castellation_page import CastellationPage -from baramSnappy.view.snap.snap_page import SnapPage -from baramSnappy.view.boundaryLayer.boundary_layer_page import BoundaryLayerPage -from baramSnappy.view.export.export_page import ExportPage -from baramSnappy.view.region.region_page import RegionPage +from baramMesh.app import app +from baramMesh.db.configurations_schema import Step +from baramMesh.view.step_page import StepPage +from baramMesh.view.geometry.geometry_page import GeometryPage +from baramMesh.view.base_grid.base_grid_page import BaseGridPage +from baramMesh.view.castellation.castellation_page import CastellationPage +from baramMesh.view.snap.snap_page import SnapPage +from baramMesh.view.boundaryLayer.boundary_layer_page import BoundaryLayerPage +from baramMesh.view.export.export_page import ExportPage +from baramMesh.view.region.region_page import RegionPage class StepControlButtons: diff --git a/baramSnappy/view/menu/__init__.py b/baramMesh/view/menu/__init__.py similarity index 100% rename from baramSnappy/view/menu/__init__.py rename to baramMesh/view/menu/__init__.py diff --git a/baramSnappy/view/menu/help/__init__.py b/baramMesh/view/menu/help/__init__.py similarity index 100% rename from baramSnappy/view/menu/help/__init__.py rename to baramMesh/view/menu/help/__init__.py diff --git a/baramSnappy/view/menu/help/about_dialog.py b/baramMesh/view/menu/help/about_dialog.py similarity index 95% rename from baramSnappy/view/menu/help/about_dialog.py rename to baramMesh/view/menu/help/about_dialog.py index 79e9c036..f5f994d6 100644 --- a/baramSnappy/view/menu/help/about_dialog.py +++ b/baramMesh/view/menu/help/about_dialog.py @@ -3,7 +3,7 @@ from PySide6.QtWidgets import QDialog -from baramSnappy.app import app +from baramMesh.app import app from .about_dialog_ui import Ui_AboutDialog from .license_dialog import LicenseDialog diff --git a/baramSnappy/view/menu/help/about_dialog.ui b/baramMesh/view/menu/help/about_dialog.ui similarity index 100% rename from baramSnappy/view/menu/help/about_dialog.ui rename to baramMesh/view/menu/help/about_dialog.ui diff --git a/baramSnappy/view/menu/help/license_dialog.py b/baramMesh/view/menu/help/license_dialog.py similarity index 100% rename from baramSnappy/view/menu/help/license_dialog.py rename to baramMesh/view/menu/help/license_dialog.py diff --git a/baramSnappy/view/menu/help/license_dialog.ui b/baramMesh/view/menu/help/license_dialog.ui similarity index 100% rename from baramSnappy/view/menu/help/license_dialog.ui rename to baramMesh/view/menu/help/license_dialog.ui diff --git a/baramSnappy/view/menu/mesh_quality/__init__.py b/baramMesh/view/menu/mesh_quality/__init__.py similarity index 100% rename from baramSnappy/view/menu/mesh_quality/__init__.py rename to baramMesh/view/menu/mesh_quality/__init__.py diff --git a/baramSnappy/view/menu/mesh_quality/mesh_quality_parameters_dialog.py b/baramMesh/view/menu/mesh_quality/mesh_quality_parameters_dialog.py similarity index 98% rename from baramSnappy/view/menu/mesh_quality/mesh_quality_parameters_dialog.py rename to baramMesh/view/menu/mesh_quality/mesh_quality_parameters_dialog.py index a1d1cfce..eaad0b9c 100644 --- a/baramSnappy/view/menu/mesh_quality/mesh_quality_parameters_dialog.py +++ b/baramMesh/view/menu/mesh_quality/mesh_quality_parameters_dialog.py @@ -3,8 +3,8 @@ from PySide6.QtWidgets import QDialog, QMessageBox -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError from .mesh_quality_parameters_dialog_ui import Ui_MeshQualityParametersDialog diff --git a/baramSnappy/view/menu/mesh_quality/mesh_quality_parameters_dialog.ui b/baramMesh/view/menu/mesh_quality/mesh_quality_parameters_dialog.ui similarity index 100% rename from baramSnappy/view/menu/mesh_quality/mesh_quality_parameters_dialog.ui rename to baramMesh/view/menu/mesh_quality/mesh_quality_parameters_dialog.ui diff --git a/baramSnappy/view/region/__init__.py b/baramMesh/view/region/__init__.py similarity index 100% rename from baramSnappy/view/region/__init__.py rename to baramMesh/view/region/__init__.py diff --git a/baramSnappy/view/region/region_card.py b/baramMesh/view/region/region_card.py similarity index 95% rename from baramSnappy/view/region/region_card.py rename to baramMesh/view/region/region_card.py index 89f405ef..70b08d2e 100644 --- a/baramSnappy/view/region/region_card.py +++ b/baramMesh/view/region/region_card.py @@ -4,8 +4,8 @@ from PySide6.QtWidgets import QWidget from PySide6.QtCore import Signal -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import RegionType +from baramMesh.app import app +from baramMesh.db.configurations_schema import RegionType from .region_card_ui import Ui_RegionCard diff --git a/baramSnappy/view/region/region_card.ui b/baramMesh/view/region/region_card.ui similarity index 100% rename from baramSnappy/view/region/region_card.ui rename to baramMesh/view/region/region_card.ui diff --git a/baramSnappy/view/region/region_form.py b/baramMesh/view/region/region_form.py similarity index 95% rename from baramSnappy/view/region/region_form.py rename to baramMesh/view/region/region_form.py index 2d038b5d..b8e75c37 100644 --- a/baramSnappy/view/region/region_form.py +++ b/baramMesh/view/region/region_form.py @@ -6,10 +6,10 @@ from widgets.radio_group import RadioGroup -from baramSnappy.app import app -from baramSnappy.db.configurations_schema import RegionType -from baramSnappy.db.simple_schema import DBError -from baramSnappy.rendering.point_widget import PointWidget +from baramMesh.app import app +from baramMesh.db.configurations_schema import RegionType +from baramMesh.db.simple_schema import DBError +from baramMesh.rendering.point_widget import PointWidget from .region_form_ui import Ui_RegionForm diff --git a/baramSnappy/view/region/region_form.ui b/baramMesh/view/region/region_form.ui similarity index 100% rename from baramSnappy/view/region/region_form.ui rename to baramMesh/view/region/region_form.ui diff --git a/baramSnappy/view/region/region_page.py b/baramMesh/view/region/region_page.py similarity index 97% rename from baramSnappy/view/region/region_page.py rename to baramMesh/view/region/region_page.py index ae2c9025..0f8933b0 100644 --- a/baramSnappy/view/region/region_page.py +++ b/baramMesh/view/region/region_page.py @@ -3,9 +3,9 @@ from PySide6.QtWidgets import QVBoxLayout -from baramSnappy.app import app -from baramSnappy.view.step_page import StepPage -from baramSnappy.db.configurations_schema import RegionType +from baramMesh.app import app +from baramMesh.view.step_page import StepPage +from baramMesh.db.configurations_schema import RegionType from .region_form import RegionForm from .region_card import RegionCard diff --git a/baramSnappy/view/snap/__init__.py b/baramMesh/view/snap/__init__.py similarity index 100% rename from baramSnappy/view/snap/__init__.py rename to baramMesh/view/snap/__init__.py diff --git a/baramSnappy/view/snap/snap_page.py b/baramMesh/view/snap/snap_page.py similarity index 94% rename from baramSnappy/view/snap/snap_page.py rename to baramMesh/view/snap/snap_page.py index 1522df22..875a1744 100644 --- a/baramSnappy/view/snap/snap_page.py +++ b/baramMesh/view/snap/snap_page.py @@ -9,12 +9,12 @@ from libbaram.run import runParallelUtility from libbaram.process import Processor, ProcessError -from baramSnappy.app import app -from baramSnappy.db.simple_schema import DBError -from baramSnappy.db.configurations_schema import CFDType -from baramSnappy.openfoam.system.snappy_hex_mesh_dict import SnappyHexMeshDict -from baramSnappy.openfoam.system.topo_set_dict import TopoSetDict -from baramSnappy.view.step_page import StepPage +from baramMesh.app import app +from baramMesh.db.simple_schema import DBError +from baramMesh.db.configurations_schema import CFDType +from baramMesh.openfoam.system.snappy_hex_mesh_dict import SnappyHexMeshDict +from baramMesh.openfoam.system.topo_set_dict import TopoSetDict +from baramMesh.view.step_page import StepPage class SnapPage(StepPage): diff --git a/baramSnappy/view/snap/snap_page.ui b/baramMesh/view/snap/snap_page.ui similarity index 100% rename from baramSnappy/view/snap/snap_page.ui rename to baramMesh/view/snap/snap_page.ui diff --git a/baramSnappy/view/step_page.py b/baramMesh/view/step_page.py similarity index 93% rename from baramSnappy/view/step_page.py rename to baramMesh/view/step_page.py index 6057605e..87963cb3 100644 --- a/baramSnappy/view/step_page.py +++ b/baramMesh/view/step_page.py @@ -7,9 +7,9 @@ from libbaram.utils import rmtree -from baramSnappy.app import app -from baramSnappy.openfoam.file_system import makeDir -from baramSnappy.view.main_window.main_window_ui import Ui_MainWindow +from baramMesh.app import app +from baramMesh.openfoam.file_system import makeDir +from baramMesh.view.main_window.main_window_ui import Ui_MainWindow class StepPage(QObject): diff --git a/baramSnappy/view/widgets/__init__.py b/baramMesh/view/widgets/__init__.py similarity index 100% rename from baramSnappy/view/widgets/__init__.py rename to baramMesh/view/widgets/__init__.py diff --git a/baramSnappy/view/widgets/flat_push_button.py b/baramMesh/view/widgets/flat_push_button.py similarity index 100% rename from baramSnappy/view/widgets/flat_push_button.py rename to baramMesh/view/widgets/flat_push_button.py diff --git a/baramSnappy/view/widgets/folder_header.py b/baramMesh/view/widgets/folder_header.py similarity index 100% rename from baramSnappy/view/widgets/folder_header.py rename to baramMesh/view/widgets/folder_header.py diff --git a/baramSnappy/view/widgets/icon_check_box.py b/baramMesh/view/widgets/icon_check_box.py similarity index 100% rename from baramSnappy/view/widgets/icon_check_box.py rename to baramMesh/view/widgets/icon_check_box.py diff --git a/baramSnappy/view/widgets/language_dialog.py b/baramMesh/view/widgets/language_dialog.py similarity index 100% rename from baramSnappy/view/widgets/language_dialog.py rename to baramMesh/view/widgets/language_dialog.py diff --git a/baramSnappy/view/widgets/language_dialog.ui b/baramMesh/view/widgets/language_dialog.ui similarity index 100% rename from baramSnappy/view/widgets/language_dialog.ui rename to baramMesh/view/widgets/language_dialog.ui diff --git a/baramSnappy/view/widgets/list_table.py b/baramMesh/view/widgets/list_table.py similarity index 100% rename from baramSnappy/view/widgets/list_table.py rename to baramMesh/view/widgets/list_table.py diff --git a/baramSnappy/view/widgets/multi_selector_dialog.py b/baramMesh/view/widgets/multi_selector_dialog.py similarity index 100% rename from baramSnappy/view/widgets/multi_selector_dialog.py rename to baramMesh/view/widgets/multi_selector_dialog.py diff --git a/baramSnappy/view/widgets/multi_selector_dialog.ui b/baramMesh/view/widgets/multi_selector_dialog.ui similarity index 100% rename from baramSnappy/view/widgets/multi_selector_dialog.ui rename to baramMesh/view/widgets/multi_selector_dialog.ui diff --git a/baramSnappy/view/widgets/new_project_dialog.py b/baramMesh/view/widgets/new_project_dialog.py similarity index 100% rename from baramSnappy/view/widgets/new_project_dialog.py rename to baramMesh/view/widgets/new_project_dialog.py diff --git a/baramSnappy/view/widgets/new_project_dialog.ui b/baramMesh/view/widgets/new_project_dialog.ui similarity index 100% rename from baramSnappy/view/widgets/new_project_dialog.ui rename to baramMesh/view/widgets/new_project_dialog.ui diff --git a/baramSnappy/view/widgets/project_dialog.py b/baramMesh/view/widgets/project_dialog.py similarity index 98% rename from baramSnappy/view/widgets/project_dialog.py rename to baramMesh/view/widgets/project_dialog.py index 50295116..5e69ac25 100644 --- a/baramSnappy/view/widgets/project_dialog.py +++ b/baramMesh/view/widgets/project_dialog.py @@ -8,7 +8,7 @@ from libbaram.utils import getFit -from baramSnappy.app import app +from baramMesh.app import app from .project_dialog_ui import Ui_ProjectSelector from .project_widget import ProjectWidget diff --git a/baramSnappy/view/widgets/project_dialog.ui b/baramMesh/view/widgets/project_dialog.ui similarity index 100% rename from baramSnappy/view/widgets/project_dialog.ui rename to baramMesh/view/widgets/project_dialog.ui diff --git a/baramSnappy/view/widgets/project_widget.py b/baramMesh/view/widgets/project_widget.py similarity index 100% rename from baramSnappy/view/widgets/project_widget.py rename to baramMesh/view/widgets/project_widget.py diff --git a/baramSnappy/view/widgets/project_widget.ui b/baramMesh/view/widgets/project_widget.ui similarity index 100% rename from baramSnappy/view/widgets/project_widget.ui rename to baramMesh/view/widgets/project_widget.ui diff --git a/baramSnappy/view/widgets/settings_scaling_dialog.py b/baramMesh/view/widgets/settings_scaling_dialog.py similarity index 100% rename from baramSnappy/view/widgets/settings_scaling_dialog.py rename to baramMesh/view/widgets/settings_scaling_dialog.py diff --git a/baramSnappy/view/widgets/settings_scaling_dialog.ui b/baramMesh/view/widgets/settings_scaling_dialog.ui similarity index 100% rename from baramSnappy/view/widgets/settings_scaling_dialog.ui rename to baramMesh/view/widgets/settings_scaling_dialog.ui diff --git a/convertUi.py b/convertUi.py index 1951ce69..9944253d 100644 --- a/convertUi.py +++ b/convertUi.py @@ -5,7 +5,7 @@ from pathlib import Path import subprocess -FOLDERS = ['baram/view', 'baramSnappy/view', 'widgets'] +FOLDERS = ['baramFlow/view', 'baramMesh/view', 'widgets'] force_update = False if len(sys.argv) > 1 and sys.argv[1] == '-f': diff --git a/resources/baram.ico b/resources/baram.ico deleted file mode 100644 index a584ad4ec198e0a4e5f77afe841ea02a5e99543e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102301 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 JW_QfL{|EDTY9{~y diff --git a/resources/baramFlow.ico b/resources/baramFlow.ico new file mode 100644 index 0000000000000000000000000000000000000000..824ecad2a17291a12bbee0feea5d03ca20418418 GIT binary patch literal 99846 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 G4EzsxdzkhB literal 0 HcmV?d00001 diff --git a/resources/baramMesh.ico b/resources/baramMesh.ico new file mode 100644 index 0000000000000000000000000000000000000000..6357d661c0e42783144c71a3bcd58ef44bdbeef1 GIT binary patch literal 31766 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 z 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 F{{W!p`N;qP literal 0 HcmV?d00001 diff --git a/resources/baramPackage.ico b/resources/baramPackage.ico new file mode 100644 index 0000000000000000000000000000000000000000..65f9432e5c7a58571e5d95bc0503a858b8803514 GIT binary patch literal 21357 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 z z!vJrW%JP_AJn-9Wse*&B7eu>Ve6d%&Xun!0`LZyeur8kB z%1fCvJUs>=%@1Pvtd0qduR%Z&c64-~nb%!Da^#*x@zPoEW^m}YxR;n&^qo8mj&Sux z+i3yw^5vn*(mGk}&G`DQaJI#QZCZ2=pzkaQa7((YRNU-lEzD+n9*Ojv`6|9t76X{$B^t+VX^>eI-Tl3IMs>&lBsp} z#n>xCQnt0&5u)Rx4CiRss*-=i%XxrXj#IqFA%=ZGN?CKw177zN`c?AjhA~S+`aOMBdHz zh^gm@rY|%j7WWLt)`aZd3OXu%hoScyB}@CQtp-HsT@WWuAn4ml{@ZT71JdH(rPt)` z&se`}@m&0anH^gXS7k1yz>pS2c`Cbl;X@kPkw?8smz<}+w{9yiUL`N*)Zme~)M_ZA|u{iwX z32UljJLWL?Y%p+XDDQZ~0C|Z@Bm@L8h0Ps#BcD zVuHYF@Ywp=#62}H?tKA;GXsOq8d4@e7p=!9Ft)M+9>tUF102S#y94k4m?er9d`#j1 z+$A!iI@_m;eALL)aM$;4;1wEo%%q80@QOCw|_aS9+!%@#Vrpt8^CsRyPfK#4A@n zUycVWF>#|s8^RpK<&(+HasG-(v+(d6M3audVhDOXcSAMsszpK?qb06 zyQ-4yNn!#R|Av7Nljomw+{x4C7S2`A%$U{O8cTHEo_E2_3Yyi7HZRqBrN6XR62J*L zAfiEi=I8KrR@JCd&Aa0RuA;Ys^sd^su)wr2`pff1YY-E%+5asfKuIPC^*G$~3@or>x_Vp*vRl~uc)W|DdL<5_7M5ja}+E_Mo+E_AQ z{6h*Bdmqe57@-=`|Kzkt3av^-)2cS{^qNhyYo1!JYpZrrv?m-TPaGv|&4pGQgSwgT zk6YhrTq1L#@2}0MpR`XArm~VAlkVIf_~B^ZJ4C0%Jq9OIeq&M+>7=V$)8ERY={z5b z&8Q(c?9t(vmjm?R`g!79m(ZGAj41;jJE)oU#bp$4xL0)h2e&JmemmAxX;%ohvE=p0 za@vcI#)wqOc`w?B8ZKaFqO9duqC7?*>S0*$z1Hxky2I$p+2--8w)t;_q*Nt=&x!15 zIrz&O5}#G-Zhfy=(|IY?VoS&R3c9Euz`}8~4@*}JTeTVVCR!YqTqQn0n)7-4gzR|8 zX(@7e0iU1qH?FLgHGq(XJdvQVT*Y9ZzLB12upqmHMT*%OpC*6iR|s;-NVKZ6UDpB8 z8~^W~9f~!hiN^}!#3@S%U;b-bMwx^$ZUWQJ-+tH5Vq<*({%Zw1?15w57xEq`J~Z+) z1zKQo$>*3!Eh@jbtP3NaakrM?2(&r_dApOk7M!D-luVGnm<|sY%Q)_=n3bX zEG(9k_7Z&2;egZwt+xFQanjTg;i;tFL({XBk>VU$-$YVoPyk;>Z%{y?HAlWF`pClG zQSIjv&Uv%SM61LYBzFXlR~$7<6CRA<`)8wiT3>_r^`rC^Vl9ET0V~?ca9B61HngsM z%|nQJwg9#P$#)+nXGJRV_#~|;Jj6b}kCUCbasy$ujb>RKgj5CcdeB*~#^`zw>6xXm4s^YtF({4=QDXQZW(ga_FA z#KpkKSJN{ye`@zl+|6@^joT{!)ndrGu4TUAg~~vF|AB@WxF&rYF?gK?NzXwON6^Jp zthz5g)zQ78q7xfs0)wc!y1+Al=1=!}7`DPqOkT}v^*2Z|@XpQ6`IMEHbJgnAQd-#P zauIQLFQK-!R*Ek6XgvkEd3c^>V=05S;xYUyyjoAf3n3iH*H@&a4NjAT@3g zk*P#%#*Npbixx~I6CutnS2Q6oHiJ#54noqX@FuidJ-v*`sRLxd>4(hAg9PJ@Ws;*u8*&-6p#9 zxR4WZQSBBR5X1dUL6+?{>$RKzmVW