gs2crmod 0.11.84 → 0.11.85

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/gs2crmod.gemspec +3 -3
  4. data/lib/gs2crmod/gs2.rb +44 -41
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: afe9bc09c0cb05b8fe04ad88092ced9c58e3c0cf
4
- data.tar.gz: d3b86651715e91ada6e8b653caed22f6bbd19e35
3
+ metadata.gz: 7940a19eb719531ed06ee4b1e898068b7e8d2ab0
4
+ data.tar.gz: 083c2ab1b9205a6a374f91952f6ce78f7cac3786
5
5
  SHA512:
6
- metadata.gz: c95f84c4a41d777f8c9c0bfe20117b585b441b625d670ce8580cfcbdc47afc6b23e627e7d81c1a52c6197343605da6f2ff53a518ee993beb90ce23f4dc8904f8
7
- data.tar.gz: f5177255f69673f67065f7c2b7e37d1dd5475ec4395e47323363f3cd3802ef4c49eb5ba18448264a9b4eab000eec354120cdf6874a76ecbfc7015540c165e7c1
6
+ metadata.gz: f4efdf8ba32a8f97ad52938d4ab35538cb05ae44018d1d6632cd2b3dbe6097b98ef578209483f526c5c77c727991def361407f348f09b4b1556dcbc8e01945c8
7
+ data.tar.gz: f3269ef0b4d623b45296f11f283c6ad822d387b11349172720228330858ec495103f694c3715c1e36fa5d55f7f7a2503e7673015f49a5722c9fcdf70264fe56e
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.11.84
1
+ 0.11.85
data/gs2crmod.gemspec CHANGED
@@ -2,17 +2,17 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: gs2crmod 0.11.84 ruby lib
5
+ # stub: gs2crmod 0.11.85 ruby lib
6
6
  # stub: ext/extconf.rb
7
7
 
8
8
  Gem::Specification.new do |s|
9
9
  s.name = "gs2crmod"
10
- s.version = "0.11.84"
10
+ s.version = "0.11.85"
11
11
 
12
12
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
13
13
  s.require_paths = ["lib"]
14
14
  s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
15
- s.date = "2014-12-19"
15
+ s.date = "2015-01-06"
16
16
  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."
17
17
  s.email = "edmundhighcock@sourceforge.net"
18
18
  s.extensions = ["ext/extconf.rb"]
data/lib/gs2crmod/gs2.rb CHANGED
@@ -1122,64 +1122,67 @@ attr_accessor :iphi00, :saturation_time #Necessary for back. comp. due to an old
1122
1122
 
1123
1123
  folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
1124
1124
 
1125
- SPECIES_DEPENDENT_NAMELISTS = eval(File.read(folder + '/species_dependent_namelists.rb'), binding, folder + '/species_dependent_namelists.rb')
1126
- #
1127
- SPECIES_DEPENDENT_VARIABLES_WITH_HELP = SPECIES_DEPENDENT_NAMELISTS.values.inject({}) do |hash, namelist_hash|
1128
- namelist_hash[:variables].each do |var, var_hash|
1129
- hash[var] = var_hash[:help]
1130
- end
1131
- hash
1132
- end
1125
+ SPECIES_DEPENDENT_NAMELISTS = eval(File.read(folder + '/species_dependent_namelists.rb'), binding, folder + '/species_dependent_namelists.rb')
1133
1126
 
1134
- SPECIES_DEPENDENT_VARIABLES = SPECIES_DEPENDENT_VARIABLES_WITH_HELP.keys
1135
- SPECIES_DEPENDENT_VARIABLES.each{|var| attr_accessor var} # for backwards compatibility
1136
-
1137
- ['i', 'e'].each do |n|
1138
- SPECIES_DEPENDENT_VARIABLES_WITH_HELP.each do |name, help|
1139
- attr_accessor name + "_#{n}".to_sym #for backwards compatibility
1127
+ SPECIES_DEPENDENT_VARIABLES_WITH_HELP = SPECIES_DEPENDENT_NAMELISTS.values.inject({}) do |hash, namelist_hash|
1128
+ namelist_hash[:variables].each do |var, var_hash|
1129
+ hash[var] = var_hash[:help]
1130
+ end
1131
+ hash
1140
1132
  end
