update formatting and version in export_modelica_loads (#149)

Co-authored-by: Nathan Moore <nathan.moore@nrel.gov>

lib/measures/export_modelica_loads/measure.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.1</schema_version>
+  <schema_version>3.0</schema_version>
   <name>export_modelica_loads</name>
   <uid>7051db01-2e55-4223-b5b5-fee615b68dd0</uid>
   <version_id>e682f518-4785-4917-802e-600023816cc3</version_id>

lib/urbanopt/reporting/default_reports/qaqc_flags.rb

@@ -16,9 +16,9 @@ class QAQC
         ##
         # _Hash_ - Hash of flags raised by QAQC measure for this feature during this reporting period
         #
-        attr_accessor :eui_reasonableness,:end_use_by_category,:mechanical_system_part_load_efficiency,
-                      :simultaneous_heating_and_cooling , :internal_loads , :schedules, :envelope_r_value,
-                      :domestic_hot_water , :mechanical_system_efficiency , :supply_and_zone_air_temperature,
+        attr_accessor :eui_reasonableness, :end_use_by_category, :mechanical_system_part_load_efficiency,
+                      :simultaneous_heating_and_cooling, :internal_loads, :schedules, :envelope_r_value,
+                      :domestic_hot_water, :mechanical_system_efficiency, :supply_and_zone_air_temperature,
                       :total_qaqc_flags
 
         ##
@@ -46,14 +46,11 @@ def initialize(hash = {})
           @mechanical_system_efficiency = hash[:mechanical_system_efficiency]
           @total_qaqc_flags = hash[:total_qaqc_flags]
 
-
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
           @@schema ||= @@validator.schema
-
         end
 
-
         ##
         # Assigns default values if values do not exist.
         ##
@@ -72,9 +69,9 @@ def defaults
           hash[:mechanical_system_efficiency] = nil
           hash[:total_qaqc_flags] = nil
 
-
           return hash
         end
+
         ##
         # Convert to a Hash equivalent for JSON serialization
         ##
@@ -99,7 +96,6 @@ def to_hash
           end
 
           return result
-
         end
 
         ##
@@ -126,7 +122,6 @@ def add_values(existing_value, new_value) #:nodoc:
         # +other+ - _QAQC_ - An object of Program class.
         ##
         def add_qaqc_flags(other)
-
           @eui_reasonableness = add_values(@eui_reasonableness, other.eui_reasonableness)
           @end_use_by_category = add_values(@end_use_by_category, other.end_use_by_category)
           @mechanical_system_part_load_efficiency = add_values(@mechanical_system_part_load_efficiency, other.mechanical_system_part_load_efficiency)
@@ -138,9 +133,7 @@ def add_qaqc_flags(other)
           @domestic_hot_water = add_values(@domestic_hot_water, other.domestic_hot_water)
           @mechanical_system_efficiency = add_values(@mechanical_system_efficiency, other.mechanical_system_efficiency)
           @total_qaqc_flags = add_values(@total_qaqc_flags, other.total_qaqc_flags)
-
         end
-
       end
     end
   end

lib/urbanopt/reporting/default_reports/reporting_period.rb

@@ -24,9 +24,9 @@ class ReportingPeriod
                       :fuel_type, :total_cost_dollar, :usage_cost_dollar, :demand_cost_dollar, :comfort_result, :time_setpoint_not_met_during_occupied_cooling,
                       :time_setpoint_not_met_during_occupied_heating, :time_setpoint_not_met_during_occupied_hours, :hours_out_of_comfort_bounds_PMV, :hours_out_of_comfort_bounds_PPD,
                       :emissions, :future_annual_electricity_emissions_mt, :future_hourly_electricity_emissions_mt, :historical_annual_electricity_emissions_mt, :historical_hourly_electricity_emissions_mt,
-                      :future_annual_electricity_emissions_intensity_kg_per_ft2, :future_hourly_electricity_emissions_intensity_kg_per_ft2, :historical_annual_electricity_emissions_intensity_kg_per_ft2, :historical_hourly_electricity_emissions_intensity_kg_per_ft2 ,
+                      :future_annual_electricity_emissions_intensity_kg_per_ft2, :future_hourly_electricity_emissions_intensity_kg_per_ft2, :historical_annual_electricity_emissions_intensity_kg_per_ft2, :historical_hourly_electricity_emissions_intensity_kg_per_ft2,
                       :natural_gas_emissions_mt, :natural_gas_emissions_intensity_kg_per_ft2, :propane_emissions_mt, :propane_emissions_intensity_kg_per_ft2,
-                      :fueloil_no2_emissions_mt, :fueloil_no2_emissions_intensity_kg_per_ft2  #:nodoc:
+                      :fueloil_no2_emissions_mt, :fueloil_no2_emissions_intensity_kg_per_ft2 #:nodoc:
 
         # ReportingPeriod class initializes the reporting period attributes:
         # +:id+ , +:name+ , +:multiplier+ , +:start_date+ , +:end_date+ , +:month+ , +:day_of_month+ , +:year+ , +:total_site_energy_kwh+ , +:total_source_energy_kwh+ , +:site_EUI_kwh_per_m2+, +:site_EUI_kbtu_per_ft2+, +:source_EUI_kwh_per_m2+, +:source_EUI_kbtu_per_ft2+,
@@ -123,11 +123,11 @@ def defaults
           hash[:comfort_result] = { time_setpoint_not_met_during_occupied_cooling: nil, time_setpoint_not_met_during_occupied_heating: nil,
                                     time_setpoint_not_met_during_occupied_hours: nil, hours_out_of_comfort_bounds_PMV: nil, hours_out_of_comfort_bounds_PPD: nil }
           hash[:emissions] = { future_annual_electricity_emissions_mt: nil, future_hourly_electricity_emissions_mt: nil, historical_annual_electricity_emissions_mt: nil,
-                              historical_hourly_electricity_emissions_mt: nil, future_annual_electricity_emissions_intensity_kg_per_ft2: nil,
-                              future_hourly_electricity_emissions_intensity_kg_per_ft2: nil, historical_annual_electricity_emissions_intensity_kg_per_ft2: nil,
-                              historical_hourly_electricity_emissions_intensity_kg_per_ft2: nil, natural_gas_emissions_mt: nil,
-                              natural_gas_emissions_intensity_kg_per_ft2: nil, propane_emissions_mt: nil, propane_emissions_intensity_kg_per_ft2: nil,
-                              fueloil_no2_emissions_mt: nil, fueloil_no2_emissions_intensity_kg_per_ft2: nil }
+                               historical_hourly_electricity_emissions_mt: nil, future_annual_electricity_emissions_intensity_kg_per_ft2: nil,
+                               future_hourly_electricity_emissions_intensity_kg_per_ft2: nil, historical_annual_electricity_emissions_intensity_kg_per_ft2: nil,
+                               historical_hourly_electricity_emissions_intensity_kg_per_ft2: nil, natural_gas_emissions_mt: nil,
+                               natural_gas_emissions_intensity_kg_per_ft2: nil, propane_emissions_mt: nil, propane_emissions_intensity_kg_per_ft2: nil,
+                               fueloil_no2_emissions_mt: nil, fueloil_no2_emissions_intensity_kg_per_ft2: nil }
 
           return hash
         end