gs2crmod 0.10.6 → 0.10.7

data/VERSION

@@ -1 +1 @@
-0.10.6
+0.10.7

data/gs2crmod.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.10.6"
+  s.version = "0.10.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]

data/lib/gs2crmod/astrogk/gsl_data.rb

@@ -9,5 +9,21 @@ class CodeRunner
 			end
 		end
 		include AstrogkGSLVectors
+		def geometric_factors_gsl_tensor(options)
+			#ops = options.dup; ops.delete :phi
+		#ep ops; gets
+			theta_vec = gsl_vector(:theta, options)
+			factors = GSL::Tensor.alloc(6,theta_vec.size)
+			factors[true, true] = 1.0
+			factors
+		end
+		def correct_3d_options(options)
+			eputs "Info: setting options[:gs2_coordinate_factor] to 1.0 (for slab geometry)"
+		  options[:gs2_coordinate_factor] = 1.0
+			#raise "Please specify options[:rho_star]" unless options[:rho_star]
+			options[:rho_star_actual] = 1.0
+			options[:q_actual] = 1.0
+			options[:rhoc_actual] = 1.0
+		end
 	end
 end

data/test/test_gs2crmod.rb

@@ -179,12 +179,18 @@ class TestAgkAnalysis < Test::Unit::TestCase
 		#kit.gnuplot
 	end
 	def test_analysis
-		assert_equal(1, @runner.run_list.size)
-		assert_equal(0.03224, @runner.run_list[1].max_growth_rate.round(5))
+		assert_equal(2, @runner.run_list.size)
+		assert_equal(0.04154, @runner.run_list[1].max_growth_rate.round(5))
 		#p @runner.run_list[1].growth_rate_at_ky
-		assert_equal(0.03224, @runner.run_list[1].growth_rate_at_ky[0.01].round(5))
+		assert_equal(0.04154, @runner.run_list[1].growth_rate_at_ky[0.01].round(5))
 		assert_equal(:Complete, @runner.run_list[1].status)
 	end
+	def test_3d_graphs
+		kit = @runner.run_list[2].graphkit('phi_real_space_surface', {rho_star: 0.1})
+		kit.gnuplot
+		assert_equal([5,5,1], kit.data[0].f.data.shape)
+		#assert_equal(-0.00402, kit.data[0].f.data[2,3,6].round(5))
+	end
 	def teardown
 		FileUtils.rm_rf(tfolder)
 	end
@@ -214,6 +220,7 @@ if ENV['AGK_EXEC']
 		end
 		def test_submission
 			CodeRunner.submit(C: 'gs2', X: ENV['AGK_EXEC'], D: 'test_gs2crmod_astrogk', n: '4', Y: tfolder, m: 'astrogk')
+			CodeRunner.submit(C: 'gs2', X: ENV['AGK_EXEC'], D: 'test_gs2crmod_astrogk', n: '4', Y: tfolder, m: 'astrogk', p: '{ny: 8, nx: 8, y0: 100, x0: 100, grid_option: "box"}', )
 			
 			CodeRunner.status(Y: tfolder)
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
   prerelease: 
 platform: ruby
 authors: