openstudio-workflow 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49db03b4f7bf7c837df2f615cc5a11d3fa0dfe5957d6a8a3d750734488e332c
-  data.tar.gz: f780eee7177544827c84399e6f7cfce97fbb75bad5cd661c82bab11f54a1fafa
+  metadata.gz: c672be50cec3b97e0768c9b4b935283c281a42a8668d172777d77fc11f7bb636
+  data.tar.gz: 110cd910db5fd25e70c641dbbe905ee18b065dcfdf0447c50847867a5bd8a9db
 SHA512:
-  metadata.gz: 9c8cecbdb8373f2a68ab8e331bc43257b1e3f9b26d01752e15293b8a4f6248aefb493bbdce053416a303a9922923904b44fa1b9c19256355de132a8b4dd595e9
-  data.tar.gz: c58bf01dcd1606e568846320b4d7d03a097a628d200761f73e4f0c1480a77d317597e2facd10c8c7555f379c07b6be0259e02f2a18fc4b3552069d7d189d916e
+  metadata.gz: 37cef44df01e125a9c6e0cb496c3d68accdca96dc97106d23fac41b8e63551efdc2b9deb57cb9ffa78a9ba246bf1e0837b1a897bbf08102d95d2329c078638fa
+  data.tar.gz: 31cd4fc83927dbef85d38ff169578888e23b928f0ab54039ac1b4cf04e2d8058849a23afa91b76443080ad98cf80c9675007a1ccb627cc69110d0e598fca3fc1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 OpenStudio::Workflow Change Log
 ==================================
 
+Version 2.1.0
+-------------
+* Support for EnergyPlus 9.4. This version will not work with prior versions of EnergyPlus.
+* Add warning when paths are not relative
+
 Version 2.0.1
 -------------
 

data/Rakefile

@@ -36,3 +36,14 @@ task :test_zip do
   puts "Trying to extract #{f}"
   OpenStudio::Workflow.extract_archive(f, 'junk_out', true)
 end
+
+desc 'Transition IDF Files'
+task :transition_idf do
+  lst_path = File.join(Dir.pwd, 'IdfFilesToTransition.lst')
+  File.open(lst_path, 'w') do |file|
+    Dir.glob('**/*.idf').each do |idf|
+      file.puts(File.join(Dir.pwd, idf))
+    end
+  end
+  puts "Use the IDFVersionUpdater and point it to #{lst_path}"
+end

data/lib/openstudio/workflow/jobs/resources/monthly_report.idf

@@ -1,3 +1,5 @@
+Version,9.4;
+
 Output:Table:Monthly,
   Building Energy Performance - Electricity,  !- Name
     2,                       !- Digits After Decimal
@@ -33,17 +35,17 @@ Output:Table:Monthly,
 Output:Table:Monthly,
   Building Energy Performance - Natural Gas,  !- Name
     2,                       !- Digits After Decimal
-    InteriorEquipment:Gas,   !- Variable or Meter 1 Name
+    InteriorEquipment:NaturalGas,   !- Variable or Meter 1 Name
     SumOrAverage,            !- Aggregation Type for Variable or Meter 1
-    ExteriorEquipment:Gas,   !- Variable or Meter 2 Name
+    ExteriorEquipment:NaturalGas,   !- Variable or Meter 2 Name
     SumOrAverage,            !- Aggregation Type for Variable or Meter 2
-    Heating:Gas,             !- Variable or Meter 3 Name
+    Heating:NaturalGas,             !- Variable or Meter 3 Name
     SumOrAverage,            !- Aggregation Type for Variable or Meter 3
-    Cooling:Gas,             !- Variable or Meter 4 Name
+    Cooling:NaturalGas,             !- Variable or Meter 4 Name
     SumOrAverage,            !- Aggregation Type for Variable or Meter 4
-    WaterSystems:Gas,        !- Variable or Meter 5 Name
+    WaterSystems:NaturalGas,        !- Variable or Meter 5 Name
     SumOrAverage,            !- Aggregation Type for Variable or Meter 5
-    Cogeneration:Gas,        !- Variable or Meter 6 Name
+    Cogeneration:NaturalGas,        !- Variable or Meter 6 Name
     SumOrAverage;            !- Aggregation Type for Variable or Meter 6
 
 Output:Table:Monthly,
@@ -141,19 +143,19 @@ Output:Table:Monthly,
 Output:Table:Monthly,
   Building Energy Performance - Natural Gas Peak Demand,  !- Name
     2,                       !- Digits After Decimal
-    Gas:Facility,  !- Variable or Meter 1 Name
+    NaturalGas:Facility,  !- Variable or Meter 1 Name
     Maximum,            !- Aggregation Type for Variable or Meter 1
-    InteriorEquipment:Gas,   !- Variable or Meter 1 Name
+    InteriorEquipment:NaturalGas,   !- Variable or Meter 1 Name
     ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 1
-    ExteriorEquipment:Gas,   !- Variable or Meter 2 Name
+    ExteriorEquipment:NaturalGas,   !- Variable or Meter 2 Name
     ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 2
-    Heating:Gas,             !- Variable or Meter 3 Name
+    Heating:NaturalGas,             !- Variable or Meter 3 Name
     ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 3
-    Cooling:Gas,             !- Variable or Meter 4 Name
+    Cooling:NaturalGas,             !- Variable or Meter 4 Name
     ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 4
-    WaterSystems:Gas,        !- Variable or Meter 5 Name
+    WaterSystems:NaturalGas,        !- Variable or Meter 5 Name
     ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 5
-    Cogeneration:Gas,        !- Variable or Meter 6 Name
+    Cogeneration:NaturalGas,        !- Variable or Meter 6 Name
     ValueWhenMaximumOrMinimum;            !- Aggregation Type for Variable or Meter 6
 
 Output:Table:Monthly,

data/lib/openstudio/workflow/util/energyplus.rb

@@ -239,13 +239,13 @@ module OpenStudio
           end
 
           # These are needed for the calibration report
-          new_objects << 'Output:Meter:MeterFileOnly,Gas:Facility,Daily;'
+          new_objects << 'Output:Meter:MeterFileOnly,NaturalGas:Facility,Daily;'
           new_objects << 'Output:Meter:MeterFileOnly,Electricity:Facility,Timestep;'
           new_objects << 'Output:Meter:MeterFileOnly,Electricity:Facility,Daily;'
 
           # Always add in the timestep facility meters
           new_objects << 'Output:Meter,Electricity:Facility,Timestep;'
-          new_objects << 'Output:Meter,Gas:Facility,Timestep;'
+          new_objects << 'Output:Meter,NaturalGas:Facility,Timestep;'
           new_objects << 'Output:Meter,DistrictCooling:Facility,Timestep;'
           new_objects << 'Output:Meter,DistrictHeating:Facility,Timestep;'
 
@@ -384,17 +384,17 @@ module OpenStudio
             Output:Table:Monthly,
               Building Energy Performance - Natural Gas,  !- Name
                 2,                       !- Digits After Decimal
-                InteriorEquipment:Gas,   !- Variable or Meter 1 Name
+                InteriorEquipment:NaturalGas,   !- Variable or Meter 1 Name
                 SumOrAverage,            !- Aggregation Type for Variable or Meter 1
-                ExteriorEquipment:Gas,   !- Variable or Meter 2 Name
+                ExteriorEquipment:NaturalGas,   !- Variable or Meter 2 Name
                 SumOrAverage,            !- Aggregation Type for Variable or Meter 2
-                Heating:Gas,             !- Variable or Meter 3 Name
+                Heating:NaturalGas,             !- Variable or Meter 3 Name
                 SumOrAverage,            !- Aggregation Type for Variable or Meter 3
-                Cooling:Gas,             !- Variable or Meter 4 Name
+                Cooling:NaturalGas,             !- Variable or Meter 4 Name
                 SumOrAverage,            !- Aggregation Type for Variable or Meter 4
-                WaterSystems:Gas,        !- Variable or Meter 5 Name
+                WaterSystems:NaturalGas,        !- Variable or Meter 5 Name
                 SumOrAverage,            !- Aggregation Type for Variable or Meter 5
-                Cogeneration:Gas,        !- Variable or Meter 6 Name
+                Cogeneration:NaturalGas,        !- Variable or Meter 6 Name
                 SumOrAverage;            !- Aggregation Type for Variable or Meter 6
 
             Output:Table:Monthly,
@@ -492,19 +492,19 @@ module OpenStudio
             Output:Table:Monthly,
               Building Energy Performance - Natural Gas Peak Demand,  !- Name
                 2,                       !- Digits After Decimal
-                Gas:Facility,  !- Variable or Meter 1 Name
+                NaturalGas:Facility,  !- Variable or Meter 1 Name
                 Maximum,            !- Aggregation Type for Variable or Meter 1
-                InteriorEquipment:Gas,   !- Variable or Meter 1 Name
+                InteriorEquipment:NaturalGas,   !- Variable or Meter 1 Name
                 ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 1
-                ExteriorEquipment:Gas,   !- Variable or Meter 2 Name
+                ExteriorEquipment:NaturalGas,   !- Variable or Meter 2 Name
                 ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 2
-                Heating:Gas,             !- Variable or Meter 3 Name
+                Heating:NaturalGas,             !- Variable or Meter 3 Name
                 ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 3
-                Cooling:Gas,             !- Variable or Meter 4 Name
+                Cooling:NaturalGas,             !- Variable or Meter 4 Name
                 ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 4
-                WaterSystems:Gas,        !- Variable or Meter 5 Name
+                WaterSystems:NaturalGas,        !- Variable or Meter 5 Name
                 ValueWhenMaximumOrMinimum,            !- Aggregation Type for Variable or Meter 5
-                Cogeneration:Gas,        !- Variable or Meter 6 Name
+                Cogeneration:NaturalGas,        !- Variable or Meter 6 Name
                 ValueWhenMaximumOrMinimum;            !- Aggregation Type for Variable or Meter 6
 
             Output:Table:Monthly,

data/lib/openstudio/workflow/util/measure.rb

@@ -76,6 +76,11 @@ module OpenStudio
 
             measure_dir_name = step.measureDirName
 
+            pn = Pathname.new(measure_dir_name)
+            if pn.absolute?
+              logger.warn "measure_dir_name should not be a full path. It should be a relative path to the measure directory or the name of the measure directory containing the measure.rb file."
+            end
+
             measure_dir = workflow_json.findMeasure(measure_dir_name)
             fail "Cannot find #{measure_dir_name}" if measure_dir.empty?
             measure_dir = measure_dir.get

data/lib/openstudio/workflow/version.rb

@@ -37,6 +37,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '2.0.1' # Suffixes must have periods (not dashes)
+    VERSION = '2.1.0' # Suffixes must have periods (not dashes)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -124,33 +124,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement