trinitycrdriver 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3b3ef7a8135177b9176f17971baf754f62c114
-  data.tar.gz: 26d256bd34c004714b8ad5e0b7f035ef235110b3
+  metadata.gz: f7b2758a1b2de950fa15844e8417af7a2fda9347
+  data.tar.gz: d2d260a1b03c9efea5897b29182a2a0e40215248
 SHA512:
-  metadata.gz: fb01d0c800b4abaa758b6739012aa4d5d244fd9325b29ce540d972cb82302d14675f0114144657520737aae6153403d28e1923a07fc47993a614edc58e929fc3
-  data.tar.gz: 1bf6596bb2b92870736be15126f7cf1e1eda6d8dd8326b7185efe0baf576e22e648e670da8578be262b500e7fb2693f2b91d4da58e5b564da0bc237fb8dbb0c7
+  metadata.gz: 1e3527b629a309bed3fc36b6b168c50591dcd40e153359499720b33653797ab5b146f21eb8499a8c91550553413fc5f3a2d12f72b36502ad4a69e00731fae48a
+  data.tar.gz: 70cf6073972cbe52db54569f51589bcaa6f5cc1bff4f0cfcdc9c52d8403818d93e128939b1471d909a218858a6a5f12abf2c1bebe11e966f5170a00509e84a90

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/trinitycrdriver/optimisation.rb

@@ -46,13 +46,13 @@ class CodeRunner::Trinity::Optimisation
     optimisation_meth = case optimisation_method
                         when :simplex
                           FMinimizer::NMSIMPLEX
-                        else 
+                        else
                           raise "Unknown optimisation_method"
                         end
     @results_hash[:start_time] = Time.now.to_i
     opt = FMinimizer.alloc(optimisation_meth, @optimisation_variables.size)
     @parameters_obj = parameters_obj
-    catch(:out_of_time) do 
+    catch(:out_of_time) do
       func = Proc.new{|v, optimiser| optimiser.func(v)}
       eputs 'Created func'
       gsl_func = Function.alloc(func, dimension)
@@ -89,7 +89,7 @@ class CodeRunner::Trinity::Optimisation
         if ((val_old - val)/val).abs < @parameters_obj.convergence
           if @parameters_obj.use_ifspppl_first and not @ifspppl_converged
             @ifspppl_converged = true
-          else 
+          else
             break
           end
         end
@@ -135,7 +135,7 @@ class CodeRunner::Trinity::Optimisation
       #pars[:trinity][:niter] = 2
 
       # The line below assumes that the whole first run is done
-      # with ifspppl, in which case we don't want the timestep to get 
+      # with ifspppl, in which case we don't want the timestep to get
       # too large for the gryfx run afterwards.
       #pars[:trinity][:ntdelt_max] = 0.05
       #pars[:trinity][:convergetol] = -1.0
@@ -212,14 +212,14 @@ class CodeRunner::Trinity::Optimisation
       eputs "Remaining wall mins #{remaining_wall_mins}, wall mins #{@parameters_obj.wall_mins}, start time #{@parameters_obj.start_time}, time #{Time.now.to_i}, margin #{@parameters_obj.wall_mins_margin}"
       if remaining_wall_mins < @parameters_obj.wall_mins_margin
         eputs "Run out of time"
-        throw(:out_of_time) 
-      end 
+        throw(:out_of_time)
+      end
       eputs "Starting real run, @id = ",@id
       # Create and initialize the gs run
       gsrun = gs_runner.run_class.new(gs_runner)
       raise "No gs_defaults strings" unless @parameters_obj.gs_defaults_strings.size > 0
       @parameters_obj.gs_defaults_strings.each{|prc| gsrun.instance_eval(prc)}
-      if gs_runner.run_list.size > 0 
+      if gs_runner.run_list.size > 0
         #gsrun.restart_id = @gsid
         if @parameters_obj.gs_code == 'chease'
           last_converged = @id
@@ -236,7 +236,7 @@ class CodeRunner::Trinity::Optimisation
             pars[:gs][:nfunc] = 4
             #if prid = @parameters_obj.use_previous_pressure and not @first_trinity_run_completed
             # If the last trinity run did not converge we may want to run exactly
-            # the same case again, and in particular use the pressure profile from 
+            # the same case again, and in particular use the pressure profile from
             # the previous Trinity  run as input (as an unconverged pressure profile
             # can lead to a wacky GS solution)
             #gsrun.expeq_in=trinity_runner.combined_run_list[prid].directory + '/chease/EXPEQ.NOSURF'
@@ -285,8 +285,18 @@ class CodeRunner::Trinity::Optimisation
       eputs ['Set gs_folder', run.gs_folder]
       trinity_runner.run_class.instance_variable_set(:@delay_execution, true)
       if trinity_runner.run_list.size > 0
-        run.restart_id = @id
-      else
+        if (old_run = trinity_runner.run_list[@id]).is_converged?
+          eputs "Previous trinity run #@id converged: using profile as initial condition"
+          run.init_option="trinity"
+          ## We have to copy the file because we need to be able to access the original from R
+          #FileUtils.cp("../id_#@id/#{old_run.run_name}.out.nc", "../id_#@id/#{old_run.run_name}_copy.out.nc")
+          run.init_file = "../id_#@id/#{old_run.run_name}.out.nc"
+          run.init_time = old_run.new_netcdf_file.var("t").get[-1]
+          old_run.new_ncclose rescue nil # Make sure the file is closed
+        else
+          eputs "Previous trinity run #@id not converged: restarting"
+          run.restart_id = @id
+        end 
       end
       eputs 'Submitting run'
       run.wall_mins = remaining_wall_mins

data/trinitycrdriver.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrdriver 0.1.2 ruby lib
+# stub: trinitycrdriver 0.1.3 ruby lib
 # stub: ext/trinitycrdriver/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "trinitycrdriver"
-  s.version = "0.1.2"
+  s.version = "0.1.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 = "2016-06-06"
+  s.date = "2016-07-22"
   s.description = "A gem to allow coderunner to run the trinity code directly."
   s.email = "edmundhighcock@users.sourceforge.net"
   s.extensions = ["ext/trinitycrdriver/extconf.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrdriver
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner