diff --git a/measures/advanced_import_gbxml/README.md b/measures/gbxml_import/README.md similarity index 51% rename from measures/advanced_import_gbxml/README.md rename to measures/gbxml_import/README.md index 8066aa1..3b278a4 100644 --- a/measures/advanced_import_gbxml/README.md +++ b/measures/gbxml_import/README.md @@ -2,13 +2,13 @@ ###### (Automatically generated documentation) -# Advanced Import Gbxml +# GbxmlImport ## Description -This measure will bring in additional gbXML data beyond what comes in with the basic OpenStudio gbXML import. +Import a gbXML file ## Modeler Description -This measure expects GbXMLReverseTranslator to already have been run on the model. This measure parses the XML and translates additional gbXML objects to OSM. +Import a gbXML file ## Measure Type ModelMeasure @@ -27,6 +27,14 @@ Filename or full path to gbXML file. **Required:** true, **Model Dependent:** false +### Rename Building and Thermal Zone objects with gbXML Names? + +**Name:** rename_objects, +**Type:** Boolean, +**Units:** , +**Required:** false, +**Model Dependent:** false + diff --git a/measures/advanced_import_gbxml/README.md.erb b/measures/gbxml_import/README.md.erb similarity index 100% rename from measures/advanced_import_gbxml/README.md.erb rename to measures/gbxml_import/README.md.erb diff --git a/measures/import_gbxml/measure.rb b/measures/gbxml_import/measure.rb similarity index 98% rename from measures/import_gbxml/measure.rb rename to measures/gbxml_import/measure.rb index 0a68e27..c4d74c8 100644 --- a/measures/import_gbxml/measure.rb +++ b/measures/gbxml_import/measure.rb @@ -2,11 +2,11 @@ # http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/ # start the measure -class ImportGbxml < OpenStudio::Measure::ModelMeasure +class GbxmlImport < OpenStudio::Measure::ModelMeasure # human readable name def name - return "ImportGbxml" + return "Gbxml Import" end # human readable description @@ -184,4 +184,4 @@ def run(model, runner, user_arguments) end # register the measure to be used by the application -ImportGbxml.new.registerWithApplication +GbxmlImport.new.registerWithApplication diff --git a/measures/import_gbxml/measure.xml b/measures/gbxml_import/measure.xml similarity index 67% rename from measures/import_gbxml/measure.xml rename to measures/gbxml_import/measure.xml index 5739317..52f870a 100644 --- a/measures/import_gbxml/measure.xml +++ b/measures/gbxml_import/measure.xml @@ -1,13 +1,13 @@ - 3.0 - import_gbxml + 3.1 + gbxml_import a335136f-bad3-451d-a585-9ea31249e38b - ad35b7c9-cf23-404d-9fcc-96bd8f87c5f6 - 20220420T154900Z + 5752fd87-ac2a-4563-980a-1f6109864a0f + 2024-06-28T17:41:21Z DA3B952E - ImportGbxml - ImportGbxml + GbxmlImport + GbxmlImport Import a gbXML file Import a gbXML file @@ -19,6 +19,24 @@ true false + + rename_objects + Rename Building and Thermal Zone objects with gbXML Names? + Boolean + false + false + true + + + true + true + + + false + false + + + @@ -69,16 +87,16 @@ - import_gbxml_test.rb - rb - test - 3F13F2CF + README.md + md + readme + 6B4A52CA - gbXMLStandard Test Model 2016.xml - xml - test - D39FE3DA + README.md.erb + erb + readmeerb + 703C9964 @@ -89,7 +107,19 @@ measure.rb rb script - CCBBDF6D + 67A74842 + + + gbXMLStandard Test Model 2016.xml + xml + test + D39FE3DA + + + import_gbxml_test.rb + rb + test + 3F13F2CF diff --git a/measures/advanced_import_gbxml/tests/gbXMLStandard Test Model 2016.xml b/measures/gbxml_import/tests/gbXMLStandard Test Model 2016.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/gbXMLStandard Test Model 2016.xml rename to measures/gbxml_import/tests/gbXMLStandard Test Model 2016.xml diff --git a/measures/import_gbxml/tests/import_gbxml_test.rb b/measures/gbxml_import/tests/gbxml_import_test.rb similarity index 97% rename from measures/import_gbxml/tests/import_gbxml_test.rb rename to measures/gbxml_import/tests/gbxml_import_test.rb index bf8d230..a43dc61 100644 --- a/measures/import_gbxml/tests/import_gbxml_test.rb +++ b/measures/gbxml_import/tests/gbxml_import_test.rb @@ -4,7 +4,7 @@ require_relative '../measure.rb' require 'fileutils' -class ImportGbxml_Test < MiniTest::Unit::TestCase +class GbxmlImport_Test < MiniTest::Unit::TestCase # def setup # end @@ -15,7 +15,7 @@ class ImportGbxml_Test < MiniTest::Unit::TestCase def test_import # create a test model model = OpenStudio::Model::Model.new - + # create an instance of the measure measure = ImportGbxml.new diff --git a/measures/gbxml_import_advanced/README.md b/measures/gbxml_import_advanced/README.md new file mode 100644 index 0000000..17458d5 --- /dev/null +++ b/measures/gbxml_import_advanced/README.md @@ -0,0 +1,26 @@ + + +###### (Automatically generated documentation) + +# + +## Description + + +## Modeler Description + + +## Measure Type +ModelMeasure + +## Taxonomy + + +## Arguments + + + + +This measure does not have any user arguments + + diff --git a/measures/gbxml_hvac_import/README.md.erb b/measures/gbxml_import_advanced/README.md.erb similarity index 100% rename from measures/gbxml_hvac_import/README.md.erb rename to measures/gbxml_import_advanced/README.md.erb diff --git a/measures/advanced_import_gbxml/measure.rb b/measures/gbxml_import_advanced/measure.rb similarity index 99% rename from measures/advanced_import_gbxml/measure.rb rename to measures/gbxml_import_advanced/measure.rb index d53d97c..a5e2c40 100644 --- a/measures/advanced_import_gbxml/measure.rb +++ b/measures/gbxml_import_advanced/measure.rb @@ -10,11 +10,11 @@ Dir[File.dirname(__FILE__) + '/resources/*.rb'].each { |file| require file } # start the measure -class AdvancedImportGbxml < OpenStudio::Measure::ModelMeasure +class GbxmlImportAdvanced < OpenStudio::Measure::ModelMeasure # human readable name def name # Measure name should be the title case of the class name. - return 'Advanced Import Gbxml' + return 'Gbxml Import Advanced' end # human readable description @@ -421,4 +421,4 @@ def run(model, runner, user_arguments) end # register the measure to be used by the application -AdvancedImportGbxml.new.registerWithApplication \ No newline at end of file +GbxmlImportAdvanced.new.registerWithApplication \ No newline at end of file diff --git a/measures/advanced_import_gbxml/measure.xml b/measures/gbxml_import_advanced/measure.xml similarity index 87% rename from measures/advanced_import_gbxml/measure.xml rename to measures/gbxml_import_advanced/measure.xml index ace2d80..d74443e 100644 --- a/measures/advanced_import_gbxml/measure.xml +++ b/measures/gbxml_import_advanced/measure.xml @@ -1,10 +1,11 @@ - 3.0 + 3.1 + Failed to infer measure name from 'C:/Users/MSTEEN/Documents/GitHub/NREL/gbxml-to-openstudio/measures/gbxml_import_advanced/measure.rb' advanced_import_gbxml f82940f7-8046-4fd1-9dbb-df6411e86de2 - 5bd42b97-9eac-42b7-b84d-015ddcb0d0ae - 20220420T154858Z + 34245d90-7622-429e-880a-c632ecf98cdd + 2024-06-28T17:39:01Z D8922A73 AdvancedImportGbxml Advanced Import Gbxml @@ -49,10 +50,10 @@ - LICENSE.md + README.md md - license - CD7F5672 + readme + 0B68E96D README.md.erb @@ -61,22 +62,27 @@ 703C9964 - gbXMLStandard Test Model 2016.xml - xml - test - D39FE3DA + + OpenStudio + 2.6.0 + 2.6.0 + + measure.rb + rb + script + 070BF203 - README.md - md - readme - 60A34A33 + building_type_helper.rb + rb + resource + A8B4E116 - Analytical Systems 01.xml - xml - test - CE91D4F3 + os_lib_adv_import.rb + rb + resource + D2A0FD8D os_lib_lighting_and_equipment.rb @@ -85,63 +91,46 @@ E63C7739 - Test Villa Scenario 2_alt_a.xml - xml - test - 89516D7B - - - .gitkeep - gitkeep - doc - 00000000 + os_lib_schedules.rb + rb + resource + C79BB5BA - VentilationAndInfiltration.xml + 200_SpacesOneZE.xml xml test - A8185257 - - - os_lib_schedules.rb - rb - resource - BB445760 + C4359438 - advanced_import_gbxml_test.rb - rb + 25_SpacesOneZE.xml + xml test - F468277A + 44A2B39C - os_lib_adv_import.rb - rb - resource - 24E56A45 + AirSystemAllVariations.xml + xml + test + F50404FF - - OpenStudio - 2.6.0 - 2.6.0 - - measure.rb - rb - script - DD0E31F0 + Analytical Systems 01.xml + xml + test + CE91D4F3 - 200_SpacesOneZE.xml + Test Villa Scenario 2_alt_a.xml xml test - C4359438 + 89516D7B - 25_SpacesOneZE.xml + VentilationAndInfiltration.xml xml test - 44A2B39C + A8185257 adhoc_test.rb @@ -150,16 +139,22 @@ 33699363 - AirSystemAllVariations.xml + advanced_import_gbxml_test.rb + rb + test + BC66C7B5 + + + gbXMLStandard Test Model 2016.xml xml test - F50404FF + D39FE3DA - building_type_helper.rb - rb - resource - A8B4E116 + gbxml - on -peoplehalftime.xml + xml + test + 7AB4E205 diff --git a/measures/advanced_import_gbxml/resources/building_type_helper.rb b/measures/gbxml_import_advanced/resources/building_type_helper.rb similarity index 100% rename from measures/advanced_import_gbxml/resources/building_type_helper.rb rename to measures/gbxml_import_advanced/resources/building_type_helper.rb diff --git a/measures/advanced_import_gbxml/resources/os_lib_adv_import.rb b/measures/gbxml_import_advanced/resources/os_lib_adv_import.rb similarity index 100% rename from measures/advanced_import_gbxml/resources/os_lib_adv_import.rb rename to measures/gbxml_import_advanced/resources/os_lib_adv_import.rb diff --git a/measures/advanced_import_gbxml/resources/os_lib_lighting_and_equipment.rb b/measures/gbxml_import_advanced/resources/os_lib_lighting_and_equipment.rb similarity index 100% rename from measures/advanced_import_gbxml/resources/os_lib_lighting_and_equipment.rb rename to measures/gbxml_import_advanced/resources/os_lib_lighting_and_equipment.rb diff --git a/measures/advanced_import_gbxml/resources/os_lib_schedules.rb b/measures/gbxml_import_advanced/resources/os_lib_schedules.rb similarity index 100% rename from measures/advanced_import_gbxml/resources/os_lib_schedules.rb rename to measures/gbxml_import_advanced/resources/os_lib_schedules.rb diff --git a/measures/advanced_import_gbxml/tests/200_SpacesOneZE.xml b/measures/gbxml_import_advanced/tests/200_SpacesOneZE.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/200_SpacesOneZE.xml rename to measures/gbxml_import_advanced/tests/200_SpacesOneZE.xml diff --git a/measures/advanced_import_gbxml/tests/25_SpacesOneZE.xml b/measures/gbxml_import_advanced/tests/25_SpacesOneZE.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/25_SpacesOneZE.xml rename to measures/gbxml_import_advanced/tests/25_SpacesOneZE.xml diff --git a/measures/advanced_import_gbxml/tests/AirSystemAllVariations.xml b/measures/gbxml_import_advanced/tests/AirSystemAllVariations.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/AirSystemAllVariations.xml rename to measures/gbxml_import_advanced/tests/AirSystemAllVariations.xml diff --git a/measures/advanced_import_gbxml/tests/Analytical Systems 01.xml b/measures/gbxml_import_advanced/tests/Analytical Systems 01.xml old mode 100755 new mode 100644 similarity index 100% rename from measures/advanced_import_gbxml/tests/Analytical Systems 01.xml rename to measures/gbxml_import_advanced/tests/Analytical Systems 01.xml diff --git a/measures/advanced_import_gbxml/tests/Test Villa Scenario 2_alt_a.xml b/measures/gbxml_import_advanced/tests/Test Villa Scenario 2_alt_a.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/Test Villa Scenario 2_alt_a.xml rename to measures/gbxml_import_advanced/tests/Test Villa Scenario 2_alt_a.xml diff --git a/measures/advanced_import_gbxml/tests/VentilationAndInfiltration.xml b/measures/gbxml_import_advanced/tests/VentilationAndInfiltration.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/VentilationAndInfiltration.xml rename to measures/gbxml_import_advanced/tests/VentilationAndInfiltration.xml diff --git a/measures/advanced_import_gbxml/tests/adhoc_test.rb b/measures/gbxml_import_advanced/tests/adhoc_test.rb similarity index 100% rename from measures/advanced_import_gbxml/tests/adhoc_test.rb rename to measures/gbxml_import_advanced/tests/adhoc_test.rb diff --git a/measures/import_gbxml/tests/gbXMLStandard Test Model 2016.xml b/measures/gbxml_import_advanced/tests/gbXMLStandard Test Model 2016.xml similarity index 100% rename from measures/import_gbxml/tests/gbXMLStandard Test Model 2016.xml rename to measures/gbxml_import_advanced/tests/gbXMLStandard Test Model 2016.xml diff --git a/measures/advanced_import_gbxml/tests/gbxml - on -peoplehalftime.xml b/measures/gbxml_import_advanced/tests/gbxml - on -peoplehalftime.xml similarity index 100% rename from measures/advanced_import_gbxml/tests/gbxml - on -peoplehalftime.xml rename to measures/gbxml_import_advanced/tests/gbxml - on -peoplehalftime.xml diff --git a/measures/advanced_import_gbxml/tests/advanced_import_gbxml_test.rb b/measures/gbxml_import_advanced/tests/gbxml_import_advanced_test.rb similarity index 99% rename from measures/advanced_import_gbxml/tests/advanced_import_gbxml_test.rb rename to measures/gbxml_import_advanced/tests/gbxml_import_advanced_test.rb index 366fcda..dd2c74e 100644 --- a/measures/advanced_import_gbxml/tests/advanced_import_gbxml_test.rb +++ b/measures/gbxml_import_advanced/tests/gbxml_import_advanced_test.rb @@ -8,7 +8,7 @@ require_relative '../resources/os_lib_adv_import' require 'fileutils' -class AdvancedImportGbxml_Test < Minitest::Test +class GbxmlImportAdvanced_Test < Minitest::Test def test_generic_gbxml @@ -345,7 +345,7 @@ def test_annual_schedule # If the argument has a default that you want to use, you don't need it in the hash args_hash = {} args_hash['gbxml_file_name'] = path.to_s - + # populate argument with specified hash value if specified arguments.each do |arg| temp_arg_var = arg.clone @@ -375,7 +375,7 @@ def test_annual_schedule puts sch.defaultDaySchedule puts sch.summerDesignDaySchedule puts sch.winterDesignDaySchedule - sch.scheduleRules.each { |rule| puts rule} + sch.scheduleRules.each { |rule| puts rule} end def data_fields_equal?(obj1, obj2) diff --git a/measures/gbxml_hvac_import/README.md b/measures/gbxml_import_hvac/README.md similarity index 96% rename from measures/gbxml_hvac_import/README.md rename to measures/gbxml_import_hvac/README.md index 6d29d9c..919bd62 100644 --- a/measures/gbxml_hvac_import/README.md +++ b/measures/gbxml_import_hvac/README.md @@ -2,7 +2,7 @@ ###### (Automatically generated documentation) -# GBXML HVAC Import +# Gbxml Import Hvac ## Description This measure will bring in additional gbXML data beyond what comes in with the basic OpenStudio gbXML import. diff --git a/measures/gbxml_import_hvac/README.md.erb b/measures/gbxml_import_hvac/README.md.erb new file mode 100644 index 0000000..4deb9ae --- /dev/null +++ b/measures/gbxml_import_hvac/README.md.erb @@ -0,0 +1,42 @@ +<%#= README.md.erb is used to auto-generate README.md. %> +<%#= To manually maintain README.md throw away README.md.erb and manually edit README.md %> +###### (Automatically generated documentation) + +# <%= name %> + +## Description +<%= description %> + +## Modeler Description +<%= modelerDescription %> + +## Measure Type +<%= measureType %> + +## Taxonomy +<%= taxonomy %> + +## Arguments + +<% arguments.each do |argument| %> +### <%= argument[:display_name] %> +<%= argument[:description] %> +**Name:** <%= argument[:name] %>, +**Type:** <%= argument[:type] %>, +**Units:** <%= argument[:units] %>, +**Required:** <%= argument[:required] %>, +**Model Dependent:** <%= argument[:model_dependent] %> +<% end %> + +<% if arguments.size == 0 %> +<%= "This measure does not have any user arguments" %> +<% end %> + +<% if outputs.size > 0 %> +## Outputs +<% output_names = [] %> +<% outputs.each do |output| %> +<% output_names << output[:display_name] %> +<% end %> +<%= output_names.join(", ") %> +<% end %> \ No newline at end of file diff --git a/measures/gbxml_hvac_import/gbxml_hvac_import.rb b/measures/gbxml_import_hvac/gbxml_import_hvac.rb similarity index 100% rename from measures/gbxml_hvac_import/gbxml_hvac_import.rb rename to measures/gbxml_import_hvac/gbxml_import_hvac.rb diff --git a/measures/gbxml_hvac_import/measure.rb b/measures/gbxml_import_hvac/measure.rb similarity index 93% rename from measures/gbxml_hvac_import/measure.rb rename to measures/gbxml_import_hvac/measure.rb index 7831ebc..d410e3d 100644 --- a/measures/gbxml_hvac_import/measure.rb +++ b/measures/gbxml_import_hvac/measure.rb @@ -1,11 +1,11 @@ -require_relative 'gbxml_hvac_import' +require_relative 'gbxml_import_hvac' # start the measure -class GBXMLHVACImport < OpenStudio::Measure::ModelMeasure +class GbxmlImportHvac < OpenStudio::Measure::ModelMeasure # human readable name def name # Measure name should be the title case of the class name. - return 'GBXML HVAC Import' + return 'Gbxml Import Hvac' end # human readable description @@ -77,4 +77,4 @@ def run(model, runner, user_arguments) end # register the measure to be used by the application -GBXMLHVACImport.new.registerWithApplication +GbxmlImportHvac.new.registerWithApplication diff --git a/measures/gbxml_hvac_import/measure.xml b/measures/gbxml_import_hvac/measure.xml similarity index 86% rename from measures/gbxml_hvac_import/measure.xml rename to measures/gbxml_import_hvac/measure.xml index 856e673..77f2867 100644 --- a/measures/gbxml_hvac_import/measure.xml +++ b/measures/gbxml_import_hvac/measure.xml @@ -1,13 +1,13 @@ - 3.0 - gbxmlhvac_import + 3.1 + gbxml_import_hvac f82940f7-8046-4fd1-9dbb-df6411e86de6 - 08110e47-8590-4bb1-97d2-14b4d6e7fa81 - 20220420T154859Z + bc5cfda7-ac7f-4dc8-a41d-652bc54dc5df + 2024-06-28T17:52:43Z D8922A73 - GBXMLHVACImport - GBXML HVAC Import + GbxmlImportHvac + Gbxml Import Hvac This measure will bring in additional gbXML data beyond what comes in with the basic OpenStudio gbXML import. This measure expects GbXMLReverseTranslator to already have been run on the model. This measure parses the XML and translates additional gbXML objects to OSM. @@ -49,10 +49,10 @@ - LICENSE.md + README.md md - license - CD7F5672 + readme + 4F98DE88 README.md.erb @@ -60,36 +60,6 @@ readmeerb 703C9964 - - .gitkeep - gitkeep - doc - 00000000 - - - README.md - md - readme - ACE620EC - - - baseboard_convective.rb - rb - resource - 1579ABA2 - - - baseboard_radiant.rb - rb - resource - A089C7F9 - - - gbxml_parser.rb - rb - resource - C6D36F88 - OpenStudio @@ -99,7 +69,7 @@ measure.rb rb script - 8D023D4F + 4577C3E6 acb.rb @@ -111,7 +81,19 @@ air_system.rb rb resource - 4346EE73 + F3849F7C + + + baseboard_convective.rb + rb + resource + 1579ABA2 + + + baseboard_radiant.rb + rb + resource + A089C7F9 cav_box.rb @@ -129,19 +111,31 @@ condenser_loop.rb rb resource - 0FC19EC5 + 67920E98 + + + curves.rb + rb + resource + AF42E765 fpfc.rb rb resource - 8ECD94E8 + F17ED3E5 + + + gbxml_parser.rb + rb + resource + C6D36F88 helpers.rb rb resource - 4AC6AFF6 + 13A8CCFF hot_water_loop.rb @@ -177,13 +171,13 @@ ptac.rb rb resource - F5562E75 + AAF57EA1 pthp.rb rb resource - 7BF69F03 + A2F61C9D radiant_panel.rb @@ -207,7 +201,7 @@ unit_ventilator.rb rb resource - F8DFB76C + 90A97E01 vav_box.rb @@ -219,19 +213,19 @@ vrf_condenser.rb rb resource - 690A32F4 + 57F80A09 vrf_fan_coil_unit.rb rb resource - 6138AED0 + 41027204 wshp.rb rb resource - 3CB2975C + D1E97460 zone.rb diff --git a/measures/gbxml_hvac_import/resources/acb.rb b/measures/gbxml_import_hvac/resources/acb.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/acb.rb rename to measures/gbxml_import_hvac/resources/acb.rb diff --git a/measures/gbxml_hvac_import/resources/air_system.rb b/measures/gbxml_import_hvac/resources/air_system.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/air_system.rb rename to measures/gbxml_import_hvac/resources/air_system.rb diff --git a/measures/gbxml_hvac_import/resources/baseboard_convective.rb b/measures/gbxml_import_hvac/resources/baseboard_convective.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/baseboard_convective.rb rename to measures/gbxml_import_hvac/resources/baseboard_convective.rb diff --git a/measures/gbxml_hvac_import/resources/baseboard_radiant.rb b/measures/gbxml_import_hvac/resources/baseboard_radiant.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/baseboard_radiant.rb rename to measures/gbxml_import_hvac/resources/baseboard_radiant.rb diff --git a/measures/gbxml_hvac_import/resources/cav_box.rb b/measures/gbxml_import_hvac/resources/cav_box.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/cav_box.rb rename to measures/gbxml_import_hvac/resources/cav_box.rb diff --git a/measures/gbxml_hvac_import/resources/chilled_water_loop.rb b/measures/gbxml_import_hvac/resources/chilled_water_loop.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/chilled_water_loop.rb rename to measures/gbxml_import_hvac/resources/chilled_water_loop.rb diff --git a/measures/gbxml_hvac_import/resources/condenser_loop.rb b/measures/gbxml_import_hvac/resources/condenser_loop.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/condenser_loop.rb rename to measures/gbxml_import_hvac/resources/condenser_loop.rb diff --git a/measures/gbxml_hvac_import/resources/curves.rb b/measures/gbxml_import_hvac/resources/curves.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/curves.rb rename to measures/gbxml_import_hvac/resources/curves.rb diff --git a/measures/gbxml_hvac_import/resources/fpfc.rb b/measures/gbxml_import_hvac/resources/fpfc.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/fpfc.rb rename to measures/gbxml_import_hvac/resources/fpfc.rb diff --git a/measures/gbxml_hvac_import/resources/gbxml_parser.rb b/measures/gbxml_import_hvac/resources/gbxml_parser.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/gbxml_parser.rb rename to measures/gbxml_import_hvac/resources/gbxml_parser.rb diff --git a/measures/gbxml_hvac_import/resources/helpers.rb b/measures/gbxml_import_hvac/resources/helpers.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/helpers.rb rename to measures/gbxml_import_hvac/resources/helpers.rb diff --git a/measures/gbxml_hvac_import/resources/hot_water_loop.rb b/measures/gbxml_import_hvac/resources/hot_water_loop.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/hot_water_loop.rb rename to measures/gbxml_import_hvac/resources/hot_water_loop.rb diff --git a/measures/gbxml_hvac_import/resources/hvac_object.rb b/measures/gbxml_import_hvac/resources/hvac_object.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/hvac_object.rb rename to measures/gbxml_import_hvac/resources/hvac_object.rb diff --git a/measures/gbxml_hvac_import/resources/model_manager.rb b/measures/gbxml_import_hvac/resources/model_manager.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/model_manager.rb rename to measures/gbxml_import_hvac/resources/model_manager.rb diff --git a/measures/gbxml_hvac_import/resources/pcb.rb b/measures/gbxml_import_hvac/resources/pcb.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/pcb.rb rename to measures/gbxml_import_hvac/resources/pcb.rb diff --git a/measures/gbxml_hvac_import/resources/pfpb.rb b/measures/gbxml_import_hvac/resources/pfpb.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/pfpb.rb rename to measures/gbxml_import_hvac/resources/pfpb.rb diff --git a/measures/gbxml_hvac_import/resources/ptac.rb b/measures/gbxml_import_hvac/resources/ptac.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/ptac.rb rename to measures/gbxml_import_hvac/resources/ptac.rb diff --git a/measures/gbxml_hvac_import/resources/pthp.rb b/measures/gbxml_import_hvac/resources/pthp.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/pthp.rb rename to measures/gbxml_import_hvac/resources/pthp.rb diff --git a/measures/gbxml_hvac_import/resources/radiant_panel.rb b/measures/gbxml_import_hvac/resources/radiant_panel.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/radiant_panel.rb rename to measures/gbxml_import_hvac/resources/radiant_panel.rb diff --git a/measures/gbxml_hvac_import/resources/sfpb.rb b/measures/gbxml_import_hvac/resources/sfpb.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/sfpb.rb rename to measures/gbxml_import_hvac/resources/sfpb.rb diff --git a/measures/gbxml_hvac_import/resources/unit_heater.rb b/measures/gbxml_import_hvac/resources/unit_heater.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/unit_heater.rb rename to measures/gbxml_import_hvac/resources/unit_heater.rb diff --git a/measures/gbxml_hvac_import/resources/unit_ventilator.rb b/measures/gbxml_import_hvac/resources/unit_ventilator.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/unit_ventilator.rb rename to measures/gbxml_import_hvac/resources/unit_ventilator.rb diff --git a/measures/gbxml_hvac_import/resources/vav_box.rb b/measures/gbxml_import_hvac/resources/vav_box.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/vav_box.rb rename to measures/gbxml_import_hvac/resources/vav_box.rb diff --git a/measures/gbxml_hvac_import/resources/vrf_condenser.rb b/measures/gbxml_import_hvac/resources/vrf_condenser.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/vrf_condenser.rb rename to measures/gbxml_import_hvac/resources/vrf_condenser.rb diff --git a/measures/gbxml_hvac_import/resources/vrf_fan_coil_unit.rb b/measures/gbxml_import_hvac/resources/vrf_fan_coil_unit.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/vrf_fan_coil_unit.rb rename to measures/gbxml_import_hvac/resources/vrf_fan_coil_unit.rb diff --git a/measures/gbxml_hvac_import/resources/wshp.rb b/measures/gbxml_import_hvac/resources/wshp.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/wshp.rb rename to measures/gbxml_import_hvac/resources/wshp.rb diff --git a/measures/gbxml_hvac_import/resources/zone.rb b/measures/gbxml_import_hvac/resources/zone.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/zone.rb rename to measures/gbxml_import_hvac/resources/zone.rb diff --git a/measures/gbxml_hvac_import/resources/zone_hvac_equipment.rb b/measures/gbxml_import_hvac/resources/zone_hvac_equipment.rb similarity index 100% rename from measures/gbxml_hvac_import/resources/zone_hvac_equipment.rb rename to measures/gbxml_import_hvac/resources/zone_hvac_equipment.rb diff --git a/workflows/Annual Building Energy Simulation.osw b/workflows/Annual Building Energy Simulation.osw index ef8097d..350fc82 100644 --- a/workflows/Annual Building Energy Simulation.osw +++ b/workflows/Annual Building Energy Simulation.osw @@ -19,21 +19,21 @@ } }, { - "measure_dir_name": "import_gbxml", + "measure_dir_name": "gbxml_import", "name": "ImportGbxml", "arguments": { "gbxml_file_name": "analysis.xml" } }, { - "measure_dir_name": "advanced_import_gbxml", + "measure_dir_name": "gbxml_import_advanced", "name": "Advanced Import Gbxml", "arguments": { "gbxml_file_name": "analysis.xml" } }, { - "measure_dir_name": "gbxml_hvac_import", + "measure_dir_name": "gbxml_import_import", "name": "GBXML HVAC Import", "arguments": { "gbxml_file_name": "analysis.xml" diff --git a/workflows/HVAC Systems Loads and Sizing.osw b/workflows/HVAC Systems Loads and Sizing.osw index d624705..63eda3e 100644 --- a/workflows/HVAC Systems Loads and Sizing.osw +++ b/workflows/HVAC Systems Loads and Sizing.osw @@ -19,21 +19,21 @@ } }, { - "measure_dir_name": "import_gbxml", + "measure_dir_name": "gbxml_import", "name": "ImportGbxml", "arguments": { "gbxml_file_name": "analysis.xml" } }, { - "measure_dir_name": "advanced_import_gbxml", + "measure_dir_name": "gbxml_import_advanced", "name": "Advanced Import Gbxml", "arguments": { "gbxml_file_name": "analysis.xml" } }, { - "measure_dir_name": "gbxml_hvac_import", + "measure_dir_name": "gbxml_import_hvac", "name": "GBXML HVAC Import", "arguments": { "gbxml_file_name": "analysis.xml" diff --git a/workflows/RegressionTesting.osw b/workflows/RegressionTesting.osw index 9412e0e..b7124c2 100644 --- a/workflows/RegressionTesting.osw +++ b/workflows/RegressionTesting.osw @@ -19,14 +19,14 @@ } }, { - "measure_dir_name": "import_gbxml", + "measure_dir_name": "gbxml_import", "name": "ImportGbxml", "arguments": { "gbxml_file_name": "GBXML_INPUT.xml" } }, { - "measure_dir_name": "advanced_import_gbxml", + "measure_dir_name": "gbxml_import_advanced", "name": "Advanced Import Gbxml", "arguments": { "__SKIP__": false, @@ -34,7 +34,7 @@ } }, { - "measure_dir_name": "gbxml_hvac_import", + "measure_dir_name": "gbxml_import_hvac", "name": "GBXML HVAC Import", "arguments": { "__SKIP__": false,