openstudio-workflow 2.0.1 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/Rakefile +11 -0
  4. data/lib/openstudio/workflow/jobs/resources/monthly_report.idf +15 -13
  5. data/lib/openstudio/workflow/util/energyplus.rb +15 -15
  6. data/lib/openstudio/workflow/util/measure.rb +5 -0
  7. data/lib/openstudio/workflow/version.rb +1 -1
  8. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c49db03b4f7bf7c837df2f615cc5a11d3fa0dfe5957d6a8a3d750734488e332c
4
- data.tar.gz: f780eee7177544827c84399e6f7cfce97fbb75bad5cd661c82bab11f54a1fafa
3
+ metadata.gz: c672be50cec3b97e0768c9b4b935283c281a42a8668d172777d77fc11f7bb636
4
+ data.tar.gz: 110cd910db5fd25e70c641dbbe905ee18b065dcfdf0447c50847867a5bd8a9db
5
5
  SHA512:
6
- metadata.gz: 9c8cecbdb8373f2a68ab8e331bc43257b1e3f9b26d01752e15293b8a4f6248aefb493bbdce053416a303a9922923904b44fa1b9c19256355de132a8b4dd595e9
7
- data.tar.gz: c58bf01dcd1606e568846320b4d7d03a097a628d200761f73e4f0c1480a77d317597e2facd10c8c7555f379c07b6be0259e02f2a18fc4b3552069d7d189d916e
6
+ metadata.gz: 37cef44df01e125a9c6e0cb496c3d68accdca96dc97106d23fac41b8e63551efdc2b9deb57cb9ffa78a9ba246bf1e0837b1a897bbf08102d95d2329c078638fa
7
+ data.tar.gz: 31cd4fc83927dbef85d38ff169578888e23b928f0ab54039ac1b4cf04e2d8058849a23afa91b76443080ad98cf80c9675007a1ccb627cc69110d0e598fca3fc1
data/CHANGELOG.md CHANGED
@@ -1,6 +1,11 @@
1
1
  OpenStudio::Workflow Change Log
2
2
  ==================================
3
3
 
4
+ Version 2.1.0
5
+ -------------
6
+ * Support for EnergyPlus 9.4. This version will not work with prior versions of EnergyPlus.
7
+ * Add warning when paths are not relative
8
+
4
9
  Version 2.0.1
5
10
  -------------
6
11
 
data/Rakefile CHANGED
@@ -36,3 +36,14 @@ task :test_zip do
36
36
  puts "Trying to extract #{f}"
37
37
  OpenStudio::Workflow.extract_archive(f, 'junk_out', true)
38
38
  end
39
+
40
+ desc 'Transition IDF Files'
41
+ task :transition_idf do
42
+ lst_path = File.join(Dir.pwd, 'IdfFilesToTransition.lst')
43
+ File.open(lst_path, 'w') do |file|
44
+ Dir.glob('**/*.idf').each do |idf|
45
+ file.puts(File.join(Dir.pwd, idf))
46
+ end
47
+ end
48
+ puts "Use the IDFVersionUpdater and point it to #{lst_path}"
49
+ end
data/lib/openstudio/workflow/jobs/resources/monthly_report.idf CHANGED
@@ -1,3 +1,5 @@
1
+ Version,9.4;
2
+
1
3
  Output:Table:Monthly,
2
4
  Building Energy Performance - Electricity, !- Name
3
5
  2, !- Digits After Decimal
@@ -33,17 +35,17 @@ Output:Table:Monthly,
33
35
  Output:Table:Monthly,
34
36
  Building Energy Performance - Natural Gas, !- Name
35
37
  2, !- Digits After Decimal
36
- InteriorEquipment:Gas, !- Variable or Meter 1 Name
38
+ InteriorEquipment:NaturalGas, !- Variable or Meter 1 Name
37
39
  SumOrAverage, !- Aggregation Type for Variable or Meter 1
38
- ExteriorEquipment:Gas, !- Variable or Meter 2 Name
40
+ ExteriorEquipment:NaturalGas, !- Variable or Meter 2 Name
39
41
  SumOrAverage, !- Aggregation Type for Variable or Meter 2
40
- Heating:Gas, !- Variable or Meter 3 Name
42
+ Heating:NaturalGas, !- Variable or Meter 3 Name
41
43
  SumOrAverage, !- Aggregation Type for Variable or Meter 3
42
- Cooling:Gas, !- Variable or Meter 4 Name
44
+ Cooling:NaturalGas, !- Variable or Meter 4 Name
43
45
  SumOrAverage, !- Aggregation Type for Variable or Meter 4
44
- WaterSystems:Gas, !- Variable or Meter 5 Name
46
+ WaterSystems:NaturalGas, !- Variable or Meter 5 Name
45
47
  SumOrAverage, !- Aggregation Type for Variable or Meter 5
46
- Cogeneration:Gas, !- Variable or Meter 6 Name
48
+ Cogeneration:NaturalGas, !- Variable or Meter 6 Name
47
49
  SumOrAverage; !- Aggregation Type for Variable or Meter 6
48
50
 
49
51
  Output:Table:Monthly,
@@ -141,19 +143,19 @@ Output:Table:Monthly,
141
143
  Output:Table:Monthly,
142
144
  Building Energy Performance - Natural Gas Peak Demand, !- Name
143
145
  2, !- Digits After Decimal
144
- Gas:Facility, !- Variable or Meter 1 Name
146
+ NaturalGas:Facility, !- Variable or Meter 1 Name
145
147
  Maximum, !- Aggregation Type for Variable or Meter 1
146
- InteriorEquipment:Gas, !- Variable or Meter 1 Name
148
+ InteriorEquipment:NaturalGas, !- Variable or Meter 1 Name
147
149
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 1
148
- ExteriorEquipment:Gas, !- Variable or Meter 2 Name
150
+ ExteriorEquipment:NaturalGas, !- Variable or Meter 2 Name
149
151
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 2
150
- Heating:Gas, !- Variable or Meter 3 Name
152
+ Heating:NaturalGas, !- Variable or Meter 3 Name
151
153
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 3
152
- Cooling:Gas, !- Variable or Meter 4 Name
154
+ Cooling:NaturalGas, !- Variable or Meter 4 Name
153
155
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 4
154
- WaterSystems:Gas, !- Variable or Meter 5 Name
156
+ WaterSystems:NaturalGas, !- Variable or Meter 5 Name
155
157
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 5
156
- Cogeneration:Gas, !- Variable or Meter 6 Name
158
+ Cogeneration:NaturalGas, !- Variable or Meter 6 Name
157
159
  ValueWhenMaximumOrMinimum; !- Aggregation Type for Variable or Meter 6
158
160
 
159
161
  Output:Table:Monthly,
data/lib/openstudio/workflow/util/energyplus.rb CHANGED
@@ -239,13 +239,13 @@ module OpenStudio
239
239
  end
240
240
 
241
241
  # These are needed for the calibration report
242
- new_objects << 'Output:Meter:MeterFileOnly,Gas:Facility,Daily;'
242
+ new_objects << 'Output:Meter:MeterFileOnly,NaturalGas:Facility,Daily;'
243
243
  new_objects << 'Output:Meter:MeterFileOnly,Electricity:Facility,Timestep;'
244
244
  new_objects << 'Output:Meter:MeterFileOnly,Electricity:Facility,Daily;'
245
245
 
246
246
  # Always add in the timestep facility meters
247
247
  new_objects << 'Output:Meter,Electricity:Facility,Timestep;'
248
- new_objects << 'Output:Meter,Gas:Facility,Timestep;'
248
+ new_objects << 'Output:Meter,NaturalGas:Facility,Timestep;'
249
249
  new_objects << 'Output:Meter,DistrictCooling:Facility,Timestep;'
250
250
  new_objects << 'Output:Meter,DistrictHeating:Facility,Timestep;'
251
251
 
@@ -384,17 +384,17 @@ module OpenStudio
384
384
  Output:Table:Monthly,
385
385
  Building Energy Performance - Natural Gas, !- Name
386
386
  2, !- Digits After Decimal
387
- InteriorEquipment:Gas, !- Variable or Meter 1 Name
387
+ InteriorEquipment:NaturalGas, !- Variable or Meter 1 Name
388
388
  SumOrAverage, !- Aggregation Type for Variable or Meter 1
389
- ExteriorEquipment:Gas, !- Variable or Meter 2 Name
389
+ ExteriorEquipment:NaturalGas, !- Variable or Meter 2 Name
390
390
  SumOrAverage, !- Aggregation Type for Variable or Meter 2
391
- Heating:Gas, !- Variable or Meter 3 Name
391
+ Heating:NaturalGas, !- Variable or Meter 3 Name
392
392
  SumOrAverage, !- Aggregation Type for Variable or Meter 3
393
- Cooling:Gas, !- Variable or Meter 4 Name
393
+ Cooling:NaturalGas, !- Variable or Meter 4 Name
394
394
  SumOrAverage, !- Aggregation Type for Variable or Meter 4
395
- WaterSystems:Gas, !- Variable or Meter 5 Name
395
+ WaterSystems:NaturalGas, !- Variable or Meter 5 Name
396
396
  SumOrAverage, !- Aggregation Type for Variable or Meter 5
397
- Cogeneration:Gas, !- Variable or Meter 6 Name
397
+ Cogeneration:NaturalGas, !- Variable or Meter 6 Name
398
398
  SumOrAverage; !- Aggregation Type for Variable or Meter 6
399
399
 
400
400
  Output:Table:Monthly,
@@ -492,19 +492,19 @@ module OpenStudio
492
492
  Output:Table:Monthly,
493
493
  Building Energy Performance - Natural Gas Peak Demand, !- Name
494
494
  2, !- Digits After Decimal
495
- Gas:Facility, !- Variable or Meter 1 Name
495
+ NaturalGas:Facility, !- Variable or Meter 1 Name
496
496
  Maximum, !- Aggregation Type for Variable or Meter 1
497
- InteriorEquipment:Gas, !- Variable or Meter 1 Name
497
+ InteriorEquipment:NaturalGas, !- Variable or Meter 1 Name
498
498
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 1
499
- ExteriorEquipment:Gas, !- Variable or Meter 2 Name
499
+ ExteriorEquipment:NaturalGas, !- Variable or Meter 2 Name
500
500
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 2
501
- Heating:Gas, !- Variable or Meter 3 Name
501
+ Heating:NaturalGas, !- Variable or Meter 3 Name
502
502
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 3
503
- Cooling:Gas, !- Variable or Meter 4 Name
503
+ Cooling:NaturalGas, !- Variable or Meter 4 Name
504
504
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 4
505
- WaterSystems:Gas, !- Variable or Meter 5 Name
505
+ WaterSystems:NaturalGas, !- Variable or Meter 5 Name
506
506
  ValueWhenMaximumOrMinimum, !- Aggregation Type for Variable or Meter 5
507
- Cogeneration:Gas, !- Variable or Meter 6 Name
507
+ Cogeneration:NaturalGas, !- Variable or Meter 6 Name
508
508
  ValueWhenMaximumOrMinimum; !- Aggregation Type for Variable or Meter 6
509
509
 
510
510
  Output:Table:Monthly,
data/lib/openstudio/workflow/util/measure.rb CHANGED
@@ -76,6 +76,11 @@ module OpenStudio
76
76
 
77
77
  measure_dir_name = step.measureDirName
78
78
 
79
+ pn = Pathname.new(measure_dir_name)
80
+ if pn.absolute?
81
+ 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."
82
+ end
83
+
79
84
  measure_dir = workflow_json.findMeasure(measure_dir_name)
80
85
  fail "Cannot find #{measure_dir_name}" if measure_dir.empty?
81
86
  measure_dir = measure_dir.get
data/lib/openstudio/workflow/version.rb CHANGED
@@ -37,6 +37,6 @@
37
37
 
38
38
  module OpenStudio
39
39
  module Workflow
40
- VERSION = '2.0.1' # Suffixes must have periods (not dashes)
40
+ VERSION = '2.1.0' # Suffixes must have periods (not dashes)
41
41
  end
42
42
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openstudio-workflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas Long
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-04-16 00:00:00.000000000 Z
12
+ date: 2020-09-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: builder
@@ -124,33 +124,33 @@ dependencies:
124
124
  - !ruby/object:Gem::Version
125
125
  version: 4.0.3
126
126
  - !ruby/object:Gem::Dependency
127
- name: rake
127
+ name: rainbow
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
130
  - - "~>"
131
131
  - !ruby/object:Gem::Version
132
- version: '12.3'
132
+ version: 3.0.0
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - "~>"
138
138
  - !ruby/object:Gem::Version
139
- version: '12.3'
139
+ version: 3.0.0
140
140
  - !ruby/object:Gem::Dependency
141
- name: rainbow
141
+ name: rake
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
144
  - - "~>"
145
145
  - !ruby/object:Gem::Version
146
- version: 3.0.0
146
+ version: '12.3'
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
151
  - - "~>"
152
152
  - !ruby/object:Gem::Version
153
- version: 3.0.0
153
+ version: '12.3'
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: rspec
156
156
  requirement: !ruby/object:Gem::Requirement