Alternative version that does time aggregation first, including changes from Duan.
Alternative version that does time aggregation first, including changes from Duan.

CWSL/cwsl-ctools,CWSL/cwsl-ctools,ccarouge/cwsl-ctools,ccarouge/cwsl-ctools,paolap/cwsl-ctools,CWSL/cwsl-ctools,paolap/cwsl-ctools