lib/openstudio/analysis/translator/workflow.rb in openstudio-analysis-1.0.0.rc16 vs lib/openstudio/analysis/translator/workflow.rb in openstudio-analysis-1.0.0.rc17
- old
+ new
@@ -88,14 +88,18 @@
var_value = osd[:set_variable_values][var_value_uuid.to_sym]
step[:arguments][var_name.to_sym] = var_value
end
end
+ # Overwrite the seed and weather files if they are present in the datapoint.json
+ weather_file = osd[:weather_file] != '' ? osd[:weather_file] : @weather_file
+ seed_file = osd[:seed_file] != '' ? osd[:seed_file] : @seed_file
+
# Save the OSW hash
osw = {}
created_at = ::Time.now
- osw[:seed_file] = @seed_file
- osw[:weather_file] = @weather_file
+ osw[:seed_file] = seed_file
+ osw[:weather_file] = weather_file
osw[:file_format_version] = @osw_version
osw[:osa_id] = @osa_id
osw[:osd_id] = osd[:_id]
osw[:created_at] = created_at
osw[:measure_paths] = @measure_paths