gs2crmod 0.11.48 → 0.11.49

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5636709ad99508c1afcf2a8d471faa1c4a559085
+  data.tar.gz: 24c8a3b935da6132655a214a1d438237d4065c98
+SHA512:
+  metadata.gz: 1d422b79733e85ada9d6acc3e540e159e0424354a4fc560ee7c619b0ae416c9d7afb0db8700db6725219f5eed3b10a5baeb38206e4bae4f9928a392176e1bbf4
+  data.tar.gz: 4b3f0355c498f53bd0448d1d92c3dbb929c5fc6967ffeca1bcb447ab767fbbc07d9a3a7d0cc9d94300561d74cd93d919158476fe4ad970933f1fc910fdf9b8ce

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "coderunner", ">= 0.14.10"
+   gem "coderunner", ">= 0.14.15"
 	 gem "rubyhacks", ">= 0.1.2"
 # It seems necessary to have the following line un-commented on some systems but commented out on other systems:
   gem "ruby-netcdf-updated", ">= 0.6.6.1"

data/VERSION

@@ -1 +1 @@
-0.11.48
+0.11.49

data/gs2crmod.gemspec

@@ -2,14 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: gs2crmod 0.11.49 ruby lib
+# stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.48"
+  s.version = "0.11.49"
 
   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-04-07"
+  s.date = "2014-04-10"
   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"]
@@ -82,16 +85,15 @@ 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 = "1.8.11"
+  s.rubygems_version = "2.2.2"
   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 = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<coderunner>, [">= 0.14.10"])
+      s.add_runtime_dependency(%q<coderunner>, [">= 0.14.15"])
       s.add_runtime_dependency(%q<rubyhacks>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<ruby-netcdf-updated>, [">= 0.6.6.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -99,7 +101,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
     else
-      s.add_dependency(%q<coderunner>, [">= 0.14.10"])
+      s.add_dependency(%q<coderunner>, [">= 0.14.15"])
       s.add_dependency(%q<rubyhacks>, [">= 0.1.2"])
       s.add_dependency(%q<ruby-netcdf-updated>, [">= 0.6.6.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -108,7 +110,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 1.8.4"])
     end
   else
-    s.add_dependency(%q<coderunner>, [">= 0.14.10"])
+    s.add_dependency(%q<coderunner>, [">= 0.14.15"])
     s.add_dependency(%q<rubyhacks>, [">= 0.1.2"])
     s.add_dependency(%q<ruby-netcdf-updated>, [">= 0.6.6.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/lib/gs2crmod/gs2.rb

@@ -539,7 +539,7 @@ def restart(new_run)
 #   ep @runner.parameters
   new_run.run_name = nil
 	new_run.naming_pars = @naming_pars
-	new_run.update_submission_parameters(new_run.parameter_hash.inspect, false) if new_run.parameter_hash 
+	new_run.update_submission_parameters(new_run.parameter_hash_string, false) if new_run.parameter_hash 
 	new_run.naming_pars.delete(:restart_id)
 	new_run.generate_run_name
 	eputs 'Copying Restart files', ''
@@ -795,9 +795,9 @@ end
 def generate_input_file(&block)
 	raise CRFatal("No Input Module File Given or Module Corrupted") unless methods.include? (:input_file_text)
 	run_namelist_backwards_compatibility
-	if @restart_id and not @is_a_restart  # The second test checks that the restart function has not been called manually earlier (e.g. in Trinity)
+	if @restart_id and (not @is_a_restart or @resubmit_id)   # The second test checks that the restart function has not been called manually earlier (e.g. in Trinity), but we must check that it is not in fact a resubmitted run
 		@runner.run_list[@restart_id].restart(self)
-	elsif @save_for_restart and @save_for_restart.fortran_true? and not @is_a_restart
+	elsif @save_for_restart and @save_for_restart.fortran_true? and (not @is_a_restart or @resubmit_id)
 		@restart_dir = "nc"
 		#if CODE_OPTIONS[:gs2] and CODE_OPTIONS[:gs2][:list]
 			#FileUtils.makedirs "#{@runner.root_folder}/#@restart_dir"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.48
-  prerelease: 
+  version: 0.11.49
 platform: ruby
 authors:
 - Edmund Highcock
@@ -10,85 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: &10539420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 0.14.15
   type: :runtime
   prerelease: false
-  version_requirements: *10539420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.15
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: &10538800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *10538800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: ruby-netcdf-updated
-  requirement: &10537300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *10537300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.6.1
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &10535820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10535820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10550520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *10550520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10548440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10548440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10547460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *10547460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 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
@@ -102,7 +122,7 @@ extra_rdoc_files:
 - README.md
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -165,26 +185,25 @@ 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: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes.
 test_files: []