Changeset 1214 for branches/sandbox


Ignore:
Timestamp:
Aug 17, 2012 9:17:50 AM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/rigid.tcl

    r1212 r1214  
    196196     set ::rb_map_damping($phase,$bodnum,$mapnum) [lindex $rb_map 4]
    197197
    198      set ::rb_damp_origin [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 0]
    199      set ::rb_damp_euler [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 3]
     198     set ::rb_damp_origin [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 6]
     199     set ::rb_damp_euler [lindex $::rb_map_damping($phase,$bodnum,$mapnum) 0]
    200200
    201201     set ::rb_map_tls($phase,$bodnum,$mapnum) [lindex $rb_map 5]
     
    481481     grid [label $main.rb_y   -text "y"] -row 1 -column 4
    482482     grid [label $main.rb_z   -text "z"] -row 1 -column 5
    483      grid [label $main.rb_euler_x -text "E1"] -row 1 -column 6
    484      grid [label $main.rb_euler_y -text "E2"] -row 1 -column 7
    485      grid [label $main.rb_euler_z -text "E3"] -row 1 -column 8
     483     grid [label $main.rb_euler_x -text "R1"] -row 1 -column 6
     484     grid [label $main.rb_euler_y -text "R2"] -row 1 -column 7
     485     grid [label $main.rb_euler_z -text "R3"] -row 1 -column 8
    486486     set col 11
    487487     for {set coordnum 1} {$coordnum <= $::rb_coord_num($bodnum,1)} {incr coordnum} {
     
    20462046                               $::rb_tls($phasenum,$bodnum,$mapnum,saa) $::rb_tls($phasenum,$bodnum,$mapnum,sbb)"
    20472047
    2048                             set rb_damping "$::rb_damp_origin $::rb_damp_origin $::rb_damp_origin \
     2048                            set rb_damping "$::rb_damp_euler $::rb_damp_euler $::rb_damp_euler \
    20492049                                $::rb_damp_euler $::rb_damp_euler $::rb_damp_euler \
    2050                                 $::rb_damp_euler $::rb_damp_euler $::rb_damp_euler"
     2050                                $::rb_damp_origin $::rb_damp_origin $::rb_damp_origin"
    20512051                            set rb_damping_tls "$::rb_damp_t $::rb_damp_l $::rb_damp_s"
    20522052                            puts "tls damping = $rb_damping_tls"
Note: See TracChangeset for help on using the changeset viewer.