gs2crmod 0.11.34 → 0.11.35

data/VERSION

@@ -1 +1 @@
-0.11.34
+0.11.35

data/ext/gs2crmod_ext.c

@@ -668,7 +668,7 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
     for(i1=0; i1<tot_size; i1+=nt_reg){
         printf("\33[2K\r"); //Clear line in terminal
         printf("\33[1A");   //Go back one line in terminal
-        printf("main loop iterator = %ld of %ld\n", i1/nt_reg, tot_size/nt_reg);
+        printf("Main loop iterator = %ld of %ld\n", i1/nt_reg, tot_size/nt_reg);
         for(i2=i1; i2<tot_size; i2+=nt_reg)
         {
             //Calculate spatial and temporal separation

data/gs2crmod.gemspec

@@ -2,17 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: gs2crmod 0.11.34 ruby lib
-# stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.34"
+  s.version = "0.11.35"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
-  s.date = "2014-03-19"
+  s.date = "2014-03-20"
   s.description = "GS2 is a gyrokinetic flux tube initial value turbulence code which can be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated running and analysis of large simulations. This module allows GS2 (and its sister code AstroGK) to harness the power of the CodeRunner framework."
   s.email = "edmundhighcock@sourceforge.net"
   s.extensions = ["ext/extconf.rb"]
@@ -85,12 +82,13 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://gs2crmod.sourceforge.net"
   s.licenses = ["GSLv3"]
+  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "1.8.11"
   s.summary = "Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<coderunner>, [">= 0.14.10"])

data/lib/gs2crmod/graphs.rb

@@ -1011,7 +1011,8 @@ module GraphKits
 			#shape = zaxis.data.shape
 			#carts = cartesian_coordinates_gsl_tensor(options)
 			#torphiout = 2.6
-			torphiout = options[:constant_torphi] || options[:torphi]
+			torphiout = options[:constant_torphi] || options[:torphi] #if constant_torphi is specified this is the toroidal angle at which data is printed
+      torphiactual = options[:torphi] #This is the actual tor_phi used in the calculation
 			raise "Please specify a toroidal angle (options[:torphi])" unless torphiout
 			field = options[:field] || field_real_space_gsl_tensor(options)
 			torphi_const =  constant_torphi_surface_gsl_tensor(options)
@@ -1045,12 +1046,25 @@ module GraphKits
 				i = torphi_const[j,k]
 				torphi1 = cyls[2,i,j,k]
 				torphi2 = cyls[2,i+1,j,k]
-				#ep cyls[2,true,j,k].to_a
 				deltorphi = cyls[2,shpc[1]-1,j,k] - cyls[2,0,j,k]
+        
+        #This options tests whether the point is inside or outside a single
+        #flux tube and defines a factor which will zero all other points.
+        #This will give the projection of a single flux tube onto a poloidal plane.
+        if options[:no_flux_tube_copies]
+          if torphiactual <= cyls[2,shpc[1]-1,j,k] and torphiactual >= cyls[2,0,j,k]
+            field_fac = 1.0
+          else
+            field_fac = 0.0
+          end
+        else
+          field_fac = 1.0
+        end
+
 				#raise "Periodicity not satisfied: #{(2*Math::PI/deltorphi+1.0e-8)%1.0}, #{(2*Math::PI/deltorphi+1.0e-5)}" unless ((2*Math::PI/deltorphi)+1.0e-8)%1.0 < 1.0e-5
 				m1 = (torphi1 )%deltorphi 
 				m2 = (torphi2 )%deltorphi 
-				m3 = (torphiout)%deltorphi
+				m3 = (torphiactual)%deltorphi
 				#bracketed = ((m1-m3).abs < 1.0e-4) || (
 										#(m2-m3.abs) > 1.0e-4 &&
 										#(m2 - m3) *
@@ -1114,7 +1128,7 @@ module GraphKits
 					#ep ['bracketed', i, j, k]
 					#ep ['field', field[i,j,k]]
 					#new_phi[j,k] = theta_vec[k]
-					new_field[j,k] = field[i,j,k] * (1-dfac) +  field[(i+1)%shp[0],j,k] * dfac
+					new_field[j,k] = (field[i,j,k] * (1-dfac) +  field[(i+1)%shp[0],j,k] * dfac) * field_fac
 					#raise "Mismatched radii" unless
 					#new_X[j,k] = cyls[0,i,j,k] * Math.cos(cyls[2,i,j,k])
 					#new_X[j,k] =  x_vec[j]

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.34
+  version: 0.11.35
+  prerelease: 
 platform: ruby
 authors:
 - Edmund Highcock
@@ -9,106 +10,85 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10662240 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.14.10
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.10
+  version_requirements: *10662240
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10281960 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+  version_requirements: *10281960
 - !ruby/object:Gem::Dependency
   name: ruby-netcdf-updated
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10281020 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.6.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.6.1
+  version_requirements: *10281020
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10280180 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10280180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10279640 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *10279640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10279000 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *10279000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10278300 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.4
+  version_requirements: *10278300
 description: GS2 is a gyrokinetic flux tube initial value turbulence code which can
   be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated
   running and analysis of large simulations. This module allows GS2 (and its sister
@@ -122,7 +102,7 @@ extra_rdoc_files:
 - README.md
 - README.rdoc
 files:
-- ".document"
+- .document
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -185,25 +165,26 @@ files:
 homepage: http://gs2crmod.sourceforge.net
 licenses:
 - GSLv3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: db1322197e20ae4f7372ca099fa31d360a6eade2
-  data.tar.gz: 62ea55f2c89c27bf0a16d5093535a4ee9c03be62
-SHA512:
-  metadata.gz: ac64f07edc42a2ea5a66b9fabd6900c2ad0b2260df00e4dc523bb6fad9a71d4b1c734d48c648056499b530b048cb835a4982fe4f3728bac9ea1f865b20f7fa16
-  data.tar.gz: 09ecf4628eaac231583b7a4003212b7bb02855e0b6dd9b9e54c6865ad93349d9f8fb857611ed31e880a7439924c442264e974aaf7f53a663d0805f8ca3436ccb