coderunner 0.13.13 → 0.13.14

data/VERSION

@@ -1 +1 @@
-0.13.13
+0.13.14

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.13.13"
+  s.version = "0.13.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-08-27"
+  s.date = "2013-08-28"
   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/class_methods.rb

@@ -358,12 +358,14 @@ EOF
         Dir.entries(tl).grep(/(^.*)\.start/).each do |file|
           file =~ (/(^.*)\.start/)
           id = $1
-          command = File.read tl + '/' + file
+					command = ""
+          command = File.read tl + '/' + file while command == ""
           pid = fork do
             processes.each do |wpid|
 							# Make sure all previously submitted jobs have finished.
               sleep refresh.to_i while %x[ps -e -o pid,ppid].split("\n").grep(Regexp.new("^\\s*#{wpid}\\s+#{ppid}")).size > 0
             end              
+						#p ["command", command]
             exec(command)
           end
 					`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`

data/lib/coderunner/fortran_namelist.rb

@@ -1177,7 +1177,11 @@ def self.delete_old_variables(all_variables_in_source)
 		end
 	end
 	if variables_to_delete.find{|namelist, var_array| var_array.size > 0}
-		delete_old = Feedback.get_boolean("These variables are no longer present in the #{rcp.code_long} source folder. Do you wish to delete them?")
+		unless ENV['CR_NON_INTERACTIVE']
+			delete_old = Feedback.get_boolean("These variables are no longer present in the #{rcp.code_long} source folder. Do you wish to delete them?")
+		else
+			delete_old = true
+		end
 		if delete_old
 			variables_to_delete.each do |namelist, var_array|
 				var_array.each do |var|

data/lib/cubecalccrmod/deleted_variables.rb

@@ -392,4 +392,14 @@
       :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=>[]},
+ :dummy_complex=>
+  {:should_include=>"true",
+   :description=>nil,
+   :help=>nil,
+   :code_name=>:dummy_complex,
+   :must_pass=>
+    [{:test=>"kind_of? Complex",
+      :explanation=>"This variable must be a complex number."}],
+   :type=>:Complex,
    :autoscanned_defaults=>[]}}

data/lib/cubecalccrmod/namelists.rb

@@ -65,7 +65,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]}}},
+       :autoscanned_defaults=>[1.0]},
+     :dummy_complex=>
+      {:should_include=>"true",
+       :description=>nil,
+       :help=>nil,
+       :code_name=>:dummy_complex,
+       :must_pass=>
+        [{:test=>"kind_of? Complex",
+          :explanation=>"This variable must be a complex number."}],
+       :type=>:Complex,
+       :autoscanned_defaults=>[]}}},
  :parameters=>{:description=>"", :should_include=>"true", :variables=>{}},
  :kt_grids_knobs=>{:description=>"", :should_include=>"true", :variables=>{}},
  :kt_grids_single_parameters=>

data/test/cubecalc.in

@@ -5,4 +5,5 @@
   depth = 3.9
   height = 8.2
   dummy_for_arrays = 1.0
+  dummy_complex = (0.5, 5.0)
 /

data/test/cubecalc_namelist.cc

@@ -17,7 +17,7 @@ using namespace std;
 
 
 
-int FNR_DEBUG=0;
+int FNR_DEBUG=1;
 
 void fnr_error_message(char * message, int exit)
 {
@@ -230,7 +230,7 @@ void fnr_match_variables(char * text, char ** variable_names, char ** variable_v
 
 /* Compile regular expression */
 	/*reti = regcomp(&regex, "(^|\n)[[:space:]]*([_[:alnum:]]+)([[:blank:]]|=)[[:space:]]*=[[:space:]]*(\"([^\"]|\\\\|\\\")+\"|'([[^']|\\\\|\\')+'|[[:alnum:].+-]+)([[:blank:]\r\n]|!)", REG_EXTENDED|REG_NEWLINE);*/
-	reti = regcomp(&regex, "(^|\n|\r)[[:space:]]*([_[:alnum:]()]+)([[:blank:]]+=|=)[[:blank:]]*(\"([^\"]|\\\\|\\\")+\"|'([^']|\\\\|\\')+'|[[:alnum:].+-]+)([[:blank:]\r\n]|!)", REG_EXTENDED|REG_NEWLINE);
+	reti = regcomp(&regex, "(^|\n|\r)[[:space:]]*([_[:alnum:]()]+)([[:blank:]]+=|=)[[:blank:]]*(\"([^\"]|\\\\|\\\")+\"|'([^']|\\\\|\\')+'|[[:alnum:].+-]+|[(][[:blank:]]*[[:alnum:].+-]+[[:blank:]]*,[[:blank:]]*[[:alnum:].+-]+[)])([[:blank:]\r\n]|!)", REG_EXTENDED|REG_NEWLINE);
 	if( reti ){ fprintf(stderr, "Could not compile regex for matching namelist names and texts\n"); exit(1); }
   int i = 0;
 

data/test/test_coderunner.rb

@@ -45,6 +45,8 @@ class TestSubmission  < Test::Unit::TestCase
 	def test_status_loop
 		unless ENV['SHORT_TEST']
 			ENV['CODE_RUNNER_LAUNCHER'] = '42323490qw4q4432407Q2342U3'
+			#@mutex = Mutex.new
+			#@launcher_started =
 			@thread = Thread.new{CodeRunner.start_launcher(0.5,10)}
 			sleep 0.1 while not FileTest.exist?(CodeRunner.launcher_directory)
 			CodeRunner.submit(Y: 'test/submission_results', C: 'cubecalc', m: 'sleep', X: Dir.pwd + '/test/submission_results/cubecalc', p: '{sleep_time: 2}')
@@ -389,7 +391,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', p: '{dummy_for_arrays: [0.5, 0.6]}')
+		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], dummy_complex: [Complex(0.4,0.5), Complex(1.3, 3.4)]}')
 		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.13
+  version: 0.13.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit