trinitycrmod 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3788bcbc29ded836f802b5518cadcd6ab43d63a
-  data.tar.gz: d424a268d8963c2b6552a2d76c498e766b575c3b
+  metadata.gz: 5ac9c19e9dada81c1e6a71927804d2871931e915
+  data.tar.gz: f4a0b5d4baa473fdce6ee84b071948aca3919958
 SHA512:
-  metadata.gz: 5e0b8b1e215404494e781c614383003a8ca4bbc4e01d478f357ce48127c912bc8b3c30a969a0bf36a8dad7520233d774ebcbf2a24e032157ff457aace88cfd39
-  data.tar.gz: e1e0db51972179aaa8ebd26f9037745372749b91a3b4d5ade0e535e95abf6b37cd487bd017069fe23525b0f95a6fc0c6dfd38a285d4531bc7a8970ed5d28584f
+  metadata.gz: c5ef5ad0a3aebd7ee5412e939f6dbb6f88f92d6832ca22009e2aee4f840135055c438009c66ace33841fcd2b257097fba4444f0bd3e42019f2fb14ea4e688d44
+  data.tar.gz: b229817ccdabf6cfb7ee4cfdc1872a2c24fb21a46d4546896993d67dc473346f5067c2305255fdb5311e66c2bb2d0d24c4e3e3034af6c0e455d0dfd36d8a008f

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/trinitycrmod/chease.rb

@@ -2,11 +2,31 @@ class CodeRunner::Trinity
 	def uses_chease?
 		@geo_option == "chease" or @init_option == "chease" or @species_option == "chease"
 	end
+  def chease_run
+    CodeRunner.setup_run_class('chease')
+    chrun = CodeRunner::Chease.new(@runner)
+    raise 'No chease input file' unless FileTest.exist?(chfile=@directory + '/chease/chease_namelist')
+    chrun.instance_eval(CodeRunner::Chease.defaults_file_text_from_input_file(chfile))
+    #puts ['chrun1', chrun.nsurf, self.class.defaults_file_text_from_input_file(chfile), chfile]
+    return chrun
+  end
 	def setup_chease
 		ep "Setting up chease files..."
-		FileUtils.mkdir('chease') unless FileTest.exist? 'chease'
-		origfile = @runner.root_folder + '/ogyropsi.dat'
-		FileUtils.cp(origfile, 'chease/ogyropsi.dat') if FileTest.exist? origfile
+    if evolve_geometry.fortran_true?
+      FileUtils.cp_r(@gs_folder, 'chease')
+      chrun = chease_run
+      chrun.neqdsk = 0 # Use EXPEQ
+      chrun.nsurf = 6
+      puts ['chrun2', chrun.nsurf]
+      chrun.nppfun = 4 # Pres profile from EXPEQ
+      chrun.nfunc = 4 # Current func
+      chrun.nopt = -1 # Use prev soln for initial 
+      Dir.chdir(@directory + '/chease/'){chrun.write_input_file}
+    else
+      FileUtils.mkdir('chease') unless FileTest.exist? 'chease'
+      origfile = @runner.root_folder + '/ogyropsi.dat'
+      FileUtils.cp(origfile, 'chease/ogyropsi.dat') if FileTest.exist? origfile
+    end
 	end
 
 end

data/lib/trinitycrmod/trinity.rb

@@ -32,6 +32,9 @@ class CodeRunner
     CodeRunner.setup_run_class('gs2')
     require 'trinitycrmod/trinity_gs2'
 
+    # Setup gryfx in case people are using it
+    CodeRunner.setup_run_class('gryfx')
+
     ################################################
     # Quantities that are read or determined by CodeRunner
     # after the simulation has ended
@@ -57,7 +60,7 @@ class CodeRunner
 
     @code_long="Trinity Turbulent Transport Solver"
 
-    @run_info=[:time, :is_a_restart, :restart_id, :restart_run_name, :completed_timesteps, :percent_complete, :no_restart_gs2]
+    @run_info=[:time, :is_a_restart, :restart_id, :restart_run_name, :completed_timesteps, :percent_complete, :no_restart_gs2, :gs_folder]
 
     @uses_mpi = true
 
@@ -66,7 +69,7 @@ class CodeRunner
     @naming_pars = []
 
     #  Any folders which are a number will contain the results from flux simulations.
-    @excluded_sub_folders = (1...1000).to_a.map{|i| "flux_tube_" + i.to_s}
+    @excluded_sub_folders = (1...1000).to_a.map{|i| "flux_tube_" + i.to_s} + ['chease']
 
     #  A hook which gets called when printing the standard run information to the screen using the status command.
     def print_out_line

data/trinitycrmod.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.7.2 ruby lib
+# stub: trinitycrmod 0.7.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2015-07-20"
+  s.date = "2015-07-24"
   s.description = "This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport solver for Fusion Reactors, to harness the power of CodeRunner, a framework for the automated running and analysis of simulations."
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner