space.c 75.9 KB
Newer Older
Pedro Gonnet's avatar
Pedro Gonnet committed
1
/*******************************************************************************
2
 * This file is part of SWIFT.
Pedro Gonnet's avatar
Pedro Gonnet committed
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
 * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published
 * by the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 * 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
 ******************************************************************************/

/* Config parameters. */
#include "../config.h"

/* Some standard headers. */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <float.h>
#include <limits.h>
#include <math.h>

/* Local headers. */
#include "cycle.h"
34
#include "atomic.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
35
#include "lock.h"
36
37
38
#include "task.h"
#include "part.h"
#include "cell.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
39
40
#include "space.h"
#include "runner.h"
41
#include "error.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
42
43
44

/* Split size. */
int space_splitsize = space_splitsize_default;
45
int space_subsize = space_subsize_default;
Pedro Gonnet's avatar
Pedro Gonnet committed
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

/* Map shift vector to sortlist. */
const int sortlistID[27] = {
    /* ( -1 , -1 , -1 ) */   0 ,
    /* ( -1 , -1 ,  0 ) */   1 , 
    /* ( -1 , -1 ,  1 ) */   2 ,
    /* ( -1 ,  0 , -1 ) */   3 ,
    /* ( -1 ,  0 ,  0 ) */   4 , 
    /* ( -1 ,  0 ,  1 ) */   5 ,
    /* ( -1 ,  1 , -1 ) */   6 ,
    /* ( -1 ,  1 ,  0 ) */   7 , 
    /* ( -1 ,  1 ,  1 ) */   8 ,
    /* (  0 , -1 , -1 ) */   9 ,
    /* (  0 , -1 ,  0 ) */   10 , 
    /* (  0 , -1 ,  1 ) */   11 ,
    /* (  0 ,  0 , -1 ) */   12 ,
    /* (  0 ,  0 ,  0 ) */   0 , 
    /* (  0 ,  0 ,  1 ) */   12 ,
    /* (  0 ,  1 , -1 ) */   11 ,
    /* (  0 ,  1 ,  0 ) */   10 , 
    /* (  0 ,  1 ,  1 ) */   9 ,
    /* (  1 , -1 , -1 ) */   8 ,
    /* (  1 , -1 ,  0 ) */   7 , 
    /* (  1 , -1 ,  1 ) */   6 ,
    /* (  1 ,  0 , -1 ) */   5 ,
    /* (  1 ,  0 ,  0 ) */   4 , 
    /* (  1 ,  0 ,  1 ) */   3 ,
    /* (  1 ,  1 , -1 ) */   2 ,
    /* (  1 ,  1 ,  0 ) */   1 , 
    /* (  1 ,  1 ,  1 ) */   0 
    };
77
78
79
80
81
82
83
84
85
86
    
    
/**
 * @brief Mark tasks to be skipped and set the sort flags accordingly.
 * 
 * @return 1 if the space has to be rebuilt, 0 otherwise.
 */
 
int space_marktasks ( struct space *s ) {

87
88
    int k, nr_tasks = s->nr_tasks, *ind = s->tasks_ind;
    struct task *t, *tasks = s->tasks;
89
90
    float dt_step = s->dt_step;
    
91
92
    /* Run through the tasks and mark as skip or not. */
    for ( k = 0 ; k < nr_tasks ; k++ ) {
93
94
    
        /* Get a handle on the kth task. */
95
        t = &tasks[ ind[k] ];
96
        
97
98
        /* Sort-task? Note that due to the task ranking, the sorts
           will all come before the pairs and/or subs. */
99
100
101
102
        if ( t->type == task_type_sort ) {
        
            /* Re-set the flags. */
            t->flags = 0;
103
104
            t->skip = 1;
        
105
106
107
            }
        
        /* Single-cell task? */
108
        else if ( t->type == task_type_self ||
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
             t->type == task_type_ghost ||
             ( t->type == task_type_sub && t->cj == NULL ) ) {
             
            /* Set this task's skip. */
            t->skip = ( t->ci->dt_min > dt_step );
            
            /* Set the sort flags. */
            if ( !t->skip && t->type == task_type_sub )
                space_addsorts( s , t , t->ci , t->cj , t->flags );
            
            }
        
        /* Pair? */
        else if ( t->type == task_type_pair || ( t->type == task_type_sub && t->cj != NULL ) ) {
            
            /* Set this task's skip. */
            t->skip = ( t->ci->dt_min > dt_step && t->cj->dt_min > dt_step );
            
            /* Too much particle movement? */
            if ( !t->skip && t->tight &&
129
                 ( t->ci->h2dx_max > t->ci->dmin || t->cj->h2dx_max > t->cj->dmin ) )
Pedro Gonnet's avatar
Pedro Gonnet committed
130
                return 1;
131
132
                
            /* Set the sort flags. */
133
134
135
136
137
            if ( !t->skip && t->type == task_type_pair ) {
                t->ci->sorts->flags |= (1 << t->flags);
                t->ci->sorts->skip = 0;
                t->cj->sorts->flags |= (1 << t->flags);
                t->cj->sorts->skip = 0;
138
139
140
141
142
143
144
145
146
147
148
149
150
151
                }
                
            }
            
        /* None? */
        else if ( t->type == task_type_none )
            t->skip = 1;
            
        }
        
    /* All is well... */
    return 0;
    
    }
152
153
154
155
156
157
158
159
160
161
162
163
164
165


/**
 * @brief Check the integrity of the space and rebuild if necessary.
 *
 * @param s The #space.
 *
 * Runs through the tasks and marks those as "skip" which have no
 * effect for the current @c dt_max. Verifies the integrity of the
 * cell tree for those tasks and triggers a rebuild if necessary.
 */
 
void space_prepare ( struct space *s ) {

166
167
168
169
    int k, rebuild;
    // struct task *t;
    // float dt_step = s->dt_step;
    float dx_max = 0.0f;
170
    // int counts[ task_type_count + 1 ];
171
    ticks tic;
172
    
173
174
175
    /* Get the maximum displacement in the whole system. */
    for ( k = 0 ; k < s->nr_cells ; k++ )
        dx_max = fmaxf( dx_max , s->cells[k].dx_max );
176
    // printf( "space_prepare: dx_max is %e.\n" , dx_max );
177
    
178
    /* Run through the tasks and mark as skip or not. */
179
    // tic = getticks();
180
    rebuild = space_marktasks( s );
181
    // printf( "space_prepare: space_marktasks took %.3f ms.\n" , (double)(getticks() - tic)/CPU_TPS*1000 );
182
183
        
    /* Did this not go through? */
184
    if ( rebuild ) {
185
186
    
        /* Re-build the space. */
187
        tic = getticks();
188
        space_rebuild( s , 0.0 );
189
        printf( "space_prepare: space_rebuild took %.3f ms.\n" , (double)(getticks() - tic)/CPU_TPS*1000 );
190
    
191
        /* Run through the tasks and mark as skip or not. */
192
        // tic = getticks();
Pedro Gonnet's avatar
Pedro Gonnet committed
193
194
        if ( space_marktasks( s ) )
            error( "space_marktasks failed after space_rebuild." );
195
        // printf( "space_prepare: space_marktasks took %.3f ms.\n" , (double)(getticks() - tic)/CPU_TPS*1000 );
196
        
197
198
199
        }

    /* Now that we have the cell structre, re-build the tasks. */
200
201
202
    // tic = getticks();
    // space_maketasks( s , 1 );
    // printf( "space_prepare: maketasks took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
203
204
    
    /* Count the number of each task type. */
205
    /* tic = getticks();
206
207
208
209
210
211
212
213
214
215
216
    for ( k = 0 ; k <= task_type_count ; k++ )
        counts[k] = 0;
    for ( k = 0 ; k < s->nr_tasks ; k++ )
        if ( !s->tasks[k].skip )
            counts[ (int)s->tasks[k].type ] += 1;
        else
            counts[ task_type_count ] += 1;
    printf( "space_prepare: task counts are [ %s=%i" , taskID_names[0] , counts[0] );
    for ( k = 1 ; k < task_type_count ; k++ )
        printf( " %s=%i" , taskID_names[k] , counts[k] );
    printf( " skipped=%i ]\n" , counts[ task_type_count ] ); fflush(stdout);
217
    printf( "space_prepare: task counting took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 ); */
218
219
220
221
222
223
224
225
226
227
228
229
230
    
    }
    
    
/** 
 * @brief Sort the tasks in topological order over all queues.
 *
 * @param s The #space.
 */
 
void space_ranktasks ( struct space *s ) {

    int i, j = 0, k, temp, left = 0, rank;
231
232
    struct task *t, *tasks = s->tasks;
    int *tid = s->tasks_ind, nr_tasks = s->nr_tasks;
233
234
    
    /* Run throught the tasks and get all the waits right. */
235
    for ( i = 0 , k = 0 ; k < nr_tasks ; k++ ) {
236
        tid[k] = k;
237
238
        for ( j = 0 ; j < tasks[k].nr_unlock_tasks ; j++ )
            tasks[k].unlock_tasks[j]->wait += 1;
239
240
241
        }
        
    /* Main loop. */
242
    for ( j = 0 , rank = 0 ; left < nr_tasks ; rank++ ) {
243
244
        
        /* Load the tids of tasks with no waits. */
245
246
        for ( k = left ; k < nr_tasks ; k++ )
            if ( tasks[ tid[k] ].wait == 0 ) {
247
248
249
                temp = tid[j]; tid[j] = tid[k]; tid[k] = temp;
                j += 1;
                }
250
251
252
253
                
        /* Did we get anything? */
        if ( j == left )
            error( "Unsatisfiable task dependencies detected." );
254

255
        /* Unlock the next layer of tasks. */
256
        for ( i = left ; i < j ; i++ ) {
257
            t = &tasks[ tid[i] ];
258
            t->rank = rank;
259
260
261
            tid[i] = t - tasks;
            if ( tid[i] >= nr_tasks )
                error( "Task index overshoot." );
262
263
264
265
266
267
268
269
270
271
272
273
274
275
            /* printf( "engine_ranktasks: task %i of type %s has rank %i.\n" , i , 
                (t->type == task_type_self) ? "self" : (t->type == task_type_pair) ? "pair" : "sort" , rank ); */
            for ( k = 0 ; k < t->nr_unlock_tasks ; k++ )
                t->unlock_tasks[k]->wait -= 1;
            }
            
        /* The new left (no, not tony). */
        left = j;
            
        }
        
    }


276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
/**
 * @brief Get the shift-id of the given pair of cells, swapping them
 *      if need be.
 *
 * @param s The space
 * @param ci Pointer to first #cell.
 * @param cj Pointer second #cell.
 * @param shift Vector from ci to cj.
 *
 * @return The shift ID and set shift, may or may not swap ci and cj.
 */
 
int space_getsid ( struct space *s , struct cell **ci , struct cell **cj , double *shift ) {

    int k, sid = 0;
    struct cell *temp;
    double dx[3];

    /* Get the relative distance between the pairs, wrapping. */
    for ( k = 0 ; k < 3 ; k++ ) {
        dx[k] = (*cj)->loc[k] - (*ci)->loc[k];
        if ( dx[k] < -s->dim[k]/2 )
            shift[k] = s->dim[k];
        else if ( dx[k] > s->dim[k]/2 )
            shift[k] = -s->dim[k];
        else
            shift[k] = 0.0;
        dx[k] += shift[k];
        }
        
    /* Get the sorting index. */
    for ( k = 0 ; k < 3 ; k++ )
        sid = 3*sid + ( (dx[k] < 0.0) ? 0 : ( (dx[k] > 0.0) ? 2 : 1 ) );

    /* Switch the cells around? */
    if ( runner_flip[sid] ) {
        temp = *ci; *ci = *cj; *cj = temp;
        for ( k = 0 ; k < 3 ; k++ )
            shift[k] = -shift[k];
        }
    sid = sortlistID[sid];
    
    /* Return the sort ID. */
    return sid;

    }


324
/**
325
 * @brief Recursively dismantle a cell tree.
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
 *
 */
 
void space_rebuild_recycle ( struct space *s , struct cell *c ) {
    
    int k;
    
    if ( c->split )
        for ( k = 0 ; k < 8 ; k++ )
            if ( c->progeny[k] != NULL ) {
                space_rebuild_recycle( s , c->progeny[k] );
                space_recycle( s , c->progeny[k] );
                c->progeny[k] = NULL;
                }
    
    }

/**
344
 * @brief Recursively rebuild a cell tree.
345
346
347
348
349
350
 *
 */
 
int space_rebuild_recurse ( struct space *s , struct cell *c ) {
    
    int k, count, changes = 0, wasmt[8];
351
    float h, h_limit, h_max = 0.0f, dt_min = c->parts[0].dt, dt_max = dt_min;
352
353
    struct cell *temp;
    
354
355
356
357
358
359
    /* Clean out the task pointers. */
    c->sorts = NULL;
    c->nr_tasks = 0;
    c->nr_density = 0;
    c->dx_max = 0.0;
    
360
361
362
363
364
365
366
367
368
369
370
371
    /* If the cell is already split, check that the split is still ok. */
    if ( c->split ) {
    
        /* Check the depth. */
        if ( c->depth > s->maxdepth )
            s->maxdepth = c->depth;

        /* Set the minimum cutoff. */
        h_limit = fmin( c->h[0] , fmin( c->h[1] , c->h[2] ) ) / 2;

        /* Count the particles below that. */
        for ( count = 0 , k = 0 ; k < c->count ; k++ ) {
372
            h = c->parts[k].h;
373
374
375
376
            if ( h <= h_limit )
                count += 1;
            if ( h > h_max )
                h_max = h;
377
378
379
380
            if ( c->parts[k].dt < dt_min )
                dt_min = c->parts[k].dt;
            if ( c->parts[k].dt > dt_max )
                dt_max = c->parts[k].dt;
381
382
            }
        c->h_max = h_max;
383
384
        c->dt_min = dt_min;
        c->dt_max = dt_max;
Pedro Gonnet's avatar
Pedro Gonnet committed
385
        c->dx_max = 0;
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
            
        /* Un-split? */
        if ( count < c->count*space_splitratio || c->count < space_splitsize ) {
        
            /* Get rid of the progeny. */
            space_rebuild_recycle( s , c );
            
            /* Re-set the split flag. */
            c->split = 0;
        
            }
        
        /* Otherwise, recurse on the kids. */
        else {
        
            /* Populate all progeny. */
            for ( k = 0 ; k < 8 ; k++ )
                if ( ( wasmt[k] = ( c->progeny[k] == NULL ) ) ) {
                    temp = space_getcell( s );
                    temp->count = 0;
                    temp->loc[0] = c->loc[0];
                    temp->loc[1] = c->loc[1];
                    temp->loc[2] = c->loc[2];
                    temp->h[0] = c->h[0]/2;
                    temp->h[1] = c->h[1]/2;
                    temp->h[2] = c->h[2]/2;
Pedro Gonnet's avatar
Pedro Gonnet committed
412
                    temp->dmin = c->dmin/2;
413
414
415
416
417
418
419
420
421
                    if ( k & 4 )
                        temp->loc[0] += temp->h[0];
                    if ( k & 2 )
                        temp->loc[1] += temp->h[1];
                    if ( k & 1 )
                        temp->loc[2] += temp->h[2];
                    temp->depth = c->depth + 1;
                    temp->split = 0;
                    temp->h_max = 0.0;
Pedro Gonnet's avatar
Pedro Gonnet committed
422
                    temp->dx_max = 0.0;
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
                    temp->parent = c;
                    c->progeny[k] = temp;
                    }
        
            /* Make sure each part is in its place. */
            cell_split( c );
            
            /* Remove empty progeny. */
            for ( k = 0 ; k < 8 ; k++ )
                if ( c->progeny[k]->count == 0 ) {
                    changes += !wasmt[k];
                    space_recycle( s , c->progeny[k] );
                    c->progeny[k] = NULL;
                    }
                else
                    changes += wasmt[k];
        
            /* Recurse. */
            for ( k = 0 ; k < 8 ; k++ )
                if ( c->progeny[k] != NULL )
                    changes += space_rebuild_recurse( s , c->progeny[k] );
                    
            }
    
        }
        
    /* Otherwise, try to split it anyway. */
    else {
        space_split( s , c );
        changes += c->split;
        }
        
    /* Return the grand total. */
    return changes;
    
    }

/**
461
 * @brief Re-build the cells as well as the tasks.
462
463
 *
 * @param s The #space in which to update the cells.
464
 * @param cell_max Maximal cell size.
465
466
467
 *
 */
 
468
void space_rebuild ( struct space *s , double cell_max ) {
469

470
471
    float h_max = s->cell_min, dmin;
    int i, j, k, cdim[3], nr_parts = s->nr_parts;
472
    struct cell *restrict c;
473
474
    struct part *restrict finger, *restrict p, *parts = s->parts;
    struct cpart *restrict cfinger;
475
    int *ind;
476
    // ticks tic;
477
    
478
479
480
    /* Be verbose about this. */
    printf( "space_rebuild: (re)building space...\n" ); fflush(stdout);
    
481
    /* Run through the parts and get the current h_max. */
482
    // tic = getticks();
483
484
485
486
487
488
489
490
491
492
493
494
    if ( s->cells != NULL ) {
        for ( k = 0 ; k < s->nr_cells ; k++ ) {
            if ( s->cells[k].h_max > h_max )
                h_max = s->cells[k].h_max;
            }
        }
    else {
        for ( k = 0 ; k < nr_parts ; k++ ) {
            if ( s->parts[k].h > h_max )
                h_max = s->parts[k].h;
            }
        s->h_max = h_max;
495
        }
496
    // printf( "space_rebuild: h_max is %.3e.\n" , h_max );
497
    // printf( "space_rebuild: getting h_min and h_max took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
498
499
500
    
    /* Get the new putative cell dimensions. */
    for ( k = 0 ; k < 3 ; k++ )
Pedro Gonnet's avatar
Pedro Gonnet committed
501
        cdim[k] = floor( s->dim[k] / fmax( h_max*space_stretch , cell_max ) );
502
503
        
    /* Do we need to re-build the upper-level cells? */
504
    // tic = getticks();
505
506
    if ( s->cells == NULL ||
         cdim[0] < s->cdim[0] || cdim[1] < s->cdim[1] || cdim[2] < s->cdim[2] ) {
507
508
509
    
        /* Free the old cells, if they were allocated. */
        if ( s->cells != NULL ) {
510
            for ( k = 0 ; k < s->nr_cells ; k++ ) {
511
                space_rebuild_recycle( s , &s->cells[k] );
512
513
514
                if ( s->cells[k].sort != NULL )
                    free( s->cells[k].sort );
                }
515
516
517
518
            free( s->cells );
            s->maxdepth = 0;
            }
            
519
        /* Set the new cell dimensions only if smaller. */
520
521
522
523
524
        for ( k = 0 ; k < 3 ; k++ ) {
            s->cdim[k] = cdim[k];
            s->h[k] = s->dim[k] / cdim[k];
            s->ih[k] = 1.0 / s->h[k];
            }
525
        dmin = fminf( s->h[0] , fminf( s->h[1] , s->h[2] ) );
526

527
        /* Allocate the highest level of cells. */
Pedro Gonnet's avatar
Pedro Gonnet committed
528
        s->tot_cells = s->nr_cells = cdim[0] * cdim[1] * cdim[2];
529
530
531
532
533
534
535
536
537
538
539
540
541
542
        if ( posix_memalign( (void *)&s->cells , 64 , s->nr_cells * sizeof(struct cell) ) != 0 )
            error( "Failed to allocate cells." );
        bzero( s->cells , s->nr_cells * sizeof(struct cell) );
        for ( k = 0 ; k < s->nr_cells ; k++ )
            if ( lock_init( &s->cells[k].lock ) != 0 )
                error( "Failed to init spinlock." );

        /* Set the cell location and sizes. */
        for ( i = 0 ; i < cdim[0] ; i++ )
            for ( j = 0 ; j < cdim[1] ; j++ )
                for ( k = 0 ; k < cdim[2] ; k++ ) {
                    c = &s->cells[ cell_getid( cdim , i , j , k ) ];
                    c->loc[0] = i*s->h[0]; c->loc[1] = j*s->h[1]; c->loc[2] = k*s->h[2];
                    c->h[0] = s->h[0]; c->h[1] = s->h[1]; c->h[2] = s->h[2];
543
                    c->dmin = dmin;
544
                    c->depth = 0;
545
                    lock_init( &c->lock );
546
                    }
547
548
549
           
        /* Be verbose about the change. */         
        printf( "space_rebuild: set cell dimensions to [ %i %i %i ].\n" , cdim[0] , cdim[1] , cdim[2] ); fflush(stdout);
550
551
                    
        } /* re-build upper-level cells? */
552
    // printf( "space_rebuild: rebuilding upper-level cells took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
553
        
Pedro Gonnet's avatar
Pedro Gonnet committed
554
555
556
557
558
559
560
561
562
563
    /* Otherwise, just clean up the cells. */
    else {
    
        /* Free the old cells, if they were allocated. */
        for ( k = 0 ; k < s->nr_cells ; k++ ) {
            space_rebuild_recycle( s , &s->cells[k] );
            s->cells[k].sorts = NULL;
            s->cells[k].nr_tasks = 0;
            s->cells[k].nr_density = 0;
            s->cells[k].dx_max = 0.0f;
564
565
            s->cells[k].h2dx_max = 0.0f;
            s->cells[k].sorted = 0;
Pedro Gonnet's avatar
Pedro Gonnet committed
566
567
568
569
            }
        s->maxdepth = 0;
    
        }
570
571
        
    /* Run through the particles and get their cell index. */
572
    // tic = getticks();
573
574
    if ( ( ind = (int *)malloc( sizeof(int) * s->nr_parts ) ) == NULL )
        error( "Failed to allocate temporary particle indices." );
575
576
    for ( k = 0 ; k < s->nr_cells ; k++ )
        s->cells[ k ].count = 0;
577
578
579
    #pragma omp parallel for private(p,j)
    for ( k = 0 ; k < nr_parts ; k++ )  {
        p = &parts[k];
580
581
582
583
584
585
        for ( j = 0 ; j < 3 ; j++ )
            if ( p->x[j] < 0.0 )
                p->x[j] += s->dim[j];
            else if ( p->x[j] >= s->dim[j] )
                p->x[j] -= s->dim[j];
        ind[k] = cell_getid( s->cdim , p->x[0]*s->ih[0] , p->x[1]*s->ih[1] , p->x[2]*s->ih[2] );
586
        atomic_inc( &s->cells[ ind[k] ].count );
587
        }
588
    // printf( "space_rebuild: getting particle indices took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
589
590

    /* Sort the parts according to their cells. */
591
    // tic = getticks();
592
    parts_sort( parts , ind , s->nr_parts , 0 , s->nr_cells );
593
    // printf( "space_rebuild: parts_sort took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
594
595
596
    
    /* We no longer need the indices as of here. */
    free( ind );    
597
598

    /* Hook the cells up to the parts. */
599
    // tic = getticks();
600
601
602
    finger = s->parts;
    cfinger = s->cparts;
    for ( k = 0 ; k < s->nr_cells ; k++ ) {
603
604
605
606
607
608
        c = &s->cells[ k ];
        c->parts = finger;
        c->cparts = cfinger;
        finger = &finger[ c->count ];
        cfinger = &cfinger[ c->count ];
        }
609
    // printf( "space_rebuild: hooking up cells took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
610
        
611
612
    /* At this point, we have the upper-level cells, old or new. Now make
       sure that the parts in each cell are ok. */
613
    // tic = getticks();
614
    #pragma omp parallel for schedule(dynamic,1) shared(s)
615
    for ( k = 0 ; k < s->nr_cells ; k++ )
Pedro Gonnet's avatar
Pedro Gonnet committed
616
        space_split( s , &s->cells[k] );
617
    // printf( "space_rebuild: space_rebuild_recurse took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
618
        
619
    /* Now that we have the cell structre, re-build the tasks. */
620
    // tic = getticks();
621
    space_maketasks( s , 1 );
622
    // printf( "space_rebuild: maketasks took %.3f ms.\n" , (double)(getticks() - tic) / CPU_TPS * 1000 );
623
    
624
625
626
    }


627
/**
628
 * @brief Sort the particles and condensed particles according to the given indices.
629
630
631
632
633
634
635
636
637
638
 *
 * @param parts The list of #part
 * @param ind The indices with respect to which the parts are sorted.
 * @param N The number of parts
 * @param min Lowest index.
 * @param max highest index.
 *
 * This function calls itself recursively.
 */
 
639
void parts_sort_rec ( struct part *parts , int *ind , int N , int min , int max ) {
640
641
642
643
644
645

    int pivot = (min + max) / 2;
    int i = 0, j = N-1;
    int temp_i;
    struct part temp_p;
    
646
647
648
649
650
651
    /* If N is small enough, just do insert sort. */
    if ( N < 16 ) {
    
        for ( i = 1 ; i < N ; i++ )
            if ( ind[i] < ind[i-1] ) {
                temp_i = ind[i];
Pedro Gonnet's avatar
Pedro Gonnet committed
652
                temp_p = parts[i];
653
654
655
656
657
658
659
660
                for ( j = i ; j > 0 && ind[j-1] > temp_i ; j-- ) {
                    ind[j] = ind[j-1];
                    parts[j] = parts[j-1];
                    }
                ind[j] = temp_i;
                parts[j] = temp_p;
                }
    
661
662
        }
        
663
664
665
666
667
668
669
670
671
672
673
674
675
    /* Otherwise, recurse with Quicksort. */
    else {
    
        /* One pass of quicksort. */
        while ( i < j ) {
            while ( i < N && ind[i] <= pivot )
                i++;
            while ( j >= 0 && ind[j] > pivot )
                j--;
            if ( i < j ) {
                temp_i = ind[i]; ind[i] = ind[j]; ind[j] = temp_i;
                temp_p = parts[i]; parts[i] = parts[j]; parts[j] = temp_p;
                }
676
            }
677
678

        /* Verify sort. */
Pedro Gonnet's avatar
Pedro Gonnet committed
679
        /* for ( int k = 0 ; k <= j ; k++ )
680
681
682
683
684
685
686
687
            if ( ind[k] > pivot ) {
                printf( "parts_sort: sorting failed at k=%i, ind[k]=%i, pivot=%i, i=%i, j=%i, N=%i.\n" , k , ind[k] , pivot , i , j , N );
                error( "Sorting failed (<=pivot)." );
                }
        for ( int k = j+1 ; k < N ; k++ )
            if ( ind[k] <= pivot ) {
                printf( "parts_sort: sorting failed at k=%i, ind[k]=%i, pivot=%i, i=%i, j=%i, N=%i.\n" , k , ind[k] , pivot , i , j , N );
                error( "Sorting failed (>pivot)." );
Pedro Gonnet's avatar
Pedro Gonnet committed
688
                } */
689

Pedro Gonnet's avatar
Pedro Gonnet committed
690
        /* Recurse on the left? */
691
692
        if ( j > 0  && pivot > min ) {
            #pragma omp task untied
Pedro Gonnet's avatar
Pedro Gonnet committed
693
            parts_sort( parts , ind , j+1 , min , pivot );
694
            }
695

Pedro Gonnet's avatar
Pedro Gonnet committed
696
        /* Recurse on the right? */
697
698
        if ( i < N && pivot+1 < max ) {
            #pragma omp task untied
Pedro Gonnet's avatar
Pedro Gonnet committed
699
            parts_sort( &parts[i], &ind[i], N-i , pivot+1 , max );
700
            }
701
            
702
703
        }
    
704
705
706
    }


707
708
709
710
711
712
713
714
715
716
717
718
void parts_sort ( struct part *parts , int *ind , int N , int min , int max ) {

    /* Call the first sort as an OpenMP task. */
    #pragma omp parallel
    {
        #pragma omp single nowait
        parts_sort_rec( parts , ind , N , min , max );
    }
    
    }


Pedro Gonnet's avatar
Pedro Gonnet committed
719
/**
720
 * @brief Mapping function to free the sorted indices buffers.
Pedro Gonnet's avatar
Pedro Gonnet committed
721
722
723
724
725
726
727
728
729
730
731
732
 */

void space_map_clearsort ( struct cell *c , void *data ) {

    if ( c->sort != NULL ) {
        free( c->sort );
        c->sort = NULL;
        }

    }


733
734
/**
 * @brief Mapping function to append a ghost task to each cell.
Pedro Gonnet's avatar
Pedro Gonnet committed
735
736
737
738
 *
 * Looks for the super cell, e.g. the highest-level cell above each
 * cell for which a pair is defined. All ghosts below this cell will
 * depend on the ghost of their parents (sounds spooky, but it isn't).
739
740
741
742
743
 */

void space_map_mkghosts ( struct cell *c , void *data ) {

    struct space *s = (struct space *)data;
Pedro Gonnet's avatar
Pedro Gonnet committed
744
    struct cell *finger;
745

Pedro Gonnet's avatar
Pedro Gonnet committed
746
747
748
749
750
751
752
    /* Find the super cell, i.e. the highest cell hierarchically above
       this one to still have at least one task associated with it. */
    c->super = c;
    for ( finger = c->parent ; finger != NULL ; finger = finger->parent )
        if ( finger->nr_tasks > 0 )
            c->super = finger;
            
Pedro Gonnet's avatar
Pedro Gonnet committed
753
    /* Make the ghost task */
Pedro Gonnet's avatar
Pedro Gonnet committed
754
    if ( c->super != c || c->nr_tasks > 0 )
755
        c->ghost = space_addtask( s , task_type_ghost , task_subtype_none , 0 , 0 , c , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
756
757
758
759
760
761
762
763
764

    /* If we are not the super cell ourselves, make our ghost depend
       on our parent cell. */
    if ( c->super != c )
        task_addunlock( c->parent->ghost , c->ghost );
    
    }


Pedro Gonnet's avatar
Pedro Gonnet committed
765
766
767
768
/**
 * @brief Map a function to all particles in a aspace.
 *
 * @param s The #space we are working in.
769
770
 * @param fun Function pointer to apply on the cells.
 * @param data Data passed to the function fun.
Pedro Gonnet's avatar
Pedro Gonnet committed
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
 */
 
void space_map_parts ( struct space *s , void (*fun)( struct part *p , struct cell *c , void *data ) , void *data ) {

    int i;

    void rec_map ( struct cell *c ) {
    
        int k;
        
        /* No progeny? */
        if ( !c->split )
            for ( k = 0 ; k < c->count ; k++ )
                fun( &c->parts[k] , c , data );
                
        /* Otherwise, recurse. */
        else
            for ( k = 0 ; k < 8 ; k++ )
                if ( c->progeny[k] != NULL )
                    rec_map( c->progeny[k] );
                
        }
        
    /* Call the recursive function on all higher-level cells. */
795
    #pragma omp parallel for schedule(dynamic,1)
Pedro Gonnet's avatar
Pedro Gonnet committed
796
797
798
799
800
801
802
803
804
805
    for ( i = 0 ; i < s->nr_cells ; i++ )
        rec_map( &s->cells[i] );

    }


/**
 * @brief Map a function to all particles in a aspace.
 *
 * @param s The #space we are working in.
806
 * @param full Map to all cells, including cells with sub-cells.
807
808
 * @param fun Function pointer to apply on the cells.
 * @param data Data passed to the function fun.
Pedro Gonnet's avatar
Pedro Gonnet committed
809
810
 */
 
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
void space_map_cells_post ( struct space *s , int full , void (*fun)( struct cell *c , void *data ) , void *data ) {

    int i;

    void rec_map ( struct cell *c ) {
    
        int k;
        
        /* Recurse. */
        if ( c->split )
            for ( k = 0 ; k < 8 ; k++ )
                if ( c->progeny[k] != NULL )
                    rec_map( c->progeny[k] );
                
        /* No progeny? */
        if ( full || !c->split )
            fun( c , data );
                
        }
        
    /* Call the recursive function on all higher-level cells. */
832
    #pragma omp parallel for schedule(dynamic,1)
833
834
835
836
837
838
839
    for ( i = 0 ; i < s->nr_cells ; i++ )
        rec_map( &s->cells[i] );

    }


void space_map_cells_pre ( struct space *s , int full , void (*fun)( struct cell *c , void *data ) , void *data ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
840
841
842
843
844
845
846
847

    int i;

    void rec_map ( struct cell *c ) {
    
        int k;
        
        /* No progeny? */
848
        if ( full || !c->split )
Pedro Gonnet's avatar
Pedro Gonnet committed
849
850
            fun( c , data );
                
851
852
        /* Recurse. */
        if ( c->split )
Pedro Gonnet's avatar
Pedro Gonnet committed
853
854
855
856
857
858
859
            for ( k = 0 ; k < 8 ; k++ )
                if ( c->progeny[k] != NULL )
                    rec_map( c->progeny[k] );
                
        }
        
    /* Call the recursive function on all higher-level cells. */
860
    #pragma omp parallel for schedule(dynamic,1)
Pedro Gonnet's avatar
Pedro Gonnet committed
861
862
863
864
865
866
867
868
869
870
    for ( i = 0 ; i < s->nr_cells ; i++ )
        rec_map( &s->cells[i] );

    }


/**
 * @brief Add a #task to the #space.
 *
 * @param s The #space we are working in.
871
872
873
874
875
876
877
 * @param type The type of the task.
 * @param subtype The sub-type of the task.
 * @param flags The flags of the task.
 * @param wait 
 * @param ci The first cell to interact.
 * @param cj The second cell to interact.
 * @param tight
Pedro Gonnet's avatar
Pedro Gonnet committed
878
879
 */
 
880
struct task *space_addtask ( struct space *s , int type , int subtype , int flags , int wait , struct cell *ci , struct cell *cj , int tight ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
881

882
    int ind;
883
884
885
    struct task *t;
    
    /* Get the next free task. */
886
887
    ind = atomic_inc( &s->tasks_next );
    t = &s->tasks[ ind ];
Pedro Gonnet's avatar
Pedro Gonnet committed
888
889
890
    
    /* Copy the data. */
    t->type = type;
891
    t->subtype = subtype;
Pedro Gonnet's avatar
Pedro Gonnet committed
892
893
894
895
    t->flags = flags;
    t->wait = wait;
    t->ci = ci;
    t->cj = cj;
896
    t->skip = 0;
897
    t->tight = tight;
898
    t->nr_unlock_tasks = 0;
Pedro Gonnet's avatar
Pedro Gonnet committed
899
    
900
901
902
903
    /* Init the lock. */
    lock_init( &t->lock );
    
    /* Add an index for it. */
904
905
    lock_lock( &s->lock );
    s->tasks_ind[ s->nr_tasks ] = ind;
Pedro Gonnet's avatar
Pedro Gonnet committed
906
    s->nr_tasks += 1;
907
908
    lock_unlock_blind( &s->lock );
    
Pedro Gonnet's avatar
Pedro Gonnet committed
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
    /* Return a pointer to the new task. */
    return t;

    }



/**
 * @brief Split tasks that may be too large.
 *
 * @param s The #space we are working in.
 */
 
void space_splittasks ( struct space *s ) {

924
    int j, k, ind, sid, tid = 0, redo;
Pedro Gonnet's avatar
Pedro Gonnet committed
925
926
    struct cell *ci, *cj;
    double hi, hj, shift[3];
927
    struct task *t, *t_old;
928
    // float dt_step = s->dt_step;
929
930
931
932
933
    int pts[7][8] = { { -1 , 12 , 10 ,  9 ,  4 ,  3 ,  1 ,  0 } ,
                      { -1 , -1 , 11 , 10 ,  5 ,  4 ,  2 ,  1 } ,
                      { -1 , -1 , -1 , 12 ,  7 ,  6 ,  4 ,  3 } , 
                      { -1 , -1 , -1 , -1 ,  8 ,  7 ,  5 ,  4 } ,
                      { -1 , -1 , -1 , -1 , -1 , 12 , 10 ,  9 } ,
934
935
                      { -1 , -1 , -1 , -1 , -1 , -1 , 11 , 10 } ,
                      { -1 , -1 , -1 , -1 , -1 , -1 , -1 , 12 } };
Pedro Gonnet's avatar
Pedro Gonnet committed
936
937

    /* Loop through the tasks... */
938
939
940
941
    #pragma omp parallel shared(s,tid,pts) private(ind,j,k,t,t_old,redo,ci,cj,hi,hj,sid,shift)
    {
    redo = 0; t_old = t = NULL;
    while ( redo || tid < s->nr_tasks ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
942
943
    
        /* Get a pointer on the task. */
944
945
946
947
948
949
950
951
952
        if ( redo ) {
            redo = 0;
            t = t_old;
            }
        else {
            if ( ( ind = atomic_inc( &tid ) ) >= s->nr_tasks )
                break;
            t_old = t = &s->tasks[ s->tasks_ind[ ind ] ];
            }
953
        
954
955
956
957
958
959
960
        /* Empty task? */
        if ( t->ci == NULL || ( t->type == task_type_pair && t->cj == NULL ) ) {
            t->type = task_type_none;
            t->skip = 1;
            continue;
            }
        
961
962
963
964
965
        /* Self-interaction? */
        if ( t->type == task_type_self ) {
        
            /* Get a handle on the cell involved. */
            ci = t->ci;
Pedro Gonnet's avatar
Pedro Gonnet committed
966
            
967
            /* Ingore this task? */
968
            /* if ( ci->dt_min > dt_step ) {
969
                t->skip = 1;
970
                continue;
971
                } */
972
            
973
974
975
            /* Is this cell even split? */
            if ( !ci->split )
                continue;
Pedro Gonnet's avatar
Pedro Gonnet committed
976
            
977
            /* Make a sub? */
978
            if ( space_dosub && ci->count < space_subsize ) {
979
980
981
982
983
984
            
                /* convert to a self-subtask. */
                t->type = task_type_sub;
                
                /* Wait for this tasks sorts, as we will now have pairwise
                   components in this sub. */
985
                space_addsorts( s , t , ci , NULL , -1 );
986
987
988
989
990
991
992
            
                }
                
            /* Otherwise, make tasks explicitly. */
            else {
            
                /* Take a step back (we're going to recycle the current task)... */
993
                redo = 1;
994
995
996
997
998
999

                /* Add the self taks. */
                for ( k = 0 ; ci->progeny[k] == NULL ; k++ );
                t->ci = ci->progeny[k];
                for ( k += 1 ; k < 8 ; k++ )
                    if ( ci->progeny[k] != NULL )
1000
                        space_addtask( s , task_type_self , task_subtype_density , 0 , 0 , ci->progeny[k] , NULL , 0 );
1001
1002
1003
            
                /* Make a task for each pair of progeny. */
                for ( j = 0 ; j < 8 ; j++ )
1004
                    if ( ci->progeny[j] != NULL )
1005
                        for ( k = j + 1 ; k < 8 ; k++ )
1006
                            if ( ci->progeny[k] != NULL )
1007
                                space_addtask( s , task_type_pair , task_subtype_density , pts[j][k] , 0 , ci->progeny[j] , ci->progeny[k] , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1008
                }
1009
1010
1011
1012
1013
1014
1015
1016
1017
        
            }
    
        /* Pair interaction? */
        else if ( t->type == task_type_pair ) {
            
            /* Get a handle on the cells involved. */
            ci = t->ci;
            cj = t->cj;
1018
1019
            hi = ci->dmin;
            hj = cj->dmin;
1020

1021
            /* Ingore this task? */
1022
            /* if ( ci->dt_min > dt_step && cj->dt_min > dt_step ) {
1023
                t->skip = 1;
1024
                continue;
1025
                } */
1026
1027
1028
1029
1030
            
            /* Get the sort ID, use space_getsid and not t->flags
               to make sure we get ci and cj swapped if needed. */
            sid = space_getsid( s , &ci , &cj , shift );
                
1031
1032
            /* Should this task be split-up? */
            if ( ci->split && cj->split &&
1033
                 ci->h_max < hi/2 && cj->h_max < hj/2 ) {
1034
1035
                 
                /* Replace by a single sub-task? */
1036
1037
                if ( space_dosub &&
                     ci->count < space_subsize && cj->count < space_subsize &&
1038
                     sid != 0 && sid != 2 && sid != 6 && sid != 8 ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
1039
                
1040
1041
1042
                    /* Make this task a sub task. */
                    t->type = task_type_sub;
                    t->flags = sid;
1043
                    t->ci = ci; t->cj = cj;
Pedro Gonnet's avatar
Pedro Gonnet committed
1044
                    
1045
                    /* Create the sorts recursively. */
1046
                    // space_addsorts( s , t , ci , cj , sid );
1047
1048
1049
1050
1051
1052
1053
                    
                    /* Don't go any further. */
                    continue;
                
                    }

                /* Take a step back (we're going to recycle the current task)... */
1054
                redo = 1;
1055
1056
1057
1058
1059

                /* For each different sorting type... */
                switch ( sid ) {

                    case 0: /* (  1 ,  1 ,  1 ) */
1060
                        t->ci = ci->progeny[7]; t->cj = cj->progeny[0]; t->flags = 0;
1061
1062
1063
                        break;

                    case 1: /* (  1 ,  1 ,  0 ) */
1064
1065
1066
1067
                        t->ci = ci->progeny[6]; t->cj = cj->progeny[0]; t->flags = 1; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 1 , 0 , ci->progeny[7] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 0 , 0 , ci->progeny[6] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 2 , 0 , ci->progeny[7] , cj->progeny[0] , 1 );
1068
1069
1070
                        break;

                    case 2: /* (  1 ,  1 , -1 ) */
1071
                        t->ci = ci->progeny[6]; t->cj = cj->progeny[1]; t->flags = 2; t->tight = 1;
1072
1073
1074
                        break;

                    case 3: /* (  1 ,  0 ,  1 ) */
1075
1076
1077
1078
                        t->ci = ci->progeny[5]; t->cj = cj->progeny[0]; t->flags = 3; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 3 , 0 , ci->progeny[7] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 0 , 0 , ci->progeny[5] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 6 , 0 , ci->progeny[7] , cj->progeny[0] , 1 );
1079
1080
1081
                        break;

                    case 4: /* (  1 ,  0 ,  0 ) */
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[0]; t->flags = 4; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 5 , 0 , ci->progeny[5] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 7 , 0 , ci->progeny[6] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 8 , 0 , ci->progeny[7] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 3 , 0 , ci->progeny[4] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 4 , 0 , ci->progeny[5] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 6 , 0 , ci->progeny[6] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 7 , 0 , ci->progeny[7] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 1 , 0 , ci->progeny[4] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 2 , 0 , ci->progeny[5] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 4 , 0 , ci->progeny[6] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 5 , 0 , ci->progeny[7] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 0 , 0 , ci->progeny[4] , cj->progeny[3] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 1 , 0 , ci->progeny[5] , cj->progeny[3] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 3 , 0 , ci->progeny[6] , cj->progeny[3] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 4 , 0 , ci->progeny[7] , cj->progeny[3] , 1 );
1098
1099
1100
                        break;

                    case 5: /* (  1 ,  0 , -1 ) */
1101
1102
1103
1104
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[1]; t->flags = 5; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 5 , 0 , ci->progeny[6] , cj->progeny[3] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 2 , 0 , ci->progeny[4] , cj->progeny[3] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 8 , 0 , ci->progeny[6] , cj->progeny[1] , 1 );
1105
1106
1107
                        break;

                    case 6: /* (  1 , -1 ,  1 ) */
1108
                        t->ci = ci->progeny[5]; t->cj = cj->progeny[2]; t->flags = 6; t->tight = 1;
1109
1110
1111
                        break;

                    case 7: /* (  1 , -1 ,  0 ) */
1112
1113
1114
1115
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[3]; t->flags = 6; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 8 , 0 , ci->progeny[5] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 7 , 0 , ci->progeny[4] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 7 , 0 , ci->progeny[5] , cj->progeny[3] , 1 );
1116
1117
1118
                        break;

                    case 8: /* (  1 , -1 , -1 ) */
1119
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[3]; t->flags = 8; t->tight = 1;
1120
1121
1122
                        break;

                    case 9: /* (  0 ,  1 ,  1 ) */
1123
1124
1125
1126
                        t->ci = ci->progeny[3]; t->cj = cj->progeny[0]; t->flags = 9; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 9 , 0 , ci->progeny[7] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 0 , 0 , ci->progeny[3] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 8 , 0 , ci->progeny[7] , cj->progeny[0] , 1 );
1127
1128
1129
                        break;

                    case 10: /* (  0 ,  1 ,  0 ) */
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
                        t->ci = ci->progeny[2]; t->cj = cj->progeny[0]; t->flags = 10; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 11 , 0 , ci->progeny[3] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 7 , 0 , ci->progeny[6] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 6 , 0 , ci->progeny[7] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 9 , 0 , ci->progeny[2] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 10 , 0 , ci->progeny[3] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 8 , 0 , ci->progeny[6] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 7 , 0 , ci->progeny[7] , cj->progeny[1] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 1 , 0 , ci->progeny[2] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 2 , 0 , ci->progeny[3] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 10 , 0 , ci->progeny[6] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 11 , 0 , ci->progeny[7] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 0 , 0 , ci->progeny[2] , cj->progeny[5] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 1 , 0 , ci->progeny[3] , cj->progeny[5] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 9 , 0 , ci->progeny[6] , cj->progeny[5] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 10 , 0 , ci->progeny[7] , cj->progeny[5] , 1 );
1146
1147
1148
                        break;

                    case 11: /* (  0 ,  1 , -1 ) */
1149
1150
1151
1152
                        t->ci = ci->progeny[2]; t->cj = cj->progeny[1]; t->flags = 11; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 11 , 0 , ci->progeny[6] , cj->progeny[5] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 2 , 0 , ci->progeny[2] , cj->progeny[5] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 6 , 0 , ci->progeny[6] , cj->progeny[1] , 1 );
1153
1154
1155
                        break;

                    case 12: /* (  0 ,  0 ,  1 ) */
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
                        t->ci = ci->progeny[1]; t->cj = cj->progeny[0]; t->flags = 12; t->tight = 1;
                        t = space_addtask( s , task_type_pair , t->subtype , 11 , 0 , ci->progeny[3] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 5 , 0 , ci->progeny[5] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 2 , 0 , ci->progeny[7] , cj->progeny[0] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 9 , 0 , ci->progeny[1] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 12 , 0 , ci->progeny[3] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 8 , 0 , ci->progeny[5] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 5 , 0 , ci->progeny[7] , cj->progeny[2] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 3 , 0 , ci->progeny[1] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 6 , 0 , ci->progeny[3] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 12 , 0 , ci->progeny[5] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 11 , 0 , ci->progeny[7] , cj->progeny[4] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 0 , 0 , ci->progeny[1] , cj->progeny[6] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 3 , 0 , ci->progeny[3] , cj->progeny[6] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 9 , 0 , ci->progeny[5] , cj->progeny[6] , 1 );
                        t = space_addtask( s , task_type_pair , t->subtype , 12 , 0 , ci->progeny[7] , cj->progeny[6] , 1 );
1172
1173
1174
1175
1176
                        break;

                    }

                } /* split this task? */
Pedro Gonnet's avatar
Pedro Gonnet committed
1177
                
1178
1179
1180
1181
            /* Otherwise, if not spilt, stitch-up the sorting. */
            else {
            
                /* Create the sort for ci. */
1182
                lock_lock( &ci->lock );