rb-daspk 0.0.2-x86-darwin-10 → 0.0.3-x86-darwin-10

data/lib/rb-daspk.rb

@@ -24,7 +24,7 @@
 #
 # More information, source code and gems @ http://rubyforge.org/projects/rb-daspk/
 #
-#
+#:include:test.rb
 
 require 'rubygems'
 require 'ffi'
@@ -57,6 +57,7 @@ module DASPK
  callback :res, [:pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:pointer], :void
  attach_function 'ddaspk_', [:res,    :pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:pointer, 
                              :pointer,:pointer,:pointer,:pointer,:pointer,:pointer,:jac,    :pointer], :void
+ attach_function 'd1mach_', [:pointer],:double
 #
 #
 #  interface to DASPK
@@ -73,7 +74,7 @@ module DASPK
 
     include DASPK
 
-    attr_accessor :rtol,:atol,:init,:jac,:maxstep
+    attr_accessor :rtol,:atol,:init,:jac,:maxstep,:mxnit,:mxnj,:mxnh,:lsoff,:stptol,:epinit
 #
 #
 # * neq    = the number of equations. this is always the sum of the number of states and algebraics
@@ -102,8 +103,24 @@ module DASPK
        @rtol = 0.000001
        @atol = 0.000001
        @jac  = jac
-       @maxstep =0
-       @init = 0
+       
+
+       @pmxnit  = FFI::MemoryPointer.new(:int)
+       @pmxnj   = FFI::MemoryPointer.new(:int)
+       @pmxnh   = FFI::MemoryPointer.new(:int)
+       @plsoff  = FFI::MemoryPointer.new(:int)
+       @pstptol = FFI::MemoryPointer.new(:double)
+       @pepinit = FFI::MemoryPointer.new(:double)
+       pidum    = FFI::MemoryPointer.new(:int)
+
+       @maxstep  = 0.0
+       @mxnit    = 5
+       @mxnj     = 6
+       @mxnh     = 5
+       @lsoff    = 0
+       @stptol   = d1mach_(pidum)**(2.0/3.0)
+       @epinit   = 0.01
+       @info[16] = 1
 
        if (inter) then
          @info[2]=1
@@ -172,7 +189,14 @@ module DASPK
 #          0 means it is a state (aka has derivative in the equations) 
 #          1 means it is an algebraic
 #    
-    def solveForInitialValues(time,y,yprime,ialgs=[0]*@neqs,init=1)
+    def solveForInitialValues(time,y,yprime,ialgs,init=1)
+
+       @iwork[31] = @mxnit
+       @iwork[32] = @mxnj
+       @iwork[33] = @mxnh
+       @iwork[34] = @lsoff
+       @work[13]  = @stptol
+       @work[14]  = @epinit
 
        ptime = FFI::MemoryPointer.new(:double)
        ptime.write_double(time)
@@ -193,6 +217,7 @@ module DASPK
           end
           @info[13]=1
           @piwork.write_array_of_int(@iwork)
+          @pwork.write_array_of_double(@work)
           @pinfo.write_array_of_int(@info)
           ddaspk_(@resproc,@pneq,ptime,@py,@pyprime,ptout,@pinfo,@prtol,@patol,pidid,@pwork,@plwr,@piwork,@plwi,nil,nil,@jacproc,nil)
           @y.replace @py.read_array_of_double(@neq)
@@ -205,6 +230,7 @@ module DASPK
           end
           @info[13]=1
           @piwork.write_array_of_int(@iwork)
+          @pwork.write_array_of_double(@work)
           @pinfo.write_array_of_int(@info)
           ddaspk_(@resproc,@pneq,ptime,@py,@pyprime,ptout,@pinfo,@prtol,@patol,pidid,@pwork,@plwr,@piwork,@plwi,nil,nil,@jacproc,nil)
           @y.replace @py.read_array_of_double(@neq)
@@ -219,6 +245,16 @@ module DASPK
     end
 
     def solve (time, tout)
+       
+#
+#  solver options
+#
+       @iwork[31] = @mxnit
+       @iwork[32] = @mxnj
+       @iwork[33] = @mxnh
+       @iwork[34] = @lsoff
+       @work[13]  = @stptol
+       @work[14]  = @epinit
 
        @prtol.write_double(@rtol)
        @patol.write_double(@atol)

data/lib/test.rb

@@ -24,7 +24,6 @@
 #
 # More information, source code and gems @ http://rubyforge.org/projects/rb-daspk/
 #
-#
 
 require 'rubygems'
 require 'rb-daspk'
@@ -129,3 +128,5 @@ ypa = ans[2]
 ya = ans[1]
 print "time = #{time}   y0=#{ya[0]}  y1=#{ya[1]}\n"
 print "time = #{time}   yp0=#{ypa[0]}  yp1=#{ypa[1]}\n"
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rb-daspk
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: x86-darwin-10
 authors: 
 - Eric Meyers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -05:00
+date: 2009-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,8 +34,10 @@ files:
 - lib/libdaspk.dylib
 - lib/rb-daspk.rb
 - lib/test.rb
-has_rdoc: false
-homepage: 
+has_rdoc: true
+homepage: http://rb-daspk.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -56,9 +58,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rb-daspk
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DASPK Ruby Interface. Allows users to solve differential algebraic equations in Ruby, using Ruby constructs. Interfaces with the DASPK Fortran library. DASPK solves DAE's of the form G(t,y,y',p) = 0
 test_files: []