coderunner 0.13.0 → 0.13.1

data/VERSION

@@ -1 +1 @@
-0.13.0
+0.13.1

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.13.0"
+  s.version = "0.13.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-08-09"
+  s.date = "2013-08-13"
   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

@@ -882,15 +882,16 @@ end
 
 # This method takes the help written into this module for the various input parameters and writes it in a format suitable for the mediawiki page on input parameters. 
 
-def self.write_mediawiki_documentation
-	puts <<EOF
+def self.write_mediawiki_documentation(filename = "#{rcp.code}_mediawiki.txt")
+	File.open(filename, 'w') do |file|
+	file.puts <<EOF
 =Introduction=
 
-This page lists every GS2 input parameter currently known about, along with any help available. It is intended as a reference, not an introduction. Note: some parameters are highly specialised and not intended for general use.
+This page lists every #{rcp.code} input parameter currently known about, along with any help available. It is intended as a reference, not an introduction. Note: some parameters are highly specialised and not intended for general use.
 
 A full introduction to writing input files is to be written, but until then, this is an old example input file. Be aware that not every section should be included.
 
-[[GS2 Reference Input File]]
+[[#{rcp.code} Reference Input File]]
 
 ==Format==
 
@@ -900,8 +901,8 @@ The parameters are divided into namelists. Each parameter has type information a
 ! Name !! Type !! Def !! CR Name !! Description 
 |-
 |-
-|Name as it appears in GS2 ||  Fortran Data Type ||  Autoscanned Default(s): guesses at what the default value of this parameter will be if you do not specify it in the input file. They are usually correct.
-|| CodeRunner Name: is the variable name used by [http://coderunner.sourceforge.net CodeRunner] to refer to the quantity (only given if it is different to the GS2 name). 
+|Name as it appears in #{rcp.code} ||  Fortran Data Type ||  Autoscanned Default(s): guesses at what the default value of this parameter will be if you do not specify it in the input file. They are usually correct.
+|| CodeRunner Name: is the variable name used by [http://coderunner.sourceforge.net CodeRunner] to refer to the quantity (only given if it is different to the #{rcp.code} name). 
 |
 Long and detailed help for the variable
 |}
@@ -913,25 +914,26 @@ This page is automatically generated by [http://coderunner.sourceforge.net CodeR
 
 =Namelists=
 
-Each GS2 module is controlled by its own namelist. For typical applications, not all 32+ namelists should appear in a single file. For a run called runname, this file should be called <tt>runname.in</tt>. In most cases, defaults are loaded for each namelist element, so that if a namelist or  element does not appear, the run will not automatically stop. (It may still be forced to stop if the defaults are incompatible with your other choices.) The namelists and defaults appear below.
+Each #{rcp.code} module is controlled by its own namelist. For typical applications, not all 32+ namelists should appear in a single file. For a run called runname, this file should be called <tt>runname.in</tt>. In most cases, defaults are loaded for each namelist element, so that if a namelist or  element does not appear, the run will not automatically stop. (It may still be forced to stop if the defaults are incompatible with your other choices.) The namelists and defaults appear below.
 EOF
 
 	rcp.namelists.each do |namelist, hash|
-		puts "==#{namelist}=="
-		puts "<!--begin namelist help-->#{hash[:help]}<!--end namelist help-->"
-		puts "\n{| border=\"2\" cellpadding=\"5\"\n! Name !! Type !! Def !! CR Name !! Description \n|-"
+		file.puts "==#{namelist}=="
+		file.puts "<!--begin namelist help-->#{hash[:help]}<!--end namelist help-->"
+		file.puts "\n{| border=\"2\" cellpadding=\"5\"\n! Name !! Type !! Def !! CR Name !! Description \n|-"
 		hash[:variables].keys.sort.each do |var|
 			var_hash = hash[:variables][var]
 			#puts "==='''[[#{(var_hash[:code_name] or var)}]]'''==="
-			puts "|-\n|'''[[#{(var_hash[:code_name] or var)}]]''' ||  #{var_hash[:type]} ||  #{(var_hash[:autoscanned_defaults]||[]).map{|v| v.to_s}.join(",")} || #{var} \n|\n<!--begin help-->*  #{hash[:variables][var][:help]} <!-- end help -->"
+			file.puts "|-\n|'''[[#{(var_hash[:code_name] or var)}]]''' ||  #{var_hash[:type]} ||  #{(var_hash[:autoscanned_defaults]||[]).map{|v| v.to_s}.join(",")} || #{var} \n|\n<!--begin help-->*  #{hash[:variables][var][:help]} <!-- end help -->"
 			#puts "''Type'': #{var_hash[:type]} "
 			#puts "''Autoscanned Defaults'': #{var_hash[:autoscanned_defaults]} "
 			#puts "''CodeRunner name'': #{var} "
 	  #puts "\n", "#{hash[:variables][var][:help]}".sub(/\A\s+/, '') if hash[:variables][var][:help]
 			#puts " #{(var_hash[:code_name] or var)} Properties:"
 		end
-		puts "|}"
+		file.puts "|}"
 	end
+	end #file.open
 end
 			
 # This method takes the help written into this module for the various input parameters and writes it in a format suitable for the mediawiki page on input parameters. 

data/lib/coderunner/fortran_namelist_c.rb

@@ -15,7 +15,6 @@ class FortranNamelistC < FortranNamelist
 		#source.scan(/^\s*namelist\s*\/(?<namelist>\w+)\/(?<variables>(?:(?:&\s*[\n\r]+)|[^!\n\r])*)/) do 
 		#source.scan(Regexp.new("#{/^\s*namelist\s*\/\s*(?<namelist>\w+)\s*\//}(?<variables>#{FORTRAN_SINGLE_LINE})")) do 
 		source.scan(rcp.fortran_namelist_variable_match_regex) do
-			#p $~
 			namelist = $~[:namelist].to_s.downcase.to_sym
 			#variables = $~[:variables].gsub(/!.*/, '')
 			#eputs namelist, variables
@@ -41,13 +40,23 @@ class FortranNamelistC < FortranNamelist
 	def self.get_sample_value(source, var)
 		sample_val = nil
 		source.scan(rcp.fortran_namelist_variable_match_regex) do
+			#p $~
 			
 			next unless var == $~[:variable].to_sym
-			sample_val = eval($~[:default])
+			sample_val = eval($~[:default].sub(/(\d\.)$/, '\10').sub(/^(\.\d)/, '0\1').sub(/(\d\.)[eE]/, '\10e'))
 		end
 		raise "Couldn't get a sample value for #{var.inspect}" unless sample_val
 		return sample_val
 	end
+	def self.update_defaults_from_source_code(source_code_folder = ARGV[-1])
+		source = get_aggregated_source_code_text(source_code_folder)
+		rcp.namelists.each do |nml, nmlhash|
+			nmlhash[:variables].each do |var, varhash|
+				varhash[:autoscanned_defaults] = [get_sample_value(source, varhash[:code_name]||var)] rescue []
+				save_namelists
+			end
+		end
+	end
 
 end
 end

data/lib/cubecalccrmod/namelists.rb

@@ -10,7 +10,8 @@
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
-       :type=>:Integer},
+       :type=>:Integer,
+       :autoscanned_defaults=>[0]},
      :must_sleep=>
       {:should_include=>"true",
        :description=>nil,
@@ -19,7 +20,8 @@
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
-       :type=>:Integer},
+       :type=>:Integer,
+       :autoscanned_defaults=>[0]},
      :width=>
       {:should_include=>"true",
        :description=>nil,
@@ -29,7 +31,8 @@
         [{: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},
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
      :depth=>
       {:should_include=>"true",
        :description=>nil,
@@ -39,7 +42,8 @@
         [{: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},
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
      :height=>
       {:should_include=>"true",
        :description=>nil,
@@ -49,4 +53,5 @@
         [{: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}}}}
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]}}}}

data/test/test_coderunner.rb

@@ -372,6 +372,12 @@ class TestFortranNamelistC < Test::Unit::TestCase
 		CodeRunner.setup_run_class('cubecalc', modlet: 'with_namelist')
 		assert_equal(File.read('test/cubecalc_namelist.cc').size+1, CodeRunner::Cubecalc::WithNamelist.get_aggregated_source_code_text('test').size)
 		CodeRunner::Cubecalc::WithNamelist.synchronise_variables('test')
+		CodeRunner::Cubecalc::WithNamelist.update_defaults_from_source_code('test')
+	end
+	def test_mediawiki_write
+		CodeRunner.setup_run_class('cubecalc', modlet: 'with_namelist')
+		CodeRunner::Cubecalc::WithNamelist.write_mediawiki_documentation
+		FileUtils.rm 'cubecalc_mediawiki.txt'
 	end
 	def tfolder
 		'test/submit_with_namelist'

metadata

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