openstudio-standards 0.2.12.rc5 → 0.2.12.rc6

data/lib/openstudio-standards/utilities/simulation.rb

@@ -139,7 +139,7 @@ Standard.class_eval do
       end
     end
 
-    # Report severe errors in the run
+    # Report severe or fatal errors in the run
     error_query = "SELECT ErrorMessage
         FROM Errors
         WHERE ErrorType in(1,2)"
@@ -148,26 +148,16 @@ Standard.class_eval do
       errs = errs.get
     end
 
-    # Check that the run completed
-    completed_query = 'SELECT Completed FROM Simulations'
-    completed = model.sqlFile.get.execAndReturnFirstDouble(completed_query)
-    if completed.is_initialized
-      completed = completed.get
-      if completed.zero?
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "The run did not finish and had following errors: #{errs.join('\n')}")
-        return false
-      end
+    # Check that the run completed successfully
+    end_file_stringpath = "#{run_dir}/run/eplusout.end"
+    end_file_path = OpenStudio::Path.new(end_file_stringpath)
+    if OpenStudio.exists(end_file_path)
+      endstring = File.read(end_file_stringpath)
     end
 
-    # Check that the run completed with no severe errors
-    completed_successfully_query = 'SELECT CompletedSuccessfully FROM Simulations'
-    completed_successfully = model.sqlFile.get.execAndReturnFirstDouble(completed_successfully_query)
-    if completed_successfully.is_initialized
-      completed_successfully = completed_successfully.get
-      if completed_successfully.zero?
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "The run failed with the following severe or fatal errors: #{errs.join('\n')}")
-        return false
-      end
+    if not endstring.include?("EnergyPlus Completed Successfully")
+      OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "The run did not finish and had following errors: #{errs.join('\n')}")
+      return false
     end
 
     # Log any severe errors that did not cause simulation to fail

data/lib/openstudio-standards/version.rb

@@ -13,5 +13,5 @@ module OpenstudioStandards
     end
     return 'git-not-found-on-this-system'
   end
-  VERSION = '0.2.12.rc5'.freeze
+  VERSION = '0.2.12.rc6'.freeze
 end

data/lib/openstudio-standards/weather/Weather.Model.rb

@@ -310,8 +310,8 @@ module BTAP
       else
         Dir.glob("#{File.dirname(__FILE__)}/../../../**/*.epw").each do |file|
           canadian_file_names << File.basename(file).to_s
-          puts "File.basename = #{File.basename(file)}"
-          puts "File.dirname = #{File.dirname(file)}"
+          # puts "File.basename = #{File.basename(file)}"
+          # puts "File.dirname = #{File.dirname(file)}"
         end
       end
       return canadian_file_names

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-standards
 version: !ruby/object:Gem::Version
-  version: 0.2.12.rc5
+  version: 0.2.12.rc6
 platform: ruby
 authors:
 - Andrew Parker
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-reporters