Merge pull request #426 from NREL/datapoint_init

run data_point initialize scripts only once: at the end of initialize…

server/app/jobs/dj_jobs/run_simulate_data_point.rb

@@ -63,10 +63,7 @@ def perform
 
       # Logger for the simulate datapoint
       @sim_logger = Logger.new("#{simulation_dir}/#{@data_point.id}.log")
-
-      # Run  data point initialize script if present
-      run_script_with_args 'initialize'
-
+
       # Error if @datapoint doesn't exist
       if @data_point.nil?
         @sim_logger = 'Could not find datapoint; @datapoint was nil'
@@ -426,10 +423,7 @@ def initialize_worker
         end
 
         # Run the server data_point initialization script with defined arguments, if it exists.
-        Timeout.timeout(600) do
-          @sim_logger.debug "Running datapoint initialization file if present."
-          run_script_with_args "initialize"
-        end
+        run_script_with_args "initialize"
       end
 
       @sim_logger.info 'Finished worker initialization'
@@ -532,7 +526,6 @@ def run_script_with_args script_name
 
         @sim_logger.info "Checking for presence of script file at #{script_path}"
         if File.file? script_path
-          # TODO how long do we want to set timeout?
           Utility::Oss.run_script(script_path, 4.hours, {'SCRIPT_ANALYSIS_ID' => @data_point.analysis.id, 'SCRIPT_DATA_POINT_ID' => @data_point.id}, args, @sim_logger,log_path)
         end
       rescue => e