openstudio-model-articulation 0.6.1 → 0.7.0

data/lib/measures/merge_floorspace_js_with_model/measure.rb

@@ -106,15 +106,21 @@ class MergeFloorspaceJsWithModel < OpenStudio::Measure::ModelMeasure
       return false
     end
 
-    scene = floorplan.get.toThreeScene(true)
-    rt = OpenStudio::Model::ThreeJSReverseTranslator.new
-    new_model = rt.modelFromThreeJS(scene)
+    # scene = floorplan.get.toThreeScene(true)
+    # rt = OpenStudio::Model::ThreeJSReverseTranslator.new
+    # new_model = rt.modelFromThreeJS(scene
+
+    rt = OpenStudio::Model::FloorspaceReverseTranslator.new
+    new_model = rt.modelFromFloorspace(json)
 
     unless new_model.is_initialized
       runner.registerError('Cannot convert floorplan to model.')
       return false
     end
     new_model = new_model.get
+    runner.registerInfo("Model from FloorSpaceJS has #{new_model.getPlanarSurfaceGroups.size} planar surface groups.")
+    puts "hello"
+    puts new_model
 
     runner.registerInitialCondition("Initial model has #{model.getPlanarSurfaceGroups.size} planar surface groups.")
 

data/lib/measures/merge_floorspace_js_with_model/measure.xml

@@ -93,7 +93,7 @@
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>2.9.0</identifier>
-        <min_compatible>2.9.0</min_compatible>
+        <min_compatible>3.5.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>

data/lib/measures/radiant_slab_with_doas/measure.rb

@@ -341,7 +341,7 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
     end
 
     # Apply the HVAC efficiency standard
-    building_data = std.model_get_building_climate_zone_and_building_type(model)
+    building_data = std.model_get_building_properties(model)
     std.model_apply_hvac_efficiency_standard(model, building_data['climate_zone'])
 
     # add output variables

data/lib/measures/radiant_slab_with_doas/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>radiant_slab_with_doas</name>
   <uid>8091a0c3-7760-4da6-adf4-133d55872816</uid>
-  <version_id>764afd7f-f6e7-4e73-bc92-1230e49b2145</version_id>
-  <version_modified>20220505T182927Z</version_modified>
+  <version_id>1310941b-749c-4657-9edf-64d9ca3c7960</version_id>
+  <version_modified>20221130T000107Z</version_modified>
   <xml_checksum>C49A7DAB</xml_checksum>
   <class_name>RadiantSlabWithDoas</class_name>
   <display_name>Radiant Slab with DOAS</display_name>
@@ -340,7 +340,7 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>12177EE8</checksum>
+      <checksum>CE454975</checksum>
     </file>
   </files>
 </measure>

data/lib/openstudio/model_articulation/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module ModelArticulation
-    VERSION = '0.6.1'.freeze
+    VERSION = '0.7.0'
   end
 end

data/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.5.1'
-  spec.add_dependency 'openstudio-standards', '~> 0.2.16'
+  spec.add_dependency 'openstudio-extension', '~> 0.6.0'
+  spec.add_dependency 'openstudio-standards', '~> 0.3.0'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-model-articulation
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - David Goldwasser
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -438,8 +438,8 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-model-articulation-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-model-articulation-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-model-articulation-gem/tree/v0.6.1
-post_install_message: 
+  source_code_uri: https://github.com/NREL/openstudio-model-articulation-gem/tree/v0.7.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -455,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Library and measures for OpenStudio Model Articulation
 test_files: []