Merge pull request #326 from RWTH-EBC/development

release v0.4.0
RWTH-EBC · Oct 21, 2016 · 99cc413 · 99cc413
2 parents 73f4729 + 4c09c26
commit 99cc413
Show file tree

Hide file tree

Showing 93 changed files with 17,798 additions and 8,362 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ IEA-EBC [Annex60](https://github.com/iea-annex60/modelica-annex60).
 
 ### Version
 
-The current version is 0.3.9, which is a pre-release.
+The current version is 0.4.0, which is a pre-release.
 
 ### How to cite TEASER
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.'
+version = '0.4.'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.9'
+release = '0.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/index.rst b/doc/index.rst
@@ -60,7 +60,7 @@ IEA-EBC `Annex60 <https://github.com/iea-annex60/modelica-annex60>`_.
 Version
 ==================
 
-The current version is 0.3.9, which is a pre-release.
+The current version is 0.4.0, which is a pre-release.
 
 How to cite TEASER
 ==================

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='teaser',
-      version='0.3.9',
+      version='0.4.0',
       description='Tool for Energy Analysis and Simulation for Efficient Retrofit ',
       url='https://github.com/RWTH-EBC/TEASER',
       author='RWTH Aachen University, E.ON Energy Research Center, Institute of Energy Efficient Buildings and Indoor Climate',
@@ -27,6 +27,8 @@
                 'teaser.data.bindings.opengis.misc.raw',
                 'teaser.data.bindings.opengis.raw',
                 'teaser.data.bindings.schemas',
+				'teaser.data.bindings.v_0_3_9',
+				'teaser.data.bindings.v_0_4',
                 'teaser.data.input',
                 'teaser.data.input.inputdata',
                 'teaser.data.output',

diff --git a/teaser/data/bindings/schemas/BoundaryConditions.xsd b/teaser/data/bindings/schemas/BoundaryConditions.xsd
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://teaser.boundary"
+           targetNamespace="http://teaser.boundary" attributeFormDefault="unqualified" elementFormDefault="qualified" version="0.4">
   <xs:element name="UseConditions" type="UseConditionsType"/>
   <xs:complexType name="UsageOperationTimeType">
     <xs:sequence>
@@ -17,7 +18,7 @@
   </xs:complexType>
   <xs:complexType name="LightingType">
     <xs:sequence>
-      <xs:element minOccurs="0" type="xs:float" name="maintained_illuminace"/>
+      <xs:element minOccurs="0" type="xs:float" name="maintained_illuminance"/>
       <xs:element minOccurs="0" type="xs:float" name="usage_level_height"/>
       <xs:element minOccurs="0" type="xs:float" name="red_factor_visual"/>
       <xs:element minOccurs="0" type="xs:float" name="rel_absence"/>
@@ -77,7 +78,8 @@
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="UseConditionsType">
-    <xs:sequence>
+    <xs:attribute type="xs:string" name="version"/>
+	<xs:sequence>
       <xs:element minOccurs="0" maxOccurs="unbounded" type="BoundaryConditionsType" name="BoundaryConditions"/>
     </xs:sequence>
   </xs:complexType>

diff --git a/teaser/data/bindings/schemas/MaterialTemplates.xsd b/teaser/data/bindings/schemas/MaterialTemplates.xsd
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://teaser.material"
+           targetNamespace="http://teaser.material" attributeFormDefault="unqualified" elementFormDefault="qualified" version="0.4">
   <xs:element name="MaterialTemplates" type="MaterialTemplatesType"/>
   <xs:complexType name="MaterialType">
+	<xs:attribute type="xs:string" name="material_id"/>
     <xs:sequence>
       <xs:element type="xs:string" name="name"/>
       <xs:element type="xs:float" name="density"/>
       <xs:element type="xs:float" name="thermal_conduc"/>
       <xs:element type="xs:float" name="heat_capac"/>
-      <xs:element type="xs:float" name="solar_absorp"/>
-      <xs:element type="xs:float" name="ir_emissivity"/>
+      <xs:element minOccurs="0" type="xs:float" name="solar_absorp"/>
+      <xs:element minOccurs="0" type="xs:float" name="ir_emissivity"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="MaterialTemplatesType">
-    <xs:choice maxOccurs="unbounded" minOccurs="0">
+    <xs:attribute type="xs:string" name="version"/>
+	<xs:choice maxOccurs="unbounded" minOccurs="0">
       <xs:element type="MaterialType" name="Material" />
     </xs:choice>
   </xs:complexType>

diff --git a/teaser/data/bindings/schemas/Project.xsd b/teaser/data/bindings/schemas/Project.xsd
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
-  <xs:include schemaLocation="D:\GIT\TEASER\teaser\Data\SchemaBindings\schemas\BoundaryConditions.xsd"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://teaser.project" xmlns:usecond="http://teaser.boundary"
+           targetNamespace="http://teaser.project" attributeFormDefault="unqualified" elementFormDefault="qualified" version="0.4">
+   <xs:import namespace="http://teaser.boundary" schemaLocation="BoundaryConditions.xsd"/>
   <xs:element name="Project" type="ProjectType"/>
   <xs:complexType name="UseConditionType">
     <xs:sequence>
-      <xs:element type="BoundaryConditionsType" name="BoundaryConditions" minOccurs="0"/>
+      <xs:element type="usecond:BoundaryConditionsType" name="BoundaryConditions" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="MaterialType">
@@ -160,10 +161,10 @@
       <xs:element type="xs:float" name="by_pass_dehumidification" minOccurs="0"/>     
       <xs:element type="xs:float" name="efficiency_recovery" minOccurs="0"/>
       <xs:element type="xs:float" name="efficiency_revocery_false" minOccurs="0"/>
-      <xs:element type="floatList" name="profile_min_relative_humidity" minOccurs="0"/>
-      <xs:element type="floatList" name="profile_max_relative_humidity" minOccurs="0"/>
-      <xs:element type="floatList" name="profile_v_flow" minOccurs="0"/>
-      <xs:element type="floatList" name="profile_temperature" minOccurs="0"/>
+      <xs:element type="usecond:floatList" name="profile_min_relative_humidity" minOccurs="0"/>
+      <xs:element type="usecond:floatList" name="profile_max_relative_humidity" minOccurs="0"/>
+      <xs:element type="usecond:floatList" name="profile_v_flow" minOccurs="0"/>
+      <xs:element type="usecond:floatList" name="profile_temperature" minOccurs="0"/>
 	</xs:sequence>  
   </xs:complexType>
   <xs:complexType name="BuildingType">
@@ -269,6 +270,7 @@
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="ProjectType">
+    <xs:attribute type="xs:string" name="version"/>
     <xs:choice maxOccurs="unbounded" minOccurs="0">
       <xs:element type="BuildingType" name="Building"/>
 	  <xs:element type="OfficeType" name="Office"/>

diff --git a/teaser/data/bindings/schemas/TypeBuildingElements.xsd b/teaser/data/bindings/schemas/TypeBuildingElements.xsd
@@ -1,21 +1,20 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://teaser.elements"
+           targetNamespace="http://teaser.elements" attributeFormDefault="unqualified" elementFormDefault="qualified" version="0.4">
   <xs:element name="TypeBuildingElements" type="TypeBuildingElementsType"/>
-  <xs:complexType name="MaterialType">
-    <xs:sequence>
-      <xs:element type="xs:string" name="name"/>
-      <xs:element type="xs:float" name="density"/>
-      <xs:element type="xs:float" name="thermal_conduc"/>
-      <xs:element type="xs:float" name="heat_capac"/>
-      <xs:element type="xs:float" name="solar_absorp" maxOccurs="1" minOccurs="0"/>
-      <xs:element type="xs:float" name="ir_emissivity" maxOccurs="1" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
   <xs:complexType name="layerType">
     <xs:sequence>
       <xs:element type="xs:int" name="id"/>
       <xs:element type="xs:float" name="thickness"/>
-      <xs:element type="MaterialType" name="Material"/>
+      <xs:element name="material">
+		<xs:complexType>
+		  <xs:simpleContent>
+			<xs:extension base="xs:string">
+			  <xs:attribute type="xs:string" name="material_id" use="optional"/>
+			</xs:extension>
+		  </xs:simpleContent>
+		</xs:complexType>
+	  </xs:element>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="LayersType">
@@ -104,6 +103,7 @@
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TypeBuildingElementsType">
+	<xs:attribute type="xs:string" name="version"/>
     <xs:choice maxOccurs="unbounded" minOccurs="0">
       <xs:element type="OuterWallType" name="OuterWall"/>
       <xs:element type="InnerWallType" name="InnerWall" />

diff --git a/teaser/data/bindings/v_0_3_9/__init__.py b/teaser/data/bindings/v_0_3_9/__init__.py