setup environment,test running of QuickServiceRestaurant and FullServ…

…iceRestaurant

.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>openstudio-standards</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+</projectDescription>

openstudio-standards/data/standards/OpenStudio_Standards_space_types.json

@@ -23108,7 +23108,7 @@
       "lighting_standard": "ASHRAE 189.1-2009",
       "lighting_primary_space_type": "Attics",
       "lighting_secondary_space_type": "General",
-      "lighting_per_area": "0",
+      "lighting_per_area": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
       "lighting_fraction_to_return_air": null,
@@ -28388,7 +28388,7 @@
       "lighting_standard": "ASHRAE 189.1-2009",
       "lighting_primary_space_type": "Attics",
       "lighting_secondary_space_type": "General",
-      "lighting_per_area": "0",
+      "lighting_per_area": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
       "lighting_fraction_to_return_air": null,
@@ -30709,7 +30709,7 @@
       "ventilation_primary_space_type": "Retail",
       "ventilation_secondary_space_type": "General Sales combined by area",
       "ventilation_per_area": "0.2325",
-      "ventilation_per_person": "0",
+      "ventilation_per_person": null,
       "ventilation_air_changes": "",
       "occupancy_per_area": 8.0,
       "occupancy_schedule": "RetailStripmall Type3_OCC_SCH",
@@ -31138,7 +31138,7 @@
       "lighting_standard": "ASHRAE 189.1-2009",
       "lighting_primary_space_type": "Attics",
       "lighting_secondary_space_type": "General",
-      "lighting_per_area": "0",
+      "lighting_per_area": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
       "lighting_fraction_to_return_air": null,

openstudio-standards/lib/openstudio-standards/hvac_sizing/HVACSizing.Model.rb

@@ -207,7 +207,8 @@ def runSizingRun(sizing_run_dir = "#{Dir.pwd}/SizingRun")
     completed = self.sqlFile.get.execAndReturnFirstDouble(completed_query)
     if completed.is_initialized
       completed = completed.get
-      if errs.size == 1
+      unless completed == 1
+      # if errs.size == 1
         OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "The sizing run failed.  See previous severe errors for clues.")
         return false
       end

openstudio-standards/lib/openstudio-standards/prototypes/Prototype.Model.rb

@@ -83,7 +83,7 @@ def create_prototype_building(building_type, building_vintage, climate_zone, siz
       self.add_daylighting_controls(building_vintage)
     end
 
-    if building_type == "QuickServiceRestaurant"
+    if building_type == "QuickServiceRestaurant" || building_type == "FullServiceRestaurant"
       self.update_exhaust_fan_efficiency(building_vintage)
     end
 
@@ -269,7 +269,12 @@ def load_geometry(building_type, building_vintage, climate_zone)
         geometry_file = 'Geometry.quick_service_restaurant_allothers.osm'
       end
     when 'FullServiceRestaurant'
-      geometry_file = 'Geometry.full_service_restaurant.osm'
+      case building_vintage
+      when 'DOE Ref Pre-1980'
+        geometry_file = 'Geometry.full_service_restaurant_pre1980.osm'
+      when 'DOE Ref 1980-2004','90.1-2010','90.1-2007','90.1-2004','90.1-2013'
+        geometry_file = 'Geometry.full_service_restaurant_allothers.osm'
+      end
     when 'Hospital'
       geometry_file = 'Geometry.hospital.osm'
     when 'Outpatient'