Move modelica methods from GMT to modelica-builder (#591)

* move modelica methods to gmt

* update dependendencies

* point to latest builder release

.cspell.json

@@ -8,11 +8,15 @@
     "cvrmsd",
     "dassl",
     "dymola",
+    "energyplus",
     "GDHC",
+    "HVAC",
+    "IBPSA",
     "Jing",
     "levelname",
     "libfortran",
     "linecount",
+    "maxdepth",
     "mfrt",
     "microgrid",
     "Modelica",
@@ -29,6 +33,7 @@
     "Templatized",
     "timeseries",
     "timestep",
+    "timesteps",
     "urbanopt",
     "vtnate"
   ],

geojson_modelica_translator/model_connectors/districts/district.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 
 from jinja2 import Environment, FileSystemLoader, StrictUndefined
+from modelica_builder.package_parser import PackageParser
 
 from geojson_modelica_translator.jinja_filters import ALL_CUSTOM_FILTERS
 from geojson_modelica_translator.model_connectors.couplings.diagram import (
@@ -12,7 +13,6 @@
 from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
     LoadBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.scaffold import Scaffold
 
 

geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py

@@ -3,10 +3,11 @@
 
 import os
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.energy_transfer_systems.energy_transfer_base import (
     EnergyTransferBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import simple_uuid
 
 

geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py

@@ -3,10 +3,11 @@
 
 import os
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.energy_transfer_systems.energy_transfer_base import (
     EnergyTransferBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import simple_uuid
 
 

geojson_modelica_translator/model_connectors/load_connectors/spawn.py

@@ -4,10 +4,11 @@
 import os
 import shutil
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
     LoadBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import (
     ModelicaPath,
     convert_c_to_k,

geojson_modelica_translator/model_connectors/load_connectors/teaser.py

@@ -10,12 +10,12 @@
 
 import numpy as np
 from modelica_builder.model import Model
+from modelica_builder.package_parser import PackageParser
 from teaser.project import Project
 
 from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
     LoadBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import (
     ModelicaPath,
     convert_c_to_k,

geojson_modelica_translator/model_connectors/load_connectors/time_series.py

@@ -4,10 +4,11 @@
 import os
 import shutil
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
     LoadBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import (
     ModelicaPath,
     convert_c_to_k,

geojson_modelica_translator/model_connectors/load_connectors/time_series_mft_ets_coupling.py

@@ -5,10 +5,11 @@
 import shutil
 from pathlib import Path
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
     LoadBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import ModelicaPath, simple_uuid
 
 

geojson_modelica_translator/model_connectors/plants/borefield.py

@@ -8,11 +8,11 @@
 
 import pandas as pd
 import scipy.io as sio
+from modelica_builder.package_parser import PackageParser
 
 from geojson_modelica_translator.model_connectors.plants.plant_base import (
     PlantBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import ModelicaPath, simple_uuid
 
 logger = logging.getLogger(__name__)

geojson_modelica_translator/model_connectors/plants/chp.py

@@ -3,10 +3,11 @@
 
 from pathlib import Path
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.plants.plant_base import (
     PlantBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import convert_c_to_k, simple_uuid
 
 

geojson_modelica_translator/model_connectors/plants/cooling_plant.py

@@ -5,10 +5,11 @@
 import shutil
 from pathlib import Path
 
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.model_connectors.plants.plant_base import (
     PlantBase
 )
-from geojson_modelica_translator.modelica.package_parser import PackageParser
 from geojson_modelica_translator.utils import simple_uuid
 
 

geojson_modelica_translator/modelica/GMT_Lib/DHC/DHC_5G_waste_heat_GHX.py

@@ -1,8 +1,9 @@
 import shutil
 from pathlib import Path
 
-from geojson_modelica_translator.modelica.modelica_mos_file import ModelicaMOS
-from geojson_modelica_translator.modelica.package_parser import PackageParser
+from modelica_builder.modelica_mos_file import ModelicaMOS
+from modelica_builder.package_parser import PackageParser
+
 from geojson_modelica_translator.modelica.simple_gmt_base import SimpleGMTBase
 from geojson_modelica_translator.scaffold import Scaffold
 

geojson_modelica_translator/modelica/input_parser.py

@@ -6,6 +6,7 @@
 from typing import Any, List, Tuple, Union
 
 
+# TODO: This needs to be removed. It is not used anywhere in the codebase.
 class InputParser(object):
     """Class to read in Modelica files (.mo) and provide basic operations.