gs2crmod 0.11.29 → 0.11.30

data/VERSION

@@ -1 +1 @@
-0.11.29
+0.11.30

data/ext/gs2crmod_ext.c

@@ -439,6 +439,7 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
     VALUE test_proc = rb_eval_string("Proc.new {|options| case options[:correlation_type]; when 'perp'; 0; when 'par'; 1; when 'time'; 2; when 'full'; 3 ;else; raise 'Please specify correlation_type as a string (perp/par/time/full)'; end}");
     int corr_type = FIX2INT(RFCALL_11_ON(test_proc, "call", options));
     
+    printf("Reading in data\n");
     for(it=0; it<t_size; it++)
     {   
         /*options[:t_index] = it+1*/
@@ -489,6 +490,7 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
 
     
 
+    printf("Interpolating\n");
     /******************************
      *    GSL Interpolation of    *
      *       field in time        *
@@ -661,8 +663,12 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
         break;
     }
 
+    printf("Main calculation loop\n\n");
     //Start main loop for correlation function calculation
     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);
         for(i2=i1; i2<tot_size; i2+=nt_reg)
         {
             //Calculate spatial and temporal separation

data/gs2crmod.gemspec

@@ -2,15 +2,12 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: gs2crmod 0.11.29 ruby lib
-# stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.29"
+  s.version = "0.11.30"
 
   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-18"
   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."
@@ -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"])

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.29
+  version: 0.11.30
+  prerelease: 
 platform: ruby
 authors:
 - Edmund Highcock
@@ -13,102 +14,81 @@ date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10642060 !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: *10642060
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10641380 !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: *10641380
 - !ruby/object:Gem::Dependency
   name: ruby-netcdf-updated
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10640580 !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: *10640580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10639420 !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: *10639420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10638840 !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: *10638840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10637920 !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: *10637920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10636960 !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: *10636960
 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: 9fc845a7af975cc8918d33678677d6a9daf3b3fe
-  data.tar.gz: 5911a0644a0aae45ee429a1f9b3370b5692629b7
-SHA512:
-  metadata.gz: 9942d199a0ad3c657e0e5b5b80e4564a86aa0b85c3b13e0fe47475602027796ec2bbb5c6dcc74d30238e8d874a19e372e17e971c76e88fbec55ba68ba1f73f93
-  data.tar.gz: 1d16ca5efe84d2cc3fa3b9f4da55201416f70a80ab428d94ad13554bbca2234084ad6fcc2f6eb44626553ce232fdbf365e50311527fea92ae0d13058a8e3ad58