genecrmod 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5f9bda05b63e6c3894ce02d9213099a0485f67
-  data.tar.gz: c195fa1c85c1f468fc29edbfbce7819a3236940d
+  metadata.gz: cb544b7064c39699eb44737597ba85a1a0b3dd55
+  data.tar.gz: 48662d3412ba940d26aa0a589a10963546f84945
 SHA512:
-  metadata.gz: f9b2d1526aca46eecd3dcf136fa1fdc9cd61bffb76cfe12cc745d0dc85d09b01f6dcc863c2316182995ea31411d5846d35211cb6a14f27f83a765a99ce6cdeba
-  data.tar.gz: 625ce2f319afa5fb27edb34aef9ebfc6cfef5a6b0e1c0bdc1739d7f3b27e4bfba7c4984f4abc5d97ea90b11b4d0cb28adda9fe832f4b24ae2d603c7df0ed7ed1
+  metadata.gz: 67cafa2928194cc584773218eb47775f92f179fc74334dffb675a57f2fee4ab326f6c794878d355d46ac55c565b7aebe525701db785210c85408430c7ebf2e35
+  data.tar.gz: a1360d67b12d58283499bb79aea9c9f08179053389595c3fa7178672b8fbe6cb685863520cc6efa17a5f74bafed7e97432d85022d5013bf54ca541308a529535

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/genecrmod.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: genecrmod 0.1.0 ruby lib
+# stub: genecrmod 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "genecrmod"
-  s.version = "0.1.0"
+  s.version = "0.1.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 = "2014-07-17"
+  s.date = "2014-07-18"
   s.description = "A module which allows the GENE gyrokinetic code to be run using the CodeRunner framework. "
   s.email = "edmundhighcock@users.sourceforge.net"
   s.extra_rdoc_files = [

data/lib/genecrmod/gene.rb

@@ -197,12 +197,35 @@ class CodeRunner
         #get_global_results
       #end
       #p ['fusionQ is ', fusionQ]
-      #@percent_complete = completed_timesteps.to_f / ntstep.to_f * 100.0
+      @percent_complete = completed_timesteps.to_f / ntimesteps.to_f * 100.0
     end
 
     def get_status
-      return :Unknown
+			if @running
+				get_completed_timesteps
+				if completed_timesteps == 0
+					@status = :NotStarted
+				else
+					@status = :Incomplete
+				end
+			else
+				get_completed_timesteps
+				if @completed_timesteps == @ntimesteps
+					@status = :Complete
+				else
+					if FileTest.exist?('GENE.finished')
+						@status = :Complete
+					else
+						@status = :Failed
+					end
+				end
+			end
     end
+		def get_completed_timesteps
+			Dir.chdir(@directory) do
+        @completed_timesteps = %x[grep '^\\s\\+\\S\\+\\s*$' nrg.dat].split("\n").size
+			end
+		end
 
 
     @fortran_namelist_source_file_match = /((\.F9[05])|(\.fpp)|COMDAT.inc)$/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genecrmod
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner