num4mechaequ 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ffa279b2f10648a0cc852d08f6cf23db176f385bc31b8809540a38a2f316ad
-  data.tar.gz: 59f69ea0ee861cc39067f4863191205d756e552d35d8af0f039ce94628a33166
+  metadata.gz: 4e3e5fffadd5eea83945129ed1694e89bce4f636a077552c020806fbf60fa5f8
+  data.tar.gz: 4f8c45b1ccd5a0c2b88b4caf7c26d0febe7d82cad638aaeaddaae7b9f6b77829
 SHA512:
-  metadata.gz: aaf91e9df68349bd5c20708a54d0e9d97e312fc904b03ed37076b864d93dc55ec3477e34c872005808df46f176c0988c7421aa54e86879bb27772ef79fc5afcb
-  data.tar.gz: 4a0ef2f3a5ff4fe31a52af87aceba3c593416d881346b3b087bf6a92c75f45f832d9a792aa5d02c2ae6d3a1292491e152892a7217e4cf9e2816020e307812d9e
+  metadata.gz: 5810693ced93a1143f50a9d1b418adc2b64435efd0d4cec33900938b5adb5105f34516f5de78ed115f340312ea40c0f814e9786968f747837abce17c1829c613
+  data.tar.gz: 592d88dc5d73c8dc48d1819097b3ce32e6fe33deede84f8308ab255254422e7c9d41f500a4e6c617b2ca29a62ea415c406942f20a5746e68c599b67a55cb2dd4

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## [0.1.3] - 2022-07-20
+
+### Added
+- add function of DHM
+- add function of forcedOscillation
+
+## [0.1.2] - 2022-07-13
+
+### Added
+- add function of UCM
+- add function of pendulumMotion
+
+### Fixed
+- change order of parameter of SHM
+
+  SHM(k, m, t, h0, v0) -> SHM(m, k, t, h0, v0)
+
 ## [0.1.1] - 2022-07-10
 
 ### Changed

data/lib/num4mechaequ.rb

@@ -7,8 +7,10 @@ module Num4MechaEquLib
     @g = 9.80665                       # 重力加速度(m/s2)
     @dt = 0.001                        # 時間刻み
     @w = 0.0
+    @l = 0.0
+    @ft = 0.0                          # 外力
     # 単振動
-    @springFunc = Proc.new do | n, yi |
+    @SHMFunc = Proc.new do | n, yi |
         f = []
         f[0] = yi[1]                   # hの傾き値
         f[1] = - @w * @w * yi[0]       # vの傾き値
@@ -18,7 +20,7 @@ module Num4MechaEquLib
     @motionFunc = Proc.new do | n, yi |
         f = []
         f[0] = yi[1]                   # hの傾き値
-        f[1] = - @g + @w * yi[1]       # vの傾き値
+        f[1] = @w * yi[1] - @g         # vの傾き値
         next f
     end
     # 放物運動
@@ -34,25 +36,39 @@ module Num4MechaEquLib
         f[1] = - @g                    # vの傾き値        
         next f
     end
+    # 減衰振動
+    @DHMFunc = Proc.new do | n, yi |
+        f = []
+        f[0] = yi[1]
+        f[1] = - @l * yi[1] - @w * @w * yi[0] 
+        next f
+    end
+    # 強制振動
+    @forcedFunc = Proc.new do | n, yi |
+        f = []
+        f[0] = yi[1]
+        f[1] = - @w * @w * yi[0] + @ft
+        next f
+    end 
     class << self
 
         #
         # 単振動(simple harmonic motion)
-        # @overload SHM(k, m, t, h0, v0)
-        #   @param [double] k バネ定数
+        # @overload SHM(m, k, t, h0, v0)
         #   @param [double] m 重りの重さ
+        #   @param [double] k バネ定数
         #   @param [double] t 時間
         #   @param [double] h0 初期位置値
         #   @param [double] v0 初期速度
         #   @return [hash[]] 0秒からt秒までの位置(h)と速度(v)の値
         #
-        def SHM(k, m, t, h0, v0)
+        def SHM(m, k, t, h0, v0)
             @w = Math.sqrt((k / m))
             hvt = []
             yi_1 = []
             yi = [h0, v0]
             0.step(t, @dt) { |x|
-              yi_1 = Num4SimDiffLib.rungeKuttaMethod(yi, @dt, @springFunc)
+              yi_1 = Num4SimDiffLib.rungeKuttaMethod(yi, @dt, @SHMFunc)
               hvt.push({"t" => x, 
                         "h" => yi_1[0], "v" => m * yi_1[1]})
               yi = yi_1
@@ -111,7 +127,94 @@ module Num4MechaEquLib
               yyi = yyi_1
             }
             return hvt
-        end 
+        end
+        #
+        # 等速円運動(Uniform Circular motion)
+        # @overload UCM(m, r, w, t)
+        #   @param [double] m 重りの重さ
+        #   @param [double] r 半径
+        #   @param [double] w 角速度
+        #   @param [double] t 時間
+        #   @return [hash[]] 0秒からt秒までの位置(h)と速度(v)の値
+        def UCM(m, r, w, t)
+            hvt = []
+            h = []
+            v = []
+            0.step(t, @dt) { |x|
+              sinwt = Math.sin(w * x)
+              coswt = Math.cos(w * x)
+              h = [r * coswt, r * sinwt]
+              v = [r * w * -sinwt, r * w * coswt]
+              a = [-r * w * w * coswt, -r * w * w * sinwt]
+              hvt.push({"t" => x, 
+                        "x" => {"h" => h[0], "v" => m * v[0]},
+                        "y" => {"h" => h[1], "v" => m * v[1]},
+                       }
+                      )
+            }
+            return hvt
+        end
+        #
+        # 振り子運動
+        # @overload pendulumMotion(m, l, t, h0, v0)
+        #   @param [double] m 重りの重さ
+        #   @param [double] l 糸の長さ
+        #   @param [double] t 時間
+        #   @param [double] h0 初期位置値
+        #   @param [double] v0 初期速度
+        #   @return [hash[]] 0秒からt秒までの位置(h)と速度(v)の値
+        def pendulumMotion(m, l, t, h0, v0)
+            return SHM(m, l, t, h0, v0)
+        end
+        #
+        # 減衰振動（damped harmonic motion)
+        # @overload DHM(m, k, b, t, h0, v0)
+        #   @param [double] m 重りの重さ
+        #   @param [double] k 比例定数
+        #   @param [double] b 抵抗力の比例定数
+        #   @param [double] t 時間
+        #   @param [double] h0 初期位置値
+        #   @param [double] v0 初期速度
+        #   @return [hash[]] 0秒からt秒までの位置(h)と速度(v)の値
+        def DHM(m, k, b, t, h0, v0)
+            @l = 2 * m * b
+            @w = Math.sqrt((k / m))
+            hvt = []
+            yi_1 = []
+            yi = [h0, v0]
+            0.step(t, @dt) { |x|
+              yi_1 = Num4SimDiffLib.rungeKuttaMethod(yi, @dt, @DHMFunc)
+              hvt.push({"t" => x, 
+                        "h" => yi_1[0], "v" => m * yi_1[1]})
+              yi = yi_1
+            }
+            return hvt
+        end
+        #
+        # 強制振動
+        # @overload forcedOscillation(m, k, w0, w, t, h0, v0)
+        #   @param [double] m 重りの重さ
+        #   @param [double] k 比例定数
+        #   @param [double] w0 振動系の固有角振動
+        #   @param [double] w 外力の角振動数
+        #   @param [double] t 時間
+        #   @param [double] h0 初期位置値
+        #   @param [double] v0 初期速度
+        #   @return [hash[]] 0秒からt秒までの位置(h)と速度(v)の値
+        def forcedOscillation(m, k, w0, w, t, h0, v0)
+            @w = Math.sqrt((k / m))
+            hvt = []
+            yi_1 = []
+            yi = [h0, v0]
+            0.step(t, @dt) { |x|
+              @ft = w / m * Math.cos(w * x)
+              yi_1 = Num4SimDiffLib.rungeKuttaMethod(yi, @dt, @forcedFunc)
+              hvt.push({"t" => x, 
+                        "h" => yi_1[0], "v" => m * yi_1[1]})
+              yi = yi_1
+            }
+            return hvt
+        end
     end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4mechaequ
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: num4simdiff
@@ -45,7 +45,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: http://github.com/siranovel/num4mechaequation/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/num4mechaequ/0.1.1
+  documentation_uri: https://rubydoc.info/gems/num4mechaequ/0.1.3
   homepage_uri: http://github.com/siranovel/num4mechaequation
   wiki_uri: https://github.com/siranovel/mydocs/tree/main/num4phyequation/num4mechaequation
 post_install_message: