trinitycrmod 0.7.2 → 0.7.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/trinitycrmod/chease.rb +23 -3
- data/lib/trinitycrmod/trinity.rb +5 -2
- data/trinitycrmod.gemspec +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5ac9c19e9dada81c1e6a71927804d2871931e915
|
4
|
+
data.tar.gz: f4a0b5d4baa473fdce6ee84b071948aca3919958
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c5ef5ad0a3aebd7ee5412e939f6dbb6f88f92d6832ca22009e2aee4f840135055c438009c66ace33841fcd2b257097fba4444f0bd3e42019f2fb14ea4e688d44
|
7
|
+
data.tar.gz: b229817ccdabf6cfb7ee4cfdc1872a2c24fb21a46d4546896993d67dc473346f5067c2305255fdb5311e66c2bb2d0d24c4e3e3034af6c0e455d0dfd36d8a008f
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.7.
|
1
|
+
0.7.3
|
data/lib/trinitycrmod/chease.rb
CHANGED
@@ -2,11 +2,31 @@ class CodeRunner::Trinity
|
|
2
2
|
def uses_chease?
|
3
3
|
@geo_option == "chease" or @init_option == "chease" or @species_option == "chease"
|
4
4
|
end
|
5
|
+
def chease_run
|
6
|
+
CodeRunner.setup_run_class('chease')
|
7
|
+
chrun = CodeRunner::Chease.new(@runner)
|
8
|
+
raise 'No chease input file' unless FileTest.exist?(chfile=@directory + '/chease/chease_namelist')
|
9
|
+
chrun.instance_eval(CodeRunner::Chease.defaults_file_text_from_input_file(chfile))
|
10
|
+
#puts ['chrun1', chrun.nsurf, self.class.defaults_file_text_from_input_file(chfile), chfile]
|
11
|
+
return chrun
|
12
|
+
end
|
5
13
|
def setup_chease
|
6
14
|
ep "Setting up chease files..."
|
7
|
-
|
8
|
-
|
9
|
-
|
15
|
+
if evolve_geometry.fortran_true?
|
16
|
+
FileUtils.cp_r(@gs_folder, 'chease')
|
17
|
+
chrun = chease_run
|
18
|
+
chrun.neqdsk = 0 # Use EXPEQ
|
19
|
+
chrun.nsurf = 6
|
20
|
+
puts ['chrun2', chrun.nsurf]
|
21
|
+
chrun.nppfun = 4 # Pres profile from EXPEQ
|
22
|
+
chrun.nfunc = 4 # Current func
|
23
|
+
chrun.nopt = -1 # Use prev soln for initial
|
24
|
+
Dir.chdir(@directory + '/chease/'){chrun.write_input_file}
|
25
|
+
else
|
26
|
+
FileUtils.mkdir('chease') unless FileTest.exist? 'chease'
|
27
|
+
origfile = @runner.root_folder + '/ogyropsi.dat'
|
28
|
+
FileUtils.cp(origfile, 'chease/ogyropsi.dat') if FileTest.exist? origfile
|
29
|
+
end
|
10
30
|
end
|
11
31
|
|
12
32
|
end
|
data/lib/trinitycrmod/trinity.rb
CHANGED
@@ -32,6 +32,9 @@ class CodeRunner
|
|
32
32
|
CodeRunner.setup_run_class('gs2')
|
33
33
|
require 'trinitycrmod/trinity_gs2'
|
34
34
|
|
35
|
+
# Setup gryfx in case people are using it
|
36
|
+
CodeRunner.setup_run_class('gryfx')
|
37
|
+
|
35
38
|
################################################
|
36
39
|
# Quantities that are read or determined by CodeRunner
|
37
40
|
# after the simulation has ended
|
@@ -57,7 +60,7 @@ class CodeRunner
|
|
57
60
|
|
58
61
|
@code_long="Trinity Turbulent Transport Solver"
|
59
62
|
|
60
|
-
@run_info=[:time, :is_a_restart, :restart_id, :restart_run_name, :completed_timesteps, :percent_complete, :no_restart_gs2]
|
63
|
+
@run_info=[:time, :is_a_restart, :restart_id, :restart_run_name, :completed_timesteps, :percent_complete, :no_restart_gs2, :gs_folder]
|
61
64
|
|
62
65
|
@uses_mpi = true
|
63
66
|
|
@@ -66,7 +69,7 @@ class CodeRunner
|
|
66
69
|
@naming_pars = []
|
67
70
|
|
68
71
|
# Any folders which are a number will contain the results from flux simulations.
|
69
|
-
@excluded_sub_folders = (1...1000).to_a.map{|i| "flux_tube_" + i.to_s}
|
72
|
+
@excluded_sub_folders = (1...1000).to_a.map{|i| "flux_tube_" + i.to_s} + ['chease']
|
70
73
|
|
71
74
|
# A hook which gets called when printing the standard run information to the screen using the status command.
|
72
75
|
def print_out_line
|
data/trinitycrmod.gemspec
CHANGED
@@ -2,16 +2,16 @@
|
|
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: trinitycrmod 0.7.
|
5
|
+
# stub: trinitycrmod 0.7.3 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "trinitycrmod"
|
9
|
-
s.version = "0.7.
|
9
|
+
s.version = "0.7.3"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib"]
|
13
13
|
s.authors = ["Edmund Highcock"]
|
14
|
-
s.date = "2015-07-
|
14
|
+
s.date = "2015-07-24"
|
15
15
|
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."
|
16
16
|
s.email = "edmundhighcock@sourceforge.net"
|
17
17
|
s.extra_rdoc_files = [
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: trinitycrmod
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Edmund Highcock
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-07-
|
11
|
+
date: 2015-07-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: coderunner
|