coderunner 0.13.12 → 0.13.13

data/VERSION

@@ -1 +1 @@
-0.13.12
+0.13.13

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.13.12"
+  s.version = "0.13.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-08-25"
+  s.date = "2013-08-27"
   s.description = "CodeRunner is a framework for the automated running and analysis of simulations. It automatically generates any necessary input files, organises the output data and analyses it. Because it is a modular system, it can easily be customised to work with any system and any simulation code. One of its greatest strengths is that it is independent of any one simulation code; thus it can easily plot and compare the data from different codes."
   s.email = "edmundhighcock@sourceforge.net"
   s.executables = ["coderunner"]

data/lib/coderunner/fortran_namelist.rb

@@ -605,6 +605,19 @@ def input_file_text
 	text
 end
 
+def formatted_variable_output(value)
+	if String::FORTRAN_BOOLS.include? value # var is a Fortran Bool, not really a string
+		output = value.to_s
+	elsif value.kind_of? Complex
+		output = "(#{value.real}, #{value.imag})"
+	#elsif value.kind_of? Array
+		#output = "(/#{value.map{|v| formatted_variable_output(v)}.join(",")}/)" 
+	else
+		#p cr_var, cr_var.class
+		output = value.inspect
+	end
+	output
+end
 # Generate the input file text for the given namelist. Called by input_file_text.
 
 def namelist_text(namelist, enum = nil)
@@ -616,16 +629,17 @@ def namelist_text(namelist, enum = nil)
 	hash[:variables].each do |var, var_hash|
 		code_var = (var_hash[:code_name] or var)
 		cr_var = var+ext.to_sym 
+		value = send(cr_var)
 		if send(cr_var) and (not var_hash[:should_include] or  eval(var_hash[:should_include]))
-			if String::FORTRAN_BOOLS.include? send(cr_var) # var is a Fortran Bool, not really a string
-				output = send(cr_var).to_s
-			elsif (v = send(cr_var)).kind_of? Complex
-				output = "(#{v.real}, #{v.imag})"
+			if value.kind_of? Array
+				value.each_with_index do |v, i|
+					output = formatted_variable_output(v)
+					text << " #{code_var}(#{i+1}) = #{output} #{var_hash[:description] ? "! #{var_hash[:description]}": ""}\n"
+				end
 			else
-				#p cr_var, cr_var.class
-				output = send(cr_var).inspect
+				output = formatted_variable_output(value)
+				text << " #{code_var} = #{output} #{var_hash[:description] ? "! #{var_hash[:description]}": ""}\n"
 			end
-			text << " #{code_var} = #{output} #{var_hash[:description] ? "! #{var_hash[:description]}": ""}\n"
 		end
 	end
 	text << "/\n\n"

data/lib/coderunner/fortran_namelist_c.rb

@@ -4,7 +4,7 @@ class FortranNamelistC < FortranNamelist
 
 	@fortran_namelist_source_file_match = /(\.c|\.cpp|\.cu|\.cc)$/
 
