Bump version, update sample results.

NREL · Sep 21, 2020 · dab9f63 · dab9f63
1 parent 43e9d34
commit dab9f63
Show file tree

Hide file tree

Showing 75 changed files with 843,314 additions and 830,356 deletions.
diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst
@@ -9,7 +9,7 @@ Setup
 To get started:
 
 #. Either download `OpenStudio 3.0.0 <https://github.com/NREL/OpenStudio/releases/tag/v3.0.0>`_ and install the Command Line Interface/EnergyPlus components, or use the `nrel/openstudio docker image <https://hub.docker.com/r/nrel/openstudio>`_.
-#. Download the `OpenStudio-ERI v0.10.0 Beta <https://github.com/NREL/OpenStudio-ERI/releases/tag/v0.10.0-beta>`_ release.
+#. Download the `OpenStudio-ERI v0.11.0 Beta <https://github.com/NREL/OpenStudio-ERI/releases/tag/v0.11.0-beta>`_ release.
 #. To obtain all available weather files, run: ``openstudio workflow/energy_rating_index.rb --download-weather``
 
 .. note:: 

diff --git a/tasks.rb b/tasks.rb
@@ -1530,8 +1530,8 @@ def display_usage(command_list)
 end
 
 if ARGV[0].to_sym == :update_version
-  eri_version_change = { from: '0.9.0',
-                         to: '0.10.0' }
+  eri_version_change = { from: '0.10.0',
+                         to: '0.11.0' }
 
   file_names = ['workflow/energy_rating_index.rb', 'docs/source/getting_started.rst']
 

diff --git a/workflow/energy_rating_index.rb b/workflow/energy_rating_index.rb
@@ -626,7 +626,7 @@ def calculate_eri(design_outputs, resultsdir)
 Version.check_openstudio_version()
 
 if options[:version]
-  workflow_version = '0.10.0'
+  workflow_version = '0.11.0'
   puts "OpenStudio-ERI v#{workflow_version}"
   puts "OpenStudio v#{OpenStudio.openStudioLongVersion}"
   puts "EnergyPlus v#{OpenStudio.energyPlusVersion}.#{OpenStudio.energyPlusBuildSHA}"

diff --git a/workflow/sample_results/ERIIndexAdjustmentDesign/eplusout.audit b/workflow/sample_results/ERIIndexAdjustmentDesign/eplusout.audit
@@ -16,19 +16,19 @@
  numTableEntry=        1679
  sizeCompSizeTableEntry=         100
  numCompSizeTableEntry=          14
- NumOfRVariable=        4362
- NumOfRVariable(Total)=        4364
- NumOfRVariable(Actual)=         245
- NumOfRVariable(Summed)=         213
- NumOfRVariable(Meter)=          57
+ NumOfRVariable=        4367
+ NumOfRVariable(Total)=        4369
+ NumOfRVariable(Actual)=         243
+ NumOfRVariable(Summed)=         214
+ NumOfRVariable(Meter)=          56
  NumOfIVariable=         226
  NumOfIVariable(Total)=         226
  NumOfIVariable(Actual)=           0
  NumOfIVariable(Summed)=           0
  MaxRVariable=        1000
  MaxIVariable=          10
  NumEnergyMeters=         102
- NumVarMeterArrays=          57
+ NumVarMeterArrays=          56
  maxUniqueKeyCount=        1500
  maxNumberOfFigures=           0
  MAXHCArrayBounds=          10
@@ -37,13 +37,13 @@
  InstMeterCacheSize=        1000
  ClippingAlgorithm=SutherlandHodgman
  MonthlyFieldSetInputCount=           4
- NumConsideredOutputVariables=         258
+ NumConsideredOutputVariables=         260
  MaxConsideredOutputVariables=       10000
- numActuatorsUsed=           8
- numEMSActuatorsAvailable=         619
+ numActuatorsUsed=           9
+ numEMSActuatorsAvailable=         609
  maxEMSActuatorsAvailable=        1000
  numInternalVariablesUsed=           1
- numEMSInternalVarsAvailable=          37
+ numEMSInternalVarsAvailable=          38
  maxEMSInternalVarsAvailable=        1000
  NumOfNodeConnections=          81
  MaxNumOfNodeConnections=        1000
diff --git a/workflow/sample_results/ERIIndexAdjustmentDesign/eplusout.bnd b/workflow/sample_results/ERIIndexAdjustmentDesign/eplusout.bnd
@@ -1,4 +1,4 @@
-Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2020.06.05 10:53
+Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2020.09.21 15:37
 ! This file shows details about the branches, nodes, and other
 ! elements of the flow connections.
 ! This file is intended for use in "debugging" potential problems
@@ -180,7 +180,7 @@ Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2020.06.05 10:53
 ! <Zone Equipment Component>,<Component Count>,<Component Type>,<Component Name>,<Zone Name>,<Heating Priority>,<Cooling Priority>
  Zone Equipment List,3,LIVING SPACE EQUIPMENT LIST,LIVING SPACE,2
    Zone Equipment Component,1,ZONEHVAC:AIRDISTRIBUTIONUNIT,ADU CENTRAL AC AND FURNACE TERMINAL,LIVING SPACE,1,1
-   Zone Equipment Component,2,ZONEHVAC:IDEALLOADSAIRSYSTEM,IDEAL,LIVING SPACE,2,2
+   Zone Equipment Component,2,ZONEHVAC:IDEALLOADSAIRSYSTEM,IDEAL RESIDUAL,LIVING SPACE,2,2
 ! ===============================================================
 ! <#AirLoopHVACs>,<Number of AirLoopHVACs>
  #AirLoopHVACs,1
@@ -274,8 +274,8 @@ Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2020.06.05 10:53
  Non-Parent Node Connection,NODE 10,AIRLOOPHVAC:ZONESPLITTER,CENTRAL AC AND FURNACE ZONE SPLITTER,Outlet,1
  Non-Parent Node Connection,NODE 10,AIRTERMINAL:SINGLEDUCT:CONSTANTVOLUME:NOREHEAT,CENTRAL AC AND FURNACE TERMINAL,Inlet,1
  Non-Parent Node Connection,NODE 8,AIRTERMINAL:SINGLEDUCT:CONSTANTVOLUME:NOREHEAT,CENTRAL AC AND FURNACE TERMINAL,Outlet,1
- Non-Parent Node Connection,NODE 12,ZONEHVAC:IDEALLOADSAIRSYSTEM,IDEAL,Outlet,1
- Non-Parent Node Connection,NODE 11,ZONEHVAC:IDEALLOADSAIRSYSTEM,IDEAL,Inlet,1
+ Non-Parent Node Connection,NODE 12,ZONEHVAC:IDEALLOADSAIRSYSTEM,IDEAL RESIDUAL,Outlet,1
+ Non-Parent Node Connection,NODE 11,ZONEHVAC:IDEALLOADSAIRSYSTEM,IDEAL RESIDUAL,Inlet,1
  Non-Parent Node Connection,NODE 7,AIRLOOPHVAC:ZONEMIXER,CENTRAL AC AND FURNACE ZONE MIXER,Outlet,1
  Non-Parent Node Connection,NODE 9,AIRLOOPHVAC:ZONEMIXER,CENTRAL AC AND FURNACE ZONE MIXER,Inlet,1
  Non-Parent Node Connection,NODE 4,FAN:ONOFF,CENTRAL AC AND FURNACE SUPPLY FAN,Inlet,1