Issue #336, application names have been changed to BaramFlow and Bara…

…mMesh

baram/app.py → 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):

baram/app_plug_in.py → 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):

baram/coredb/app_settings.py → 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

baram/coredb/boundary_db.py → 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):

baram/coredb/cell_zone_db.py → 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):

baram/coredb/coredb.py → 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}

baram/coredb/coredb_writer.py → 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:

baram/coredb/filedb.py → 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):

baram/coredb/general_db.py → 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):

baram/coredb/initialization_db.py → 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:

baram/coredb/material_db.py → 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
 

baram/coredb/models_db.py → 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):

baram/coredb/monitor_db.py → 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):

baram/coredb/project.py → 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

baram/coredb/project_settings.py → 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'

baram/coredb/region_db.py → 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'

baram/main.py → 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())
 

baram/mesh/mesh_manager.py → 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
 
 

baram/mesh/mesh_model.py → 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 = {

baram/openfoam/boundary_conditions/alpha.py → 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):

baram/openfoam/boundary_conditions/alphat.py → 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):

baram/openfoam/boundary_conditions/boundary_condition.py → 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)

baram/openfoam/boundary_conditions/epsilon.py → 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):

baram/openfoam/boundary_conditions/k.py → 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):

baram/openfoam/boundary_conditions/nuTilda.py → 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):

baram/openfoam/boundary_conditions/nut.py → 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):