Skip to content

Commit

Permalink
#688 raise AixLib version number + sort import section following pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinRaetz committed Jun 16, 2021
1 parent 37aefc0 commit 033d310
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion teaser/data/output/aixlib_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import os
import warnings
import shutil
from mako.template import Template
from mako.lookup import TemplateLookup
import teaser.logic.utilities as utilities
import shutil


def export_multizone(buildings, prj, path=None):
Expand Down
8 changes: 4 additions & 4 deletions teaser/examples/e9_building_data_import_from_excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
"""

import os
import warnings
import shutil
import pandas as pd
import numpy as np
from teaser.project import Project
from teaser.logic.buildingobjects.building import Building
from teaser.logic.buildingobjects.thermalzone import ThermalZone
Expand All @@ -68,10 +72,6 @@
from teaser.logic.buildingobjects.buildingphysics.ceiling import Ceiling
from teaser.logic.buildingobjects.buildingphysics.window import Window
from teaser.logic.buildingobjects.buildingphysics.innerwall import InnerWall
import pandas as pd
import numpy as np
import warnings
import shutil


def import_data(path=None, sheet_names=None):
Expand Down
2 changes: 1 addition & 1 deletion teaser/logic/buildingobjects/calculation/aixlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def __init__(self, parent):
self.file_set_t_cool = "TsetCool_" + self.parent.name + ".txt"
self.file_ahu = "AHU_" + self.parent.name + ".txt"
self.file_internal_gains = "InternalGains_" + self.parent.name + ".txt"
self.version = "0.10.7"
self.version = "1.0.0"
self.total_surface_area = None
self.consider_heat_capacity = True
self.use_set_back = True
Expand Down
2 changes: 1 addition & 1 deletion teaser/logic/buildingobjects/calculation/ibpsa.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self, parent):
self.parent = parent
self.file_internal_gains = "InternalGains_" + self.parent.name + ".mat"
self.version = {
"AixLib": "0.10.7",
"AixLib": "1.0.0",
"Buildings": "7.0.0",
"BuildingSystems": "2.0.0-beta2",
"IDEAS": "2.1.0",
Expand Down

0 comments on commit 033d310

Please sign in to comment.