Changeset 1214

Timestamp:

Aug 17, 2012 9:17:50 AM (10 years ago)

Author:

lake

Message:

fixed the euler angle - origin mixup. Damping factors now work correctly. relabeled euler angles to R1 R2 R2 notation used in EXPEDT.

File:

• branches/sandbox/rigid.tcl (modified) (3 diffs)

branches/sandbox/rigid.tcl

@@ -196 +196 @@
      set ::rb_map_damping($phase,$bodnum,$mapnum) [lindex $rb_map 4]
 
-     set ::rb_damp_origin [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 0]
-     set ::rb_damp_euler [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 3]
+     set ::rb_damp_origin [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 6]
+     set ::rb_damp_euler [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 0]
 
      set ::rb_map_tls($phase,$bodnum,$mapnum) [lindex $rb_map 5]
@@ -481 +481 @@
      grid [label $main.rb_y   -text "y"] -row 1 -column 4
      grid [label $main.rb_z   -text "z"] -row 1 -column 5
-     grid [label $main.rb_euler_x -text "E1"] -row 1 -column 6
-     grid [label $main.rb_euler_y -text "E2"] -row 1 -column 7
-     grid [label $main.rb_euler_z -text "E3"] -row 1 -column 8
+     grid [label $main.rb_euler_x -text "R1"] -row 1 -column 6
+     grid [label $main.rb_euler_y -text "R2"] -row 1 -column 7
+     grid [label $main.rb_euler_z -text "R3"] -row 1 -column 8
      set col 11
      for {set coordnum 1} {$coordnum <= $::rb_coord_num($bodnum,1)} {incr coordnum} {
@@ -2046 +2046 @@
                                $::rb_tls($phasenum,$bodnum,$mapnum,saa) $::rb_tls($phasenum,$bodnum,$mapnum,sbb)"
 
-                            set rb_damping "$::rb_damp_origin $::rb_damp_origin $::rb_damp_origin \
+                            set rb_damping "$::rb_damp_euler $::rb_damp_euler $::rb_damp_euler \
                                 $::rb_damp_euler $::rb_damp_euler $::rb_damp_euler \
-                                $::rb_damp_euler $::rb_damp_euler $::rb_damp_euler"
+                                $::rb_damp_origin $::rb_damp_origin $::rb_damp_origin"
                             set rb_damping_tls "$::rb_damp_t $::rb_damp_l $::rb_damp_s"
                             puts "tls damping = $rb_damping_tls"