test/test_trinitycrmod.rb in trinitycrmod-0.2.6 vs test/test_trinitycrmod.rb in trinitycrmod-0.3.0

@@ -14,18 +14,69 @@
   def test_submit
     @runner.run_class.make_new_defaults_file("rake_test", "test/ifspppl/test.trin")
     FileUtils.mv('rake_test_defaults.rb', @runner.run_class.rcp.user_defaults_location)
     CodeRunner.submit(Y: 'test/ifspppl', T: true, D: 'rake_test')
 		base_hash = @runner.run_class.parse_input_file('test/ifspppl/test.trin')
-		test_hash = @runner.run_class.parse_input_file('test/ifspppl/v/id_1/v_id_1.trin')
+		test_hash = @runner.run_class.parse_input_file('test/ifspppl/v/id_1/v_id_1_t.trin')
 		assert_equal(base_hash, test_hash)
     FileUtils.rm(@runner.run_class.rcp.user_defaults_location + '/rake_test_defaults.rb')
     FileUtils.rm('test/ifspppl/rake_test_defaults.rb')
 		FileUtils.rm_r('test/ifspppl/v')
   end
 end
 
+class TestTrinitycrmodGs2 < Test::Unit::TestCase
+	def setup
+		CodeRunner.setup_run_class('trinity')
+		Dir.chdir('test/gs2_42982'){
+			CodeRunner::Trinity.use_new_defaults_file_with_gs2('rake_test_gs2_42982', 'shot42982_jet.trin', 'shot42982_jet.in')
+		}
+    @runner = CodeRunner.fetch_runner(Y: 'test/gs2_42982', C: 'trinity', X: '/dev/null')
+		system("gunzip test/gs2_42982/pr08_jet_42982_1d.dat.gz -c > test/gs2_42982/pr08_jet_42982_1d.dat")
+		system("gunzip test/gs2_42982/pr08_jet_42982_2d.dat.gz -c > test/gs2_42982/pr08_jet_42982_2d.dat")
+	end
+	def test_submit
+		if ENV['TRINITY_EXEC']
+			CodeRunner.submit(Y: 'test/gs2_42982', X: ENV['TRINITY_EXEC'], n: '8')
+		else
+			CodeRunner.submit(Y: 'test/gs2_42982', T: true, X: '/dev/null', n: '8')
+		end
+		@runner.use_component = :component
+		@runner.recalc_all = true
+		@runner.update
+		CodeRunner.status(Y: 'test/gs2_42982', h: :component, A: true)
+	end
+	def teardown 
+    FileUtils.rm(@runner.run_class.rcp.user_defaults_location + '/rake_test_gs2_42982_defaults.rb')
+    FileUtils.rm('test/gs2_42982/rake_test_gs2_42982_defaults.rb')
+    FileUtils.rm('test/gs2_42982/pr08_jet_42982_1d.dat')
+    FileUtils.rm('test/gs2_42982/pr08_jet_42982_2d.dat')
+    FileUtils.rm('test/gs2_42982/.CODE_RUNNER_TEMP_RUN_LIST_CACHE')
+		if ENV['TRINITY_EXEC'] and not FileTest.exist?('test/gs2_42982_results/v.tgz')
+			Dir.chdir('test/gs2_42982'){system("tar -czf v.tgz v/")}
+			FileUtils.mv('test/gs2_42982/v.tgz', 'test/gs2_42982_results/.')
+		end
+		FileUtils.rm_r('test/gs2_42982/v/')
+	end
+end
+
+class TestTrinitycrmodGs2Analysis < Test::Unit::TestCase
+	def setup
+		Dir.chdir('test/gs2_42982_results/'){system "tar -xzf v.tgz"}
+    @runner = CodeRunner.fetch_runner(Y: 'test/gs2_42982_results', C: 'trinity', A: true)
+	end
+	def test_analysis
+		CodeRunner.status(Y: 'test/gs2_42982_results')
+		CodeRunner.status(Y: 'test/gs2_42982_results', h: :component)
+	end
+	def teardown
+		FileUtils.rm_r('test/gs2_42982_results/v')
+    FileUtils.rm('test/gs2_42982_results/.code_runner_script_defaults.rb')
+    FileUtils.rm('test/gs2_42982_results/.CODE_RUNNER_TEMP_RUN_LIST_CACHE')
+	end
+end
+
 class TestTrinitycrmodIFSPPPLAnalysis < Test::Unit::TestCase
   def setup
     #@runner = CodeRunner.fetch_runner(Y: 'test/ifspppl_results', C: 'trinity', X: '/dev/null')
 		Dir.chdir('test/ifspppl_results/v'){str = "tar -xzf id_1.tgz";system str}
     @runner = CodeRunner.fetch_runner(Y: 'test/ifspppl_results', C: 'trinity', X: ENV['HOME'] + '/Code/trinity/trunk/trinity', A: true)
@@ -54,9 +105,22 @@
 		assert_equal(kit.data[0].y.data[0], 0.001944)
 	  kit = @runner.run_list[1].graphkit('ion_pwr_prof', {t_index: 2})
 		assert_equal(8,kit.data[0].y.data.size)
 		assert_equal(kit.data[0].y.data[0], 0.2412)
 		#kit.gnuplot
+	end
+
+	def test_average_graphs
+	  kit = @runner.run_list[1].graphkit('ion_hflux_gb_prof', {t_index: 2})
+		#kit.gnuplot
+		assert_equal(kit.data[0].class, GraphKit::DataKit)
+		assert_equal(kit.data[0].y.data[0], 0.001944)
+	  kit = @runner.run_list[1].graphkit('ion_hflux_gb_prof', {t_index: 1})
+		#kit.gnuplot
+		assert_equal(kit.data[0].class, GraphKit::DataKit)
+		assert_equal(kit.data[0].y.data[0], 0.001975)
+	  kit = @runner.run_list[1].graphkit('ion_hflux_gb_prof', {t_index: 2, time_average: -1})
+		assert_equal([0.001975, 0.001944].sum/2.0, kit.data[0].y.data[0])
 	end
   def teardown
     FileUtils.rm('test/ifspppl_results/.code_runner_script_defaults.rb')
     FileUtils.rm_r('test/ifspppl_results/v/id_1/')
   end