diff --git a/CHANGELOG.md b/CHANGELOG.md index 59fc1319..767e6c54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # OpenStudio Model Articulation Gems +## Version 0.9.0 +* Support for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.6.0) +* Fixed [#128]( https://github.com/NREL/openstudio-model-articulation-gem/pull/128 ), fix infiltration design day schedule inversion +* Fixed [#133]( https://github.com/NREL/openstudio-model-articulation-gem/pull/133 ), remove minimum_operation argument + ## Version 0.8.0 * Fixed [#120]( https://github.com/NREL/openstudio-model-articulation-gem/pull/120 ), add set_nist_infiltration_correlations * Fixed [#121]( https://github.com/NREL/openstudio-model-articulation-gem/pull/121 ), added better infiltration area logging diff --git a/README.md b/README.md index 1fcee0c7..74b19983 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ bundle exec rake openstudio:test_with_openstudio |OpenStudio Model Articulation Gem|OpenStudio|Ruby| |:--------------:|:----------:|:--------:| +| 0.9.0 | 3.7 | 2.7 | | 0.8.0 | 3.6 | 2.7 | | 0.7.0 | 3.5 | 2.7 | | 0.6.0 - 0.6.1 | 3.4 | 2.7 | diff --git a/lib/measures/radiant_slab_with_doas/README.md b/lib/measures/radiant_slab_with_doas/README.md index 02d549e2..3cca028f 100644 --- a/lib/measures/radiant_slab_with_doas/README.md +++ b/lib/measures/radiant_slab_with_doas/README.md @@ -95,14 +95,6 @@ Only applicable in radiant floor systems. This will greatly reduce system effect **Required:** true, **Model Dependent:** false -### Minimum Operating Hours -Fractional Hours Allowed, e.g. 30 min = 0.5 -**Name:** minimum_operation, -**Type:** Double, -**Units:** , -**Required:** true, -**Model Dependent:** false - ### Switch Over Time Minimum time limitation for when the system can switch between heating and cooling. Fractional hours allowed, e.g. 30 min = 0.5. **Name:** switch_over_time, diff --git a/lib/measures/radiant_slab_with_doas/measure.rb b/lib/measures/radiant_slab_with_doas/measure.rb index ce023dbd..ad21e8f0 100644 --- a/lib/measures/radiant_slab_with_doas/measure.rb +++ b/lib/measures/radiant_slab_with_doas/measure.rb @@ -103,13 +103,6 @@ def arguments(model) proportional_gain.setDefaultValue(0.3) args << proportional_gain - # make an argument for minimum operating hours - minimum_operation = OpenStudio::Measure::OSArgument.makeDoubleArgument('minimum_operation', true) - minimum_operation.setDisplayName('Minimum Operating Hours') - minimum_operation.setDescription('Fractional Hours Allowed, e.g. 30 min = 0.5') - minimum_operation.setDefaultValue(1.0) - args << minimum_operation - # make an argument for switch over time switch_over_time = OpenStudio::Measure::OSArgument.makeDoubleArgument('switch_over_time', true) switch_over_time.setDisplayName('Switch Over Time') @@ -176,7 +169,6 @@ def run(model, runner, user_arguments) include_carpet = runner.getBoolArgumentValue('include_carpet', user_arguments) control_strategy = runner.getStringArgumentValue('control_strategy', user_arguments) proportional_gain = runner.getDoubleArgumentValue('proportional_gain', user_arguments) - minimum_operation = runner.getDoubleArgumentValue('minimum_operation', user_arguments) switch_over_time = runner.getDoubleArgumentValue('switch_over_time', user_arguments) radiant_lockout = runner.getBoolArgumentValue('radiant_lockout', user_arguments) lockout_start_time = runner.getDoubleArgumentValue('lockout_start_time', user_arguments) @@ -289,7 +281,6 @@ def run(model, runner, user_arguments) include_carpet: include_carpet, control_strategy: control_strategy, proportional_gain: proportional_gain, - minimum_operation: minimum_operation, switch_over_time: switch_over_time, radiant_lockout: radiant_lockout, radiant_lockout_start_time: lockout_start_time, diff --git a/lib/measures/radiant_slab_with_doas/measure.xml b/lib/measures/radiant_slab_with_doas/measure.xml index ecccbe51..c76195a4 100644 --- a/lib/measures/radiant_slab_with_doas/measure.xml +++ b/lib/measures/radiant_slab_with_doas/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 radiant_slab_with_doas 8091a0c3-7760-4da6-adf4-133d55872816 - d7f5c831-95c6-49e7-ad76-7f2052b7f620 - 20230602T160042Z + 0aa5894b-04df-4143-9346-85d813fdac98 + 2023-10-30T17:38:24Z C49A7DAB RadiantSlabWithDoas Radiant Slab with DOAS @@ -158,15 +158,6 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove false 0.3 - - minimum_operation - Minimum Operating Hours - Fractional Hours Allowed, e.g. 30 min = 0.5 - Double - true - false - 1 - switch_over_time Switch Over Time @@ -283,12 +274,35 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove + + LICENSE.md + md + license + BFFB1AA6 + + + README.md + md + readme + 9B9C0291 + README.md.erb erb readmeerb 703C9964 + + + OpenStudio + 2.9.0 + 2.9.0 + + measure.rb + rb + script + 10219EED + USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw epw @@ -307,40 +321,17 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove test 7CBAD8AA - - single_zone_office_5A.osm - osm - test - 44FD3DF2 - - - README.md - md - readme - 8618B20F - - - LICENSE.md - md - license - BFFB1AA6 - radiant_slab_with_doas_test.rb rb test - 363DB98B + 36014A9D - - OpenStudio - 2.9.0 - 2.9.0 - - measure.rb - rb - script - BE3F5928 + single_zone_office_5A.osm + osm + test + 44FD3DF2 diff --git a/lib/measures/radiant_slab_with_doas/tests/radiant_slab_with_doas_test.rb b/lib/measures/radiant_slab_with_doas/tests/radiant_slab_with_doas_test.rb index c10b3000..ab692e6d 100644 --- a/lib/measures/radiant_slab_with_doas/tests/radiant_slab_with_doas_test.rb +++ b/lib/measures/radiant_slab_with_doas/tests/radiant_slab_with_doas_test.rb @@ -137,7 +137,7 @@ def test_number_of_arguments_and_argument_names # get arguments and test that they are what we are expecting arguments = measure.arguments(model) - assert_equal(15, arguments.size) + assert_equal(14, arguments.size) assert_equal('remove_existing_hvac', arguments[0].name) assert_equal('heating_plant_type', arguments[1].name) assert_equal('cooling_plant_type', arguments[2].name) @@ -146,13 +146,12 @@ def test_number_of_arguments_and_argument_names assert_equal('include_carpet', arguments[5].name) assert_equal('control_strategy', arguments[6].name) assert_equal('proportional_gain', arguments[7].name) - assert_equal('minimum_operation', arguments[8].name) - assert_equal('switch_over_time', arguments[9].name) - assert_equal('radiant_lockout', arguments[10].name) - assert_equal('lockout_start_time', arguments[11].name) - assert_equal('lockout_end_time', arguments[12].name) - assert_equal('add_output_variables', arguments[13].name) - assert_equal('standards_template', arguments[14].name) + assert_equal('switch_over_time', arguments[8].name) + assert_equal('radiant_lockout', arguments[9].name) + assert_equal('lockout_start_time', arguments[10].name) + assert_equal('lockout_end_time', arguments[11].name) + assert_equal('add_output_variables', arguments[12].name) + assert_equal('standards_template', arguments[13].name) end def test_single_zone_office_5A_floor diff --git a/lib/openstudio/model_articulation/version.rb b/lib/openstudio/model_articulation/version.rb index 863e1a67..40e2e51d 100644 --- a/lib/openstudio/model_articulation/version.rb +++ b/lib/openstudio/model_articulation/version.rb @@ -5,6 +5,6 @@ module OpenStudio module ModelArticulation - VERSION = '0.8.0' + VERSION = '0.9.0' end end diff --git a/openstudio-model-articulation.gemspec b/openstudio-model-articulation.gemspec index db5c3dc1..241d2868 100644 --- a/openstudio-model-articulation.gemspec +++ b/openstudio-model-articulation.gemspec @@ -29,8 +29,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '~> 2.7.0' spec.add_dependency 'bundler', '~> 2.1' - spec.add_dependency 'openstudio-extension', '~> 0.6.1' - spec.add_dependency 'openstudio-standards', '~> 0.4.0' + spec.add_dependency 'openstudio-extension', '~> 0.7.0' + spec.add_dependency 'openstudio-standards', '~> 0.5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9'