Latest measures. Removed ServerDirectoryCleanup measure (superseded b…

…y worker finalization script). Updated AMI. Fixed resources path for Mac. Fixed dsgrid project.
NREL · Aug 17, 2017 · d457939 · d457939
1 parent 6fe9713
commit d457939
Show file tree

Hide file tree

Showing 30 changed files with 235 additions and 31,244 deletions.
diff --git a/README.md b/README.md
@@ -5,4 +5,6 @@ BuildStock, built on the [OpenStudio platform](http://openstudio.net), is a proj
 
 This project is a <b>work-in-progress</b>.
 
-For more information on using/developing BuildStock or understanding the methodology, please visit the [wiki documentation](https://github.com/NREL/OpenStudio-BuildStock/wiki).
+For more information, please visit the [documentation](http://resstock.readthedocs.io/en/latest/).
+
+![BuildStock workflow](https://user-images.githubusercontent.com/5861765/29423737-1932fb80-833a-11e7-979f-1d4e764858a6.png)
diff --git a/Rakefile b/Rakefile
@@ -5,6 +5,7 @@ desc 'Copy measures/osms from OpenStudio-BEopt repo'
 task :copy_beopt_files do
   require 'fileutils'
 
+  # TODO: Should really grab latest from https://github.com/NREL/OpenStudio-BEopt/archive/master.zip
   beopt_measures_dir = File.join(File.dirname(__FILE__), "..", "OpenStudio-BEopt", "measures")
   buildstock_resource_measures_dir = File.join(File.dirname(__FILE__), "resources", "measures")
   if not Dir.exist?(beopt_measures_dir)

diff --git a/measures/ServerDirectoryCleanup/measure.rb b/measures/ServerDirectoryCleanup/measure.rb
diff --git a/measures/ServerDirectoryCleanup/measure.xml b/measures/ServerDirectoryCleanup/measure.xml
diff --git a/project_resstock_dsgrid/housing_characteristics/HVAC System Cooling Type.tsv b/project_resstock_dsgrid/housing_characteristics/HVAC System Cooling Type.tsv
@@ -1,8 +1,8 @@
 Dependency=HVAC System Cooling	Option=Central	Option=None	Option=Room
 None	0	1	0
-AC, SEER 8	1	0	0
-AC, SEER 10	1	0	0
-AC, SEER 13	1	0	0
-AC, SEER 15	1	0	0
-Room AC, EER 8.5, 20% Conditioned	0	0	1
-Room AC, EER 10.7, 20% Conditioned	0	0	1
+"AC, SEER 8"	1	0	0
+"AC, SEER 10"	1	0	0
+"AC, SEER 13"	1	0	0
+"AC, SEER 15"	1	0	0
+"FIXME Room AC, EER 8.5, 20% Conditioned"	0	0	1
+"FIXME Room AC, EER 10.7, 20% Conditioned"	0	0	1
diff --git a/project_resstock_dsgrid/measures/ServerDirectoryCleanup/measure.rb b/project_resstock_dsgrid/measures/ServerDirectoryCleanup/measure.rb
diff --git a/project_resstock_dsgrid/measures/ServerDirectoryCleanup/measure.xml b/project_resstock_dsgrid/measures/ServerDirectoryCleanup/measure.xml
diff --git a/project_resstock_dsgrid/measures/TimeseriesCSVExport/measure.rb b/project_resstock_dsgrid/measures/TimeseriesCSVExport/measure.rb
@@ -69,7 +69,7 @@ def arguments()
     reporting_frequency_chs << "Daily"
     reporting_frequency_chs << "Monthly"
     reporting_frequency_chs << "Runperiod"
-    reporting_frequency = OpenStudio::Ruleset::OSArgument::makeChoiceArgument('reporting_frequency', reporting_frequency_chs, true)
+    reporting_frequency = OpenStudio::Measure::OSArgument::makeChoiceArgument('reporting_frequency', reporting_frequency_chs, true)
     reporting_frequency.setDisplayName("Reporting Frequency")
     reporting_frequency.setDefaultValue("Hourly")
     args << reporting_frequency

diff --git a/project_resstock_dsgrid/measures/TimeseriesCSVExport/measure.xml b/project_resstock_dsgrid/measures/TimeseriesCSVExport/measure.xml
@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>timeseries_csv_export</name>
   <uid>2a3442c1-944d-4e91-9e11-11e0cf368c64</uid>
-  <version_id>a04c3f7f-d8cd-45e7-a9c3-80686b6c6423</version_id>
-  <version_modified>20170419T215221Z</version_modified>
+  <version_id>3392aa31-2979-4635-a259-a4f17df3c8ac</version_id>
+  <version_modified>20170519T001656Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>TimeseriesCSVExport</class_name>
   <display_name>Timeseries CSV Export</display_name>
@@ -67,7 +67,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>77BDA8D6</checksum>
+      <checksum>1FCFC74B</checksum>
     </file>
   </files>
 </measure>