Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Breakout package parser class #566

Merged
merged 11 commits into from
Jun 29, 2023
Merged

Breakout package parser class #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8de2208
move package_parser to its own file
nllong Jun 25, 2023
2803010
add cspell workspace dictionary
nllong Jun 25, 2023
973d268
add cspell workspace dictionary
nllong Jun 25, 2023
9260a70
fix mypy errors
nllong Jun 25, 2023
6ff9dd1
Merge remote-tracking branch 'origin/develop' into breakout-package-p…
nllong Jun 27, 2023
de179a3
skip 2 tests that fail using OM 1.20
vtnate Jun 28, 2023
25ca403
remove unnecessary python enumerate command
vtnate Jun 28, 2023
137b8c1
refactor: swap os. for Path in package_parser.py
vtnate Jun 28, 2023
092e386
refactor: transform self.path to be a Path no matter what it came in as
vtnate Jun 28, 2023
c82a526
Revert "refactor: transform self.path to be a Path no matter what it …
vtnate Jun 28, 2023
d431b7a
Revert "refactor: swap os. for Path in package_parser.py"
vtnate Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .cspell/custom-dictionary-workspace.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Custom Dictionary Words
mfrt
Reparse
timeseries
timestep
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/districts/district.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
LoadBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.scaffold import Scaffold


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from geojson_modelica_translator.model_connectors.energy_transfer_systems.energy_transfer_base import (
EnergyTransferBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import simple_uuid


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from geojson_modelica_translator.model_connectors.energy_transfer_systems.energy_transfer_base import (
EnergyTransferBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import simple_uuid


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/load_connectors/spawn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
LoadBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import (
ModelicaPath,
convert_c_to_k,
Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/load_connectors/teaser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
LoadBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import (
ModelicaPath,
convert_c_to_k,
Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/load_connectors/time_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
LoadBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import (
ModelicaPath,
convert_c_to_k,
Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/load_connectors/time_series_mft_ets_coupling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from geojson_modelica_translator.model_connectors.load_connectors.load_base import (
LoadBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import ModelicaPath, simple_uuid


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/plants/borefield.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from geojson_modelica_translator.model_connectors.plants.plant_base import (
PlantBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import ModelicaPath, simple_uuid


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/plants/chp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from geojson_modelica_translator.model_connectors.plants.plant_base import (
PlantBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import convert_c_to_k, simple_uuid


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/model_connectors/plants/cooling_plant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from geojson_modelica_translator.model_connectors.plants.plant_base import (
PlantBase
)
from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.utils import simple_uuid


Expand Down
2 changes: 1 addition & 1 deletion geojson_modelica_translator/modelica/GMT_Lib/DHC/DHC_5G_waste_heat_GHX.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import shutil
from pathlib import Path

from geojson_modelica_translator.modelica.input_parser import PackageParser
from geojson_modelica_translator.modelica.modelica_mos_file import ModelicaMOS
from geojson_modelica_translator.modelica.package_parser import PackageParser
from geojson_modelica_translator.modelica.simple_gmt_base import SimpleGMTBase
from geojson_modelica_translator.scaffold import Scaffold

Expand Down
Loading