The command used was:
svn merge -r23199:23198 .
This is part of restoring the SciPy quadratic integration in the frame order target functions.
Although incredibly slow, this will be useful for refining the final results, especially for models
whereby the number of Sobol' points collapses to zero.
.....
r23199 | bugman | 2014-05-16 14:12:07 +0200 (Fri, 16 May 2014) | 7 lines
Changed paths:
M /branches/frame_order_cleanup/target_functions/frame_order.py
Deletion of half of the frame order target functions.
All of the target functions using Scipy quadratic integration (which cause a frame order analysis to
take over 1,000,000 years to complete) have been deleted. The quasi-random target functions that
replace these have been renamed to remove the '_qrint' ending.
.....