Changeset 1212 for branches

Timestamp:

Aug 16, 2012 11:13:26 PM (13 years ago)

Author:

lake

Message:

 

File:

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

branches/sandbox/rigid.tcl ¶

@@ -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 "x"] -row 1 -column 6
-     grid [label $main.rb_euler_y -text "y"] -row 1 -column 7
-     grid [label $main.rb_euler_z -text "z"] -row 1 -column 8
+     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
      set col 11
      for {set coordnum 1} {$coordnum <= $::rb_coord_num($bodnum,1)} {incr coordnum} {
@@ -2010 +2010 @@
                        set refcoordflag 0
                        set reftlsflag 0
-                       set rb_list "$::rb_var($phasenum,$bodnum,$mapnum,x) \
-                           $::rb_var($phasenum,$bodnum,$mapnum,y) $::rb_var($phasenum,$bodnum,$mapnum,z) \
-                           $::rb_var($phasenum,$bodnum,$mapnum,e1) $::rb_var($phasenum,$bodnum,$mapnum,e2) \
-                           $::rb_var($phasenum,$bodnum,$mapnum,e3) 0 0 0"
+                       set rb_list "$::rb_var($phasenum,$bodnum,$mapnum,e1) \
+                           $::rb_var($phasenum,$bodnum,$mapnum,e2) $::rb_var($phasenum,$bodnum,$mapnum,e3) \
+                           0 0 0 $::rb_var($phasenum,$bodnum,$mapnum,x) $::rb_var($phasenum,$bodnum,$mapnum,y) \
+                           $::rb_var($phasenum,$bodnum,$mapnum,z)"
 #                       puts "param saved for map $phasenum $bodnum $mapnum is vvvvvvv $rb_list"
                        RigidBodyVary $phasenum $bodnum $mapnum $rb_list
@@ -2057 +2057 @@
                             
                             if {$::rb_var($phasenum,$bodnum,$mapnum,tls) == 0} {
-                                  RigidBodySetDamp $phasenum $bodnum $mapnum $rb_damping
+                                  RigidBodySetDamp $phasenum $bodnum $mapnum $rb_damping 
                             } else {
                                   RigidBodySetDamp $phasenum $bodnum $mapnum $rb_damping $rb_damping_tls
@@ -2189 +2189 @@
 #     puts "mvarlist   $mvarlist"
 
-     set ::rb_var($phasenum,$bodnum,$mapnum,x) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 0] $mvarlist $varlist]
-     set ::rb_var($phasenum,$bodnum,$mapnum,y) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 1] $mvarlist $varlist]
-     set ::rb_var($phasenum,$bodnum,$mapnum,z) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 2] $mvarlist $varlist]
+     set ::rb_var($phasenum,$bodnum,$mapnum,x) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 6] $mvarlist $varlist]
+     set ::rb_var($phasenum,$bodnum,$mapnum,y) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 7] $mvarlist $varlist]
+     set ::rb_var($phasenum,$bodnum,$mapnum,z) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 8] $mvarlist $varlist]
 
      lappend ::rb_var_list ::rb_var($phasenum,$bodnum,$mapnum,x) ::rb_var($phasenum,$bodnum,$mapnum,y) ::rb_var($phasenum,$bodnum,$mapnum,z)
 
-     set ::rb_var($phasenum,$bodnum,$mapnum,e1) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 3] $mvarlist $varlist]
-     set ::rb_var($phasenum,$bodnum,$mapnum,e2) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 4] $mvarlist $varlist]
-     set ::rb_var($phasenum,$bodnum,$mapnum,e3) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 5] $mvarlist $varlist]
+     set ::rb_var($phasenum,$bodnum,$mapnum,e1) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 0] $mvarlist $varlist]
+     set ::rb_var($phasenum,$bodnum,$mapnum,e2) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 1] $mvarlist $varlist]
+     set ::rb_var($phasenum,$bodnum,$mapnum,e3) [RB_VarSet [lindex $::rb_map_positionvars($phasenum,$bodnum,$mapnum) 2] $mvarlist $varlist]
 
      lappend ::rb_var_list ::rb_var($phasenum,$bodnum,$mapnum,e1) ::rb_var($phasenum,$bodnum,$mapnum,e2) ::rb_var($phasenum,$bodnum,$mapnum,e3)