gs2crmod 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2012-12-13"
+  s.date = "2013-02-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

@@ -812,6 +812,37 @@ def actual_number_of_processors
 	@nprocs.split('x').map{|n| n.to_i}.inject(1){|ntot, n| ntot*n}
 end
 
+alias :anop :actual_number_of_processors
+
+def approximate_grid_size
+	case @grid_option
+	when "box"
+	(2*(@nx-1)/3+1).to_i * (@naky||(@ny-1)/3+1).to_i * @ntheta * (2 * @ngauss + @ntheta/2).to_i * @negrid * 2 * @nspec
+	else
+		@ntheta * (2 * @ngauss + @ntheta/2).to_i * @negrid * 2 * @nspec
+	end
+end
+
+alias :agridsze :approximate_grid_size
+
+# Gives a guess as to the maximum number of meshpoints which
+# can be parallelized (i.e. excluding ntheta)
+#
+def parallelizable_meshpoints
+	approximate_grid_size / ntheta
+end
+
+# Gives a guess as to the maximum number of nodes which can be
+# can be utilized on the current system
+#
+def estimated_nodes
+	parallelizable_meshpoints / max_ppn
+end
+
+alias :estnod :estimated_nodes
+
+																
+
 
 def parameter_string
 		return "#{@run_name}.in"

data/lib/gs2crmod/ingen.rb

@@ -118,6 +118,9 @@ def ingen
 	warning("You have set both ny and naky; naky will override ny.") if @ny and @naky
 
 	error("Boundary options should not be periodic with finite magnetic shear") if @boundary_option == "periodic" and ((@s_hat_input and @s_hat_input.abs > 1.0e-6) or (@shat and @shat.abs > 1.0e-6))
+
+	error("abs(shat) should not be less that 1.0e-6") if @shat and @shat.abs < 1.0e-6
+	error("abs(s_hat_input) should not be less that 1.0e-6") if @s_hat_input and @s_hat_input.abs < 1.0e-6
 	
 	# delt 
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner