The command used was:
svn merge -r24463:r24462 .
.....
r24463 | bugman | 2014-07-05 19:06:09 +0200 (Sat, 05 Jul 2014) | 9 lines
Changed paths:
M /branches/frame_order_cleanup/target_functions/frame_order.py
Converted all frame order target function data structures to float64.
This affects the vector data structures used for the PCS numeric integration. The float32
structures added for speed do not actually increase the speed. For the double rotor model, 10
target function calls took the pcs_pivot_motion_double_rotor() function 44.936 seconds using float32
and 44.105 seconds using all float64. The cumulative time is also longer. This must be because
other parts are float64, and therefore type conversions are happening during target function calls.
.....