-	@fortran_namelist_variable_match_regex = /^[^\/]*?fnr_get_(?<type>\w+)\(\&?[\w\s]+\s*,\s*["'](?<namelist>\w+)[\d()]*?['"]\s*,\s*['"](?<variable>\w+)['"],[^)]+\)\)\s*[\w\[\]\d]+\s*=\s*(?<default>\S+)\s*;/
+	@fortran_namelist_variable_match_regex = /^[^\/]*?fnr_get_(?<type>\w+)\(\&?[\w\s]+\s*,\s*["'](?<namelist>\w+)[\d()]*?['"]\s*,\s*['"](?<variable>\w+)[()0-9]*['"],[^)]+\)\)\s*[\w\[\]\d]+\s*=\s*(?<default>\S+)\s*;/
 		#
 	# Find all input namelists and variables by scanning the source code
 	#

data/lib/cubecalccrmod/deleted_variables.rb

@@ -381,4 +381,15 @@
    :must_pass=>
     [{:test=>"kind_of? Integer",
       :explanation=>"This variable must be an integer."}],
-   :type=>:Integer}}
+   :type=>:Integer},
+ :dummy_for_arrays=>
+  {:should_include=>"true",
+   :description=>"",
+   :help=>"Tests whether the routines for writing arrays work",
+   :code_name=>:dummy_for_arrays,
+   :must_pass=>
+    [{:test=>"kind_of? Numeric",
+      :explanation=>
+       "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+   :type=>:Float,
+   :autoscanned_defaults=>[]}}

data/lib/cubecalccrmod/namelists.rb

@@ -54,6 +54,17 @@
           :explanation=>
            "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
        :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
+     :dummy_for_arrays=>
+      {:should_include=>"true",
+       :description=>"",
+       :help=>"",
+       :code_name=>:dummy_for_arrays,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
        :autoscanned_defaults=>[1.0]}}},
  :parameters=>{:description=>"", :should_include=>"true", :variables=>{}},
  :kt_grids_knobs=>{:description=>"", :should_include=>"true", :variables=>{}},

data/test/cubecalc.in

@@ -4,4 +4,5 @@
   width = 2.7
   depth = 3.9
   height = 8.2
+  dummy_for_arrays = 1.0
 /

data/test/cubecalc_namelist.cc

@@ -736,9 +736,11 @@ int main(int argc, char* argv[]){
 	}
 	
 	float* edges = new float[3];
+	float dummy_for_arrays;
 	if (fnr_get_float(&namelist_file, "cubecalc", "width", &edges[0])) edges[0] = 1.0;
 	if (fnr_get_float(&namelist_file, "cubecalc", "depth", &edges[1])) edges[1] = 1.0;
 	if (fnr_get_float(&namelist_file, "cubecalc", "height", &edges[2])) edges[2] = 1.0;
+	if (fnr_get_float(&namelist_file, "cubecalc", "dummy_for_arrays(1)", &dummy_for_arrays)) dummy_for_arrays = 1.0;
 	printf("edges[0] %f\n", edges[0]);
 	
 	

data/test/test_coderunner.rb

@@ -21,7 +21,7 @@ $coderunner_command = "#{$ruby_command}  -I lib/ lib/coderunner.rb"
 	#raise "Couldn't build test program using #{string}" unless system string
 #end
 
-if false
+if true
 class TestSubmission  < Test::Unit::TestCase
 	def setup
 		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
@@ -363,7 +363,7 @@ end # if false/true
 #end
 #
 #
-#ENV['CR_NON_INTERACTIVE'] = 'true'
+ENV['CR_NON_INTERACTIVE'] = 'true'
 class TestFortranNamelistC < Test::Unit::TestCase
 	def setup
 	end
@@ -389,7 +389,7 @@ class TestFortranNamelistC < Test::Unit::TestCase
 		CodeRunner::Cubecalc::WithNamelist.make_new_defaults_file('cubecalctest', 'test/cubecalc.in')
 		FileUtils.mv('cubecalctest_defaults.rb', CodeRunner::Cubecalc::WithNamelist.rcp.user_defaults_location + '/cubecalctest_defaults.rb')
 		FileUtils.makedirs(tfolder)
-		CodeRunner.submit(C: 'cubecalc', m: 'with_namelist', Y: tfolder, X: Dir.pwd + '/test/cubecalc_namelist', D: 'cubecalctest')
+		CodeRunner.submit(C: 'cubecalc', m: 'with_namelist', Y: tfolder, X: Dir.pwd + '/test/cubecalc_namelist', D: 'cubecalctest', p: '{dummy_for_arrays: [0.5, 0.6]}')
 		CodeRunner.status(Y: tfolder)
 		runner = CodeRunner.fetch_runner(Y: tfolder)
 		assert_equal(86.35, runner.run_list[1].volume.round(2))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.13.12
+  version: 0.13.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit