trinitycrmod 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca33529443aefcf8440c298ac4e3aad6af609da3
-  data.tar.gz: 91b67e9abd7f032f7bc91d612af62934661f699a
+  metadata.gz: 6a2373f7b753a2f744b9a07cb5adc7cd9bdd7d3f
+  data.tar.gz: 1e645ec0276738e7001b17e75821d9009a72a77c
 SHA512:
-  metadata.gz: a588adfdf31d8befeed75d8d8a73dbb95696c59648d5af735878c179e97822f5a758ef019d9b650acc8b9591f5ae2f40f4f6b532e2fe890bddeaa28eeec542e5
-  data.tar.gz: 9e4552700ec90fc617c084f7df3bc316bdfd0014f5e56ba74bb37326bef97472f6c0ee64852bc72f79694ee195cb3d83e91d38f8493813394e848bcf36ea266b
+  metadata.gz: 230a9fe8131f2bdfbab61d7536837b5b2f919d4c3a27aec157355165468addf26462ba2940f4353f589bd2adfb034a0e75a8b30f55a24ef25d7ad82bfa0dacd2
+  data.tar.gz: a8cd710412b60378313da3426441fe4b9e453183db73c205bae386455a3691025e6cb9fd3a7cf5fde1e0c660f14ba86db556bd33d1d1db93e86250a76562c903

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/trinitycrmod/actual_parameter_values.rb

@@ -13,6 +13,24 @@ class CodeRunner::Trinity
 		def fork_flag_actual
 			@fork_flag or ".true."
 		end
+    def evolve_temperature_actual
+      @evolve_temperature or ".true."
+    end
+    def evolve_density_actual
+      @evolve_density or ".true."
+    end
+    def evolve_flow_actual
+      @evolve_flow or ".false."
+    end
+    def equal_ion_temps_actual
+      @equal_ion_temps or ".true."
+    end
+    def te_fixed_actual
+      @te_fixed or ".false."
+    end
+    def te_equal_ti_actual
+      @te_equal_ti or ".false."
+    end
 	end
 	include ActualParameterValues
 end

data/lib/trinitycrmod/trinity.rb

@@ -247,18 +247,31 @@ class CodeRunner
     # The number of separate flux tube results needed for the jacobian
     def n_flux_tubes_jac
       d1 = dflx_stencil_actual - 1
-      ngrads =d1 * case @grad_option
-                    when "tigrad", "ngrad", "lgrad"
-                      1
-                    when "tgrads"
-                      2
-                    when "ltgrads", "ntgrads"
-                      3
-                    when "all"
-                      4
-                    else
-                      raise "unknown grad_option: #@grad_option"
-                    end
+      ngrads = d1 * case @grad_option
+      when nil
+        n = 0
+        n = n + @nspec-1 if (evolve_density_actual.fortran_true?) 
+        if (evolve_temperature_actual.fortran_true?) 
+          if (equal_ion_temps_actual.fortran_true?) then
+            n = n + 1
+          else
+            n = n + n_ion_spec
+          end 
+          n=n+1 if (te_equal_ti_actual.fortran_false? and te_fixed_actual.fortran_false?)
+          n = n + 1 if (evolve_flow_actual.fortran_true?)
+        end
+        n
+      when "tigrad", "ngrad", "lgrad"
+        1
+      when "tgrads"
+        2
+      when "ltgrads", "ntgrads"
+        3
+      when "all"
+        4
+      else
+        raise "unknown grad_option: #@grad_option"
+      end
       if evolve_grads_only_actual.fortran_true?
         njac = ngrads + 1
       else

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.8.0 ruby lib
+# stub: trinitycrmod 0.8.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   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-09-24"
+  s.date = "2015-09-28"
   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.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner