gs2crmod 0.9.11 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.9.11
+0.10.0

data/gs2crmod.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.9.11"
+  s.version = "0.10.0"
 
   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/gsl_data.rb

@@ -158,6 +158,10 @@ def gsl_vector(name, options={})
 			#ep options; gets
 			#vec = GSL::Vector.alloc(netcdf_file.var(name.to_s).get({'start' => [options[:thetamin]||0], 'end' => [options[:thetamax]||-1]}).to_a)
 			vec = GSL::Vector.alloc(netcdf_file.var(name.to_s).get.to_a)
+			if gryfx? and options[:periodic]
+				#vec = vec.connect([2.0*vec[-1] - vec[-2]].to_gslv)
+				vec = vec.connect([-vec[0]].to_gslv)
+			end
 			if ith = options[:interpolate_theta]
 				osize = vec.size
 				newsize = (osize-1)*ith+1
@@ -174,6 +178,7 @@ def gsl_vector(name, options={})
 			end
 			start = options[:thetamin]||0
 			endv = options[:thetamax]||vec.size-1
+			#ep ['options', options, 'vec.size', vec.size]
 			vec = vec.subvector(start, (endv-start+1)).dup
 			return vec
 		elsif name.to_sym == :t

data/lib/gs2crmod/gsl_data_3d.rb

@@ -205,6 +205,21 @@ class CodeRunner::Gs2
 				arr = GSL::Tensor.new(arr.narray.expand(*shape, 0.0))
 			end
 
+			if gryfx? and options[:periodic]
+				shape = arr.narray.shape
+				shape[1]+=1
+				arr = GSL::Tensor.new(arr.narray.expand(*shape, 0.0))
+				shpe = arr.shape
+				for i in 0...shpe[0]
+					for j in 0...shpe[1]
+						for r in 0...shpe[3]
+							arr[i, j, -1, r] = arr[i, j, 0, r]
+						end
+					end
+				end
+
+			end
+
 			arr[0, true, true, true] = 0.0 if options[:no_zonal]
 			#arr = arr[options[:nakx] ? 0...options[:nakx] : true, options[:naky] ? 0...options[:naky] : true, true, true] if options[:nakx] or options[:naky]
 			return arr
@@ -614,8 +629,8 @@ class CodeRunner::Gs2
 			end
 			if [true,:y].include? options[:extra_points]
 				ep "Extending y..."
-				y = y.connect([2*y[-1] - y[-2]].to_gslv).dup
-				raise "ly corrected incorrectly #{ly},#{y[-1]},#{y[0]},#{y[-1]-y[0]}" unless (ly-(y[-1] - y[0])).abs / ly.abs < 1.0e-8
+				y = y.connect([2.0*y[-1] - y[-2]].to_gslv).dup
+				raise "ly corrected incorrectly #{ly},#{y[-1]},#{y[0]},#{y[-1]-y[0]}" unless (ly-(y[-1] - y[0])).abs / ly.abs < 1.0e-6
 			end
 
 
@@ -653,13 +668,15 @@ class CodeRunner::Gs2
 			#ep options; gets
 			theta = gsl_vector('theta', options)
 			#ep theta; gets;
-			#ep 'thsize', @ntheta, theta.size
+			ep 'thsize', @ntheta, theta.size
 			correct_3d_options(options)
 			rhoc = options[:rhoc_actual]
 			q_actual = options[:q_actual]
 			xfac = 1.0 / options[:rho_star_actual]
 			yfac = rhoc / q_actual / options[:rho_star_actual]
 			factors = geometric_factors_gsl_tensor(options)
+			
+			#ep ['factors.shape', factors.shape]
 
 
 

metadata

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