Merge pull request #558 from RWTH-EBC/issue557_occupancy_profiles

Issue557 occupancy profiles

README.md

@@ -64,7 +64,7 @@ models for all libraries supporting the
 
 ## Version
 
-TEASER is a ongoing research project, the current version is 0.6.5, which is
+TEASER is a ongoing research project, the current version is 0.6.6, which is
 still a pre-release.
 
 ## How to use TEASER

doc/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.6.'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.5'
+release = '0.6.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='teaser',
-      version='0.6.5',
+      version='0.6.6',
       description='Tool for Energy Analysis and Simulation for '
                   'Efficient Retrofit ',
       url='https://github.com/RWTH-EBC/TEASER',

teaser/logic/buildingobjects/calculation/aixlib.py

@@ -373,13 +373,19 @@ def modelica_gains_boundary(
 
             for i, time in enumerate(time_line):
                 if i == 0:
-                    time.append(0)
-                    time.append(0)
-                    time.append(0)
+                    time.append(
+                        zone_count.use_conditions.profile_persons[i + 1])
+                    time.append(
+                        zone_count.use_conditions.profile_machines[i + 1])
+                    time.append(
+                        zone_count.use_conditions.profile_lighting[i + 1])
                 else:
-                    time.append(zone_count.use_conditions.profile_persons[i - 1])
-                    time.append(zone_count.use_conditions.profile_machines[i - 1])
-                    time.append(zone_count.use_conditions.profile_lighting[i - 1])
+                    time.append(
+                        zone_count.use_conditions.profile_persons[i - 1])
+                    time.append(
+                        zone_count.use_conditions.profile_machines[i - 1])
+                    time.append(
+                        zone_count.use_conditions.profile_lighting[i - 1])
 
         internal_boundary = np.array(time_line)
 
@@ -388,3 +394,5 @@ def modelica_gains_boundary(
             mdict={'Internals': internal_boundary},
             appendmat=False,
             format='4')
+
+        return internal_boundary

tests/test_data.py

@@ -3159,3 +3159,44 @@ def test_modelica_export_version(self):
             assert ideas.replace('v', '') == ibpsa.version['IDEAS']
         except IndexError:
             warnings.warn('There was an index error for IDEAS', UserWarning)
+
+    def test_type_bldg_residential_profiles(self):
+        """
+        Verification of the type building generation of an office building.
+        Values are compared with TEASER3 values.
+        """
+        from teaser.logic.archetypebuildings.bmvbs.singlefamilydwelling \
+            import SingleFamilyDwelling
+
+        prj.set_default()
+        test_residential = SingleFamilyDwelling(parent=prj,
+                                                name="TestBuilding",
+                                                year_of_construction=1988,
+                                                number_of_floors=3,
+                                                height_of_floors=3,
+                                                net_leased_area=2500)
+
+        test_residential.generate_archetype()
+
+        prj.calc_all_buildings()
+
+        path_to_export = prj.export_aixlib(
+            internal_id=None,
+            path=None)
+
+        from scipy.io import loadmat
+        file = loadmat(os.path.join(
+            path_to_export,
+            "TestBuilding",
+            "InternalGains_TestBuilding.mat"))
+
+        use_cond = test_residential.thermal_zones[0].use_conditions
+
+        assert (file['Internals'].transpose()[1][1:] ==
+                use_cond.profile_persons).all()
+
+        assert (file['Internals'].transpose()[2][1:] ==
+                use_cond.profile_machines).all()
+
+        assert (file['Internals'].transpose()[3][1:] ==
+                use_cond.profile_lighting).all()