openstudio-workflow 2.0.0.pre1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42b6a8aa0ff9fe8589c86c4861161d90a0b346c716871f134722e0c2a660d46
-  data.tar.gz: c11ab23043dbc0b42db813661e9658efa942a27ac87e20cabd7947b5f3aa757c
+  metadata.gz: 8d01f7cb6363d0859380d1052b968b81abcce6d547374045ea311e51118f2493
+  data.tar.gz: e3cde5096a65771a86c4bfb04d190704c2b9a034be3cbad8f5e664d693126a52
 SHA512:
-  metadata.gz: d1ce7d5b9c49af0b765bd3ab0287eb8598f2f126ae778d32bd4d6425aa2d89ed7b8b7a7e3fa0e7a47fe3c7188b66698ffb00318a40ceddb0dff032991b7ebcd0
-  data.tar.gz: 9ea3be0074c46862e80e01931e2f89ec8a7443862493d021da3c0a735c00598e24d79f965fc052086aa859435a38ec4088b99b5b509ddde7e87c001c6f2c8bba
+  metadata.gz: aca10e06acecf1f2b0f9875c44b165da9a5165b514fcf76802d16bb86c321338a57bd359f481df6ce8c451ab1a313fd71dc55433be09e063e4e600d9f7753d66
+  data.tar.gz: 202cafbb5c9e04d45e840bdb0938533312a57b4e0c50b3be0ee0d563c16c54d478de54eec72f5eedea270a48ba7d4ce54593191fc9b2ca3e89230c001f53e96f

data/CHANGELOG.md

@@ -1,15 +1,33 @@
 OpenStudio::Workflow Change Log
 ==================================
 
-Version 2.0.0 (Unreleased)
---------------------------
+Version 2.2.0
+-------------
+* Minimum Ruby version upgraded to 2.7.0
+* Bundler bumped to ~> 2.2
+* Updated copyright
+
+Version 2.1.1
+-------------
+* Add support for URBANopt Workflow
+* Update reporting measure in tests
+
+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
+-------------
+* Bug fix for idf.addObjects(object) to idf.addObject(object)
+
+Version 2.0.0
+-------------
 * Support Ruby > 2.5
 * Support OpenStudio 3.x
 
 Version 1.3.5
 -------------
-
 * Allow reporting to fail gracefully so HTML reports are returned Fixed [this](https://github.com/NREL/OpenStudio/issues/864).
 * Allow EMS:OutputVariable in reporting measure
 * Fixes [#93](https://github.com/NREL/OpenStudio-workflow-gem/issues/93) - Pass Model to the arguments method of ReportingMeasure

data/README.md

@@ -9,7 +9,7 @@ This branch is the development branch for the OpenStudio workflow gem.
 
 The OpenStudio Workflow Gem has the following dependencies:
 
-* Ruby 2.5.5
+* Ruby 2.7.2
 * OpenStudio 3.x
 
 [OpenStudio](https://www.openstudio.net/) needs to be installed and in your path.  On Mac/Linux it is easiest to add the following to your .bash_profile or /etc/profile.d/<file>.sh to ensure OpenStudio loads. Assuming OpenStudio 3.0.0 installed:

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.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/adapters/input/local.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/adapters/output/local.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/adapters/output/socket.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/adapters/output/web.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/adapters/output_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

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/jobs/run_energyplus.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/jobs/run_ep_measures.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/jobs/run_initialization.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/jobs/run_os_measures.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/jobs/run_postprocess.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/jobs/run_preprocess.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/jobs/run_reporting_measures.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -63,8 +63,22 @@ class RunReportingMeasures < OpenStudio::Workflow::Job
     # Ensure output_attributes is initialized in the registry
     @registry.register(:output_attributes) { {} } unless @registry[:output_attributes]
 
+    # get OSA[:urbanopt]  #BLB should prob be sent in as cli arg and used in options but for now just do this
+    @registry.register(:urbanopt) { false }
+    if @registry[:osw_path]
+      workflow = nil
+      if File.exist? @registry[:osw_path]
+        workflow = ::JSON.parse(File.read(@registry[:osw_path]), symbolize_names: true)
+        if !workflow.nil?
+          if !workflow[:urbanopt].nil?
+            @registry.register(:urbanopt) { workflow[:urbanopt] }
+          end
+        end
+      end
+    end
+
     # Load simulation files as required
-    unless @registry[:runner].halted
+    unless @registry[:runner].halted || @registry[:urbanopt]
       if @registry[:model].nil?
         osm_path = File.absolute_path(File.join(@registry[:run_dir], 'in.osm'))
         @logger.debug "Attempting to load #{osm_path}"

data/lib/openstudio/workflow/jobs/run_translation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/multi_delegator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/run.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/time_logger.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/util.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -227,7 +227,7 @@ module OpenStudio
             # just add this, we don't allow this type in add_energyplus_output_request
             logger.info 'Adding SQL Output to IDF'
             object = OpenStudio::IdfObject.load('Output:SQLite,SimpleAndTabular;').get
-            idf.addObjects(object)
+            idf.addObject(object)
           end
 
           # merge in monthly reports
@@ -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/io.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

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

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -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/util/model.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -37,6 +37,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '2.0.0.pre1' # Suffixes must have periods (not dashes)
+    VERSION = '2.2.0'.freeze # Suffixes must have periods (not dashes)
   end
 end

data/lib/openstudio/workflow_json.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/workflow_runner.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.2.0
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,176 +9,190 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 0.8.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 0.8.21
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.2.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.2.12
 - !ruby/object:Gem::Dependency
-  name: ci_reporter_rspec
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.19.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: 4.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: public_suffix
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.80.1
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.80.1
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -246,15 +260,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: OpenStudio Workflow Manager