Merge branch 'develop' into 20131021_ETH_BugFixes

NREL · Nov 4, 2013 · 07dc4f3 · 07dc4f3
2 parents e0b518d + ebde394
commit 07dc4f3
Show file tree

Hide file tree

Showing 64 changed files with 23,481 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -723,6 +723,7 @@ if (BUILD_SIMXML)
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
     -DBoostLog_DIR:PATH=${BoostLog_DIR}
+    -DQJSON_DIR:PATH=${QJSON_DIR}
     -DOpenStudioCore_DIR:PATH=${OPENSTUDIOCORE_BUILD_DIR}
     -DQT_QMAKE_EXECUTABLE:STRING=${QT_QMAKE_EXECUTABLE}
     -DSWIG_EXECUTABLE:STRING=${SWIG_EXECUTABLE}

diff --git a/openstudiocore/CMakeLists.txt b/openstudiocore/CMakeLists.txt
@@ -140,6 +140,7 @@ SET( project_directories
   energyplus
   radiance
   gbxml
+  isomodel
   osversion
   ruleset
   runmanager/lib
@@ -858,6 +859,7 @@ export(TARGETS openstudio_runmanager
                openstudio_analysis
                openstudio_radiance
                openstudio_gbxml
+               openstudio_isomodel
                openstudio_lib
                openstudio_plugin
                openstudio_sdd

diff --git a/openstudiocore/resources/CMakeLists.txt b/openstudiocore/resources/CMakeLists.txt
@@ -617,3 +617,25 @@ ADD_CUSTOM_TARGET( openstudio_analysis_resources
 )
 
 CREATE_SRC_GROUPS( "${analysis_resources_src}" )
+
+
+########################################################
+# isomodel resources
+# clear runs, calls to RUN_ENERGYPLUS will populate this
+SET(ENERGYPLUS_OUTPUTS "")
+
+SET(isomodel_resources_src
+  isomodel/exampleModel.ISO
+  isomodel/weather.epw
+)
+
+# update the resources
+UPDATE_RESOURCES("${isomodel_resources_src}")
+
+# add target
+ADD_CUSTOM_TARGET( openstudio_isomodel_resources
+  DEPENDS ${isomodel_resources_src} ${ENERGYPLUS_OUTPUTS}
+  SOURCES ${isomodel_resources_src}
+)
+
+CREATE_SRC_GROUPS( "${isomodel_resources_src}" )
diff --git a/openstudiocore/resources/isomodel/SimulationMeasure/measure.rb b/openstudiocore/resources/isomodel/SimulationMeasure/measure.rb
diff --git a/openstudiocore/resources/isomodel/SimulationMeasure/measure.xml b/openstudiocore/resources/isomodel/SimulationMeasure/measure.xml
@@ -0,0 +1,51 @@
+<measure>
+  <name>OSM2ISMV01</name>
+  <uid>80eafdcd-fcad-40da-85a5-48eec627ad20</uid>
+  <version_id>716d137a-4ae7-49d4-babb-8124ed403d55</version_id>
+  <description>This measure will convert the current loaded OSM file to an ISM file and run the ISO Model engine to get output.  Output is saved to  CSV files</description>
+  <modeler_description>This measure uses the CEN/ISO monthly energy model as described in ISO 13790 and referenced CEN/ISO standards</modeler_description>
+  <provenances/>
+  <tags>
+    <tag>Reporting.QAQC</tag>
+  </tags>
+  <attributes>
+    <attribute>
+      <name>Measure Type</name>
+      <value>ModelMeasure</value>
+      <datatype>string</datatype>
+    </attribute>
+    <attribute>
+      <name>Measure Function</name>
+      <value>Measure</value>
+      <datatype>string</datatype>
+    </attribute>
+    <attribute>
+      <name>Requires EnergyPlus Results</name>
+      <value>false</value>
+      <datatype>boolean</datatype>
+    </attribute>
+    <attribute>
+      <name>Uses SketchUp API</name>
+      <value>false</value>
+      <datatype>boolean</datatype>
+    </attribute>
+  </attributes>
+  <files>
+    <file>
+      <filename>OSM2ISMV01_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F9D30FC1</checksum>
+    </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>1.0.1</identifier>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>CA15B413</checksum>
+    </file>
+  </files>
+</measure>