gs2crmod 0.10.24 → 0.10.25

data/VERSION

@@ -1 +1 @@
-0.10.24
+0.10.25

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.10.24"
+  s.version = "0.10.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
-  s.date = "2013-12-06"
+  s.date = "2013-12-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."
   s.email = "edmundhighcock@sourceforge.net"
   s.extensions = ["ext/extconf.rb"]

data/lib/gs2crmod/gs2.rb

@@ -550,8 +550,13 @@ def list_of_restart_files
 				break if files.size == 0
 			end
 		end #if files.size == 0
-    # This just finds a .nc file if using single restart file
-		files = Dir.entries.grep(/\.nc/) if files.size == 0
+    # This just finds a .nc file (w/o a number) if using single restart file
+		if files.size == 0
+			(Dir.entries.find_all{|dir| FileTest.directory? dir} - ['.', '..']).each do |dir|
+				files = Dir.entries(dir).grep(/\.nc/).map{|file| dir + "/" + file}
+				break if files.size == 0
+			end
+		end #if files.size == 0
 		return files
 	end # Dir.chdir(@directory) do
 end

data/lib/gs2crmod/namelists.rb

@@ -2313,6 +2313,18 @@
            "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
        :type=>:Float,
        :module=>:collisions},
+     :use_le_layout=>
+      {:should_include=>"true",
+       :description=>"Use more efficient layouts for le grid",
+       :help=>"Use more efficient layouts for le grid",
+       :tests=>["Tst::FORTRAN_BOOL"],
+       :code_name=>:use_le_layout,
+       :must_pass=>
+        [{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
+          :explanation=>
+           "This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
+       :type=>:Fortran_Bool,
+       :module=>:collisions},
      :ewindowa=>
       {:should_include=>"true",
        :description=>nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.10.24
+  version: 0.10.25
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: &17112760 !ruby/object:Gem::Requirement
+  requirement: &14540380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.13.13
   type: :runtime
   prerelease: false
-  version_requirements: *17112760
+  version_requirements: *14540380
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: &17112220 !ruby/object:Gem::Requirement
+  requirement: &14539860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *17112220
+  version_requirements: *14539860
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17111700 !ruby/object:Gem::Requirement
+  requirement: &14539280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17111700
+  version_requirements: *14539280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17111120 !ruby/object:Gem::Requirement
+  requirement: &14538800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *17111120
+  version_requirements: *14538800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17110620 !ruby/object:Gem::Requirement
+  requirement: &14538280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17110620
+  version_requirements: *14538280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17110100 !ruby/object:Gem::Requirement
+  requirement: &14537780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *17110100
+  version_requirements: *14537780
 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