mesa_script 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4825bb6f1d2a1b6dcb3b4dbc7daf67235b177b98
-  data.tar.gz: 338994544043aa2f860e76fe96fb38c7bbb5a702
+  metadata.gz: c5625fddbfb3e4c4f87d42ddc201c5adb6b45a75
+  data.tar.gz: 8b5e505dd02e1d65d84bd0bea5aaeef49076105b
 SHA512:
-  metadata.gz: a72fdf26c9703a5e7e158d5d525cafe7a34107afefa607789953b3ed40ed4a065c232f85f7c4ee778541b850dbb94bc6aa68695148c2e90f475b72592122f575
-  data.tar.gz: 80a2945a09ae31dc6bf664bd7d5f57d9ed1bb94de755b9ddc920a6823371ac5a3984042ef71973910617a6c0d87db7e563cc0689bde8a015deb9555f6401fba7
+  metadata.gz: b6659a3b7d8b6cc11a59778c5fea9932ecead35b1a1ff2d8b14416e118414a1ebd306d36bd934fd15cd85aed75de65c6440439f65c7dd7ef393e4d10b5036d40
+  data.tar.gz: 1d365d16c557a9f06b055d643dc56f5ffe3f29de9487a444da6691a9a041180fb7a9586241cda93c37fed8a1fa93320ee2f8aa13aed2565cd283e25fb73f2682

data/lib/mesa_script.rb

@@ -3,6 +3,21 @@ InlistItem = Struct.new(:name, :type, :value, :namelist, :order, :is_arr,
 
 class Inlist
 
+  # Get access to current MESA version.
+  def self.version
+    v_num = IO.read(File.join(ENV['MESA_DIR'], 'data', 'version_number')).to_i
+    return v_num
+  end
+
+  # Determine proper file suffix for fortran source
+  def self.f_end
+    if Inlist.version >= 7380
+      "f90"
+    else
+      "f"
+    end
+  end
+
 
   @inlist_data = {}
   # Different namelists can be added or subtracted if MESA should change or
@@ -14,9 +29,10 @@ class Inlist
   ################## POINT TO .INC FILES HERE ####################
   @nt_files = {
                 'star_job' => %w{star_job_controls.inc},
-                'controls' => %w{star_controls.inc ctrls_io.f},
+                'controls' => %w{star_controls.inc},
                 'pgstar'   => %w{pgstar_controls.inc}
               }
+  @nt_files['controls'] << "ctrls_io.#{f_end}"
   # User can specify a custom name for a namelist defaults file. The default
   # is simply the namelist name followed by '.defaults'
 
@@ -240,8 +256,8 @@ class Inlist
       puts "WARNING: 'type' values are currently unsupported (regarding #{name}) because your humble author has no idea what they look like in an inlist. You should tell him what to do at wmwolf@physics.ucsb.edu. Your input, #{value}, has been passed through to your inlist verbatim."
       return value.to_s
     else
-      raise "Error parsing value for namelist item #{name}: #{value}." +
-            " Expected type was #{type}."
+      raise "Error parsing value for namelist item #{name}: #{value}. Expected "
+            "type was #{type}."
     end
   end
 
@@ -424,9 +440,9 @@ class Inlist
             is_arr = true
             num_indices = name.count('!') + 1
             name.sub!(/\(.*\)/, '')
-          elsif pair[0] =~ /dimension\((.*)\)/ 
+          elsif pair[0] =~ /dimension\((.*)\)/i
             is_arr = true
-            num_indices = $1.count(",") + 1
+            num_indices = $1.count(',') + 1
           end
           type_default = {:bool => false, :string => '', :float => 0.0,
                           :int => 0}

metadata

@@ -1,22 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mesa_script
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies: []
-description: "    MesaScript is a domain specific language (DSL) that allows the user
-  to write\n    inlists for MESA that include variables, loops, conditionals, etc.
-  For more\n    detailed instructions, see the readme on the github page at \n\n    https://github.com/wmwolf/MesaScript\n\n
-  \   This software requires a relatively modern installation of MESA (version >\n
-  \   5596). It has been tested on Ruby versions > 1.9, but there is no guarantee\n
-  \   it will work on older (or newer!) versions. Any bugs or requests should be\n
-  \   sent to the author, Bill Wolf, at wmwolf@physics.ucsb.edu.\n"
+description: MesaScript - a DSL for making dynamic inlists for the MESA stellar evolution
+  code.
 email: wmwolf@physics.ucsb.edu
 executables:
 - inlist2mesascript
@@ -30,7 +25,13 @@ homepage: https://wmwolf.github.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2
+    Thanks for installing MesaScript!
+
+    To learn more about how to use MesaScript and to keep up to date with its
+    features, check out the README at the project homepage:
+
+    https://github.com/wmwolf/MesaScript
 rdoc_options: []
 require_paths:
 - lib
@@ -46,9 +47,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: MesaScript - a DSL for making dynamic inlists for the MESA stellar evolution
-  code.
+summary: MesaScript is a domain specific language (DSL) that allows the user to write
+  inlists for MESA that include variables, loops, conditionals, etc. For more detailed
+  instructions, see the readme on the github page at   https://github.com/wmwolf/MesaScript  This
+  software requires a relatively modern installation of MESA (version > 5596). It
+  has been tested on Ruby versions > 1.9, but there is no guarantee it will work on
+  older (or newer!) versions. Any bugs or requests should be sent to the author, Bill
+  Wolf, at wmwolf@physics.ucsb.edu.
 test_files: []