1141
- end
1142
-
1143
- old_vars = %w[
1144
- :TiTe
1145
- :Rmaj
1146
- :R_geo
1147
- :invLp_input
1148
- :D_hypervisc
1149
- :D_hyperres
1150
- :D_hyper
1151
- :C_par
1152
- :C_perp
1153
- ].map{|n| n.to_s.sub(/^:/, '').to_sym}
1154
-
1155
- old_vars.each do |var|
1156
- alias_method(var, var.to_s.downcase.to_sym)
1157
- alias_method("#{var}=".to_sym, "#{var.downcase}=".to_sym)
1158
- end
1159
-
1160
1133
 
1134
+ SPECIES_DEPENDENT_VARIABLES = SPECIES_DEPENDENT_VARIABLES_WITH_HELP.keys
1135
+ SPECIES_DEPENDENT_VARIABLES.each{|var| attr_accessor var} # for backwards compatibility
1161
1136
 
1137
+ ['i', 'e'].each do |n|
1138
+ SPECIES_DEPENDENT_VARIABLES_WITH_HELP.each do |name, help|
1139
+ attr_accessor name + "_#{n}".to_sym #for backwards compatibility
1140
+ end
1141
+ end
1162
1142
 
1163
- def run_namelist_backwards_compatibility
1164
- SPECIES_DEPENDENT_VARIABLES.each do |var|
1165
- set(var + "_1".to_sym, (send(var + "_1".to_sym) or send(var + "_i".to_sym) or send(var)))
1166
- set(var + "_2".to_sym, (send(var + "_2".to_sym) or send(var + "_e".to_sym)))
1143
+ old_vars = %w[
1144
+ :TiTe
1145
+ :Rmaj
1146
+ :R_geo
1147
+ :invLp_input
1148
+ :D_hypervisc
1149
+ :D_hyperres
1150
+ :D_hyper
1151
+ :C_par
1152
+ :C_perp
1153
+ ].map{|n| n.to_s.sub(/^:/, '').to_sym}
1154
+
1155
+ old_vars.each do |var|
1156
+ alias_method(var, var.to_s.downcase.to_sym)
1157
+ alias_method("#{var}=".to_sym, "#{var.downcase}=".to_sym)
1167
1158
  end
1168
- end
1169
1159
 
1160
+ def run_namelist_backwards_compatibility
1161
+ SPECIES_DEPENDENT_VARIABLES.each do |var|
1162
+ set(var + "_1".to_sym, (send(var + "_1".to_sym) or send(var + "_i".to_sym) or send(var)))
1163
+ set(var + "_2".to_sym, (send(var + "_2".to_sym) or send(var + "_e".to_sym)))
1164
+ end
1165
+ end
1170
1166
 
1171
- def stop
1172
- `touch #@directory/#@run_name.stop`
1173
- end
1167
+ def stop
1168
+ `touch #@directory/#@run_name.stop`
1169
+ end
1174
1170
 
1175
1171
  def vim_output
1176
1172
  system "vim -Ro #{output_file} #{error_file} #@directory/#@run_name.error #@directory/#@run_name.out "
1177
1173
  end
1178
1174
  alias :vo :vim_output
1175
+
1176
+ def vim_input
1177
+ system "vim -Ro #@directory/#@run_name.in "
1178
+ end
1179
+ alias :vi :vim_input
1180
+
1179
1181
  def vim_stdout
1180
1182
  system "vim -Ro #{output_file} "
1181
1183
  end
1182
1184
  alias :vo1 :vim_stdout
1185
+
1183
1186
  def plot_efit_file
1184
1187
  Dir.chdir(@directory) do
1185
1188
  text = File.read(@eqfile)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gs2crmod
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.84
4
+ version: 0.11.85
5
5
  platform: ruby
6
6
  authors:
7
7
  - Edmund Highcock
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-12-19 00:00:00.000000000 Z
12
+ date: 2015-01-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: coderunner