trinitycrmod 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f86b11f4f50a1cedeedf5a30202530e53daaa6e
-  data.tar.gz: cd47a9cc136c1d7e4b3deca5efcb465288a71999
+  metadata.gz: 77964126d573cc9049d3cbd59d288bea65caa039
+  data.tar.gz: fc8023b31db6fd017ddc5a5c3a4a19eab94a748e
 SHA512:
-  metadata.gz: 56c11cca49a04d8a348b35e61865543adcfe56107eac7b150ebb47ff8f2c06c050a4e7f577b4e6879b1e935ccfd0c233ffda8f01844e999c0bdcc2221f2bcbfa
-  data.tar.gz: 3e99ff227799932f7c7539d414484135d6459c50080aab512399bb7d2893bb96c6f7d99c42f9d6d994be803a47c267bde60fa5e8b559a76a54875f6a8f970366
+  metadata.gz: 0396359b0204b2a96ee73ee5cd646cc99e6fa5ad052c2d278f5c3c57973de3dc5733de653aa389704a78abd771743e8bdcbf29667834e17f7e6b54661cfe9c68
+  data.tar.gz: 1d4e5185c2f5bb5a6b40af491908aa80af4d19c0c05af1a436c95d807610d719d80963f909696fe1ff69b4df0b7640d282390fff7577fb3cb7003a5662ee14db

data/Gemfile

@@ -3,13 +3,18 @@ source "http://rubygems.org"
 # Example:
    gem "coderunner", ">= 0.15.5"
    gem "text-data-tools", ">= 1.1.3"
-	 gem "gs2crmod", ">=0.11.33"
+	 gem "gs2crmod", ">=0.11.76"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  #gem "shoulda", ">= 0"
+  #gem "rdoc", "~> 3.12"
+  #gem "bundler", "> 1.0.0"
+  #gem "jeweler", ">= 2.0.0"
+  gem "shoulda", " 3.0.1"
   gem "rdoc", "~> 3.12"
   gem "bundler", "> 1.0.0"
-  gem "jeweler", ">= 2.0.0"
+  gem "jeweler", ">= 1.8.4"
+	gem "minitest", "~> 4"
 end

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/trinitycrmod/trinity.rb

@@ -133,15 +133,17 @@ class CodeRunner
 			if new_run.flux_option == "gs2" and @flux_option == "gs2" and not new_run.no_restart_gs2
 				for i in 0...n_flux_tubes
           break if i >= new_run.n_flux_tubes
-          if i >= n_flux_tubes_jac
-            jn = i - n_flux_tubes_jac + 1
-            #run_name = "calibrate_" + @run_name + (jn).to_s
-            folder = "calibrate_#{jn}"
-          else
-            jn = i + 1
-            #run_name = @run_name + (jn).to_s
-            folder = "flux_tube_#{jn}"
-          end 
+          #if i >= n_flux_tubes_jac
+            #jn = i - n_flux_tubes_jac + 1
+            ##run_name = "calibrate_" + @run_name + (jn).to_s
+            #folder = "calibrate_#{jn}"
+          #else
+            #jn = i + 1
+            ##run_name = @run_name + (jn).to_s
+            #folder = "flux_tube_#{jn}"
+          #end 
+          #
+          folder = gs2_folder_name(i)
 
 					new_run.gs2_runs[i].directory = new_run.directory + "/#{folder}"
 					FileUtils.makedirs(new_run.gs2_runs[i].directory)
@@ -261,16 +263,19 @@ class CodeRunner
 				gs2run = gs2_runs[i]
 				#ep ['gs2_runs[i] in generate', gs2_runs[i].nwrite]
 				#p ['i',i]
-        if i >= n_flux_tubes_jac
-          jn = i - n_flux_tubes_jac + 1
-          run_name = "calibrate_" + @run_name + (jn).to_s
-          folder = "calibrate_#{jn}"
-        else
-          jn = i + 1
-          run_name = @run_name + (jn).to_s
-          folder = "flux_tube_#{jn}"
-        end 
-
+        #if i >= n_flux_tubes_jac
+          #jn = i - n_flux_tubes_jac + 1
+          #run_name = "calibrate_" + @run_name + (jn).to_s
+          #folder = "calibrate_#{jn}"
+        #else
+          #jn = i + 1
+          #run_name = @run_name + (jn).to_s
+          #folder = "flux_tube_#{jn}"
+        #end 
+
+        folder = gs2_folder_name(i)
+        run_name = gs2_run_name(i)
+        
 				if @subfolders and @subfolders.fortran_true?
 					gs2run.directory = @directory + "/" + folder
 					FileUtils.makedirs(gs2run.directory)
@@ -363,7 +368,7 @@ class CodeRunner
 					#component.status = @status
 			#p ["HERE2", @component_runs.size, @component_runs[i]]
 					#Dir.chdir(@directory) {
-						compdir = "flux_tube_#{i+1}"
+						compdir = gs2_folder_name(i) #  "flux_tube_#{i+1}"
 						Dir.chdir(compdir){component.process_directory} if FileTest.exist? compdir
 					#}
 					component.component_runs = []

data/lib/trinitycrmod/trinity_gs2.rb

@@ -125,6 +125,27 @@ EOF2
 		def flux_gs2?
 			@flux_option == "gs2"
 		end
+
+    def gs2_run_name(i)
+      if i >= n_flux_tubes_jac
+        jn = i - n_flux_tubes_jac + 1
+        run_name = "calibrate_" + @run_name + (jn).to_s
+      else
+        jn = i + 1
+        run_name = @run_name + (jn).to_s
+      end 
+      run_name
+    end
+    def gs2_folder_name(i)
+      if i >= n_flux_tubes_jac
+        jn = i - n_flux_tubes_jac + 1
+        folder = "calibrate_#{jn}"
+      else
+        jn = i + 1
+        folder = "flux_tube_#{jn}"
+      end 
+      folder
+    end
 	end
 
 end

data/trinitycrmod.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.5.3 ruby lib
+# stub: trinitycrmod 0.5.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2015-01-25"
+  s.date = "2015-01-26"
   s.description = "This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport solver for Fusion Reactors, to harness the power of CodeRunner, a framework for the automated running and analysis of simulations."
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [
@@ -50,28 +50,31 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<coderunner>, [">= 0.15.5"])
       s.add_runtime_dependency(%q<text-data-tools>, [">= 1.1.3"])
-      s.add_runtime_dependency(%q<gs2crmod>, [">= 0.11.33"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<gs2crmod>, [">= 0.11.76"])
+      s.add_development_dependency(%q<shoulda>, ["= 3.0.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_development_dependency(%q<minitest>, ["~> 4"])
     else
       s.add_dependency(%q<coderunner>, [">= 0.15.5"])
       s.add_dependency(%q<text-data-tools>, [">= 1.1.3"])
-      s.add_dependency(%q<gs2crmod>, [">= 0.11.33"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<gs2crmod>, [">= 0.11.76"])
+      s.add_dependency(%q<shoulda>, ["= 3.0.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_dependency(%q<minitest>, ["~> 4"])
     end
   else
     s.add_dependency(%q<coderunner>, [">= 0.15.5"])
     s.add_dependency(%q<text-data-tools>, [">= 1.1.3"])
-    s.add_dependency(%q<gs2crmod>, [">= 0.11.33"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<gs2crmod>, [">= 0.11.76"])
+    s.add_dependency(%q<shoulda>, ["= 3.0.1"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+    s.add_dependency(%q<minitest>, ["~> 4"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.33
+        version: 0.11.76
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.33
+        version: 0.11.76
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport
   solver for Fusion Reactors, to harness the power of CodeRunner, a framework for
   the automated running and analysis of simulations.