space.c 72.8 KB
Newer Older
Pedro Gonnet's avatar
Pedro Gonnet committed
1
2
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
34
/*******************************************************************************
 * This file is part of GadgetSMP.
 * 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"
#include "lock.h"
35
36
37
#include "task.h"
#include "part.h"
#include "cell.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
38
39
40
41
42
43
44
45
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
77
78
#include "space.h"
#include "runner.h"

/* Error macro. */
#define error(s) { printf( "%s:%s:%i: %s\n" , __FILE__ , __FUNCTION__ , __LINE__ , s ); abort(); }

/* Split size. */
int space_splitsize = space_splitsize_default;

/* 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 
    };
    
    
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
/**
 * @breif Recursively dismantle a cell tree.
 *
 */
 
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;
                }
    
    }

/**
 * @breif Recursively rebuild a cell tree.
 *
 */
 
int space_rebuild_recurse ( struct space *s , struct cell *c ) {
    
    int k, count, changes = 0, wasmt[8];
    float h, h_limit, h_max = 0.0f;
    struct cell *temp;
    
    /* 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++ ) {
            h = c->parts[k].h;
            if ( h <= h_limit )
                count += 1;
            if ( h > h_max )
                h_max = h;
            }
        c->h_max = h_max;
            
        /* 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;
                    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;
                    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;
    
    }

/**
 * @breif Re-build the cells as well as the tasks.
 *
 * @param s The #space in which to update the cells.
 * @param force Flag to force re-building the cells and tasks.
 *
 * @return 1 if changes to the cells and/or tasks were made.
 */
 
int space_rebuild ( struct space *s , int force ) {

211
    float h_max = s->parts[0].h, h_min = s->parts[0].h;
212
213
    int i, j, k, cdim[3];
    struct cell *c;
214
215
    struct part *finger;
    int *ind, changes = 0;
216
217
218
219
220
    
    /* Run through the parts and get the current h_max. */
    for ( k = 0 ; k < s->nr_parts ; k++ )
        if ( s->parts[k].h > h_max )
            h_max = s->parts[k].h;
221
222
223
224
        else if ( s->parts[k].h < h_min )
            h_min = s->parts[k].h;
    s->h_min = h_min;
    s->h_max = h_max;
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
    
    /* Get the new putative cell dimensions. */
    for ( k = 0 ; k < 3 ; k++ )
        cdim[k] = floor( s->dim[k] / h_max );
        
    /* Do we need to re-build the upper-level cells? */
    if ( force || cdim[0] < s->cdim[0] || cdim[1] < s->cdim[1] || cdim[2] < s->cdim[2] ) {
    
        /* Free the old cells, if they were allocated. */
        if ( s->cells != NULL ) {
            for ( k = 0 ; k < s->nr_cells ; k++ )
                space_rebuild_recycle( s , &s->cells[k] );
            free( s->cells );
            s->maxdepth = 0;
            }
            
        /* Set the new cell dimensions. */
        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];
            }
    
        /* Allocate the highest level of cells. */
        s->nr_cells = cdim[0] * cdim[1] * cdim[2];
        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];
                    c->depth = 0;
                    }
                    
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
        /* Run through the particles and get their cell index. */
        ind = (int *)alloca( sizeof(int) * s->nr_parts );
        for ( k = 0 ; k < s->nr_parts ; k++ )  {
            ind[k] = cell_getid( cdim , s->parts[k].x[0]*s->ih[0] , s->parts[k].x[1]*s->ih[1] , s->parts[k].x[2]*s->ih[2] );
            s->cells[ ind[k] ].count += 1;
            }

        /* Sort the parts according to their cells. */
        parts_sort( s->parts , ind , s->nr_parts , 0 , s->nr_cells );        
                    
        /* Hook the cells up to the parts. */
        for ( finger = s->parts , k = 0 ; k < s->nr_cells ; k++ ) {
            c = &s->cells[ k ];
            c->parts = finger;
            finger = &finger[ c->count ];
            }
        
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
        /* There were massive changes. */
        changes = 1;
        
        } /* re-build upper-level cells? */
        
    /* At this point, we have the upper-level cells, old or new. Now make
       sure that the parts in each cell are ok. */
    for ( k = 0 ; k < s->nr_cells ; k++ )
        changes += space_rebuild_recurse( s , &s->cells[k] );
        
    /* Now that we have the cell structre, re-build the tasks. */
    if ( changes )
        space_maketasks( s , 1 );
    
    /* Return the number of changes. */
    return changes;

    }


304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
/**
 * @brief Sort the particles according to the given indices.
 *
 * @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.
 */
 
void parts_sort ( struct part *parts , int *ind , int N , int min , int max ) {

    int pivot = (min + max) / 2;
    int i = 0, j = N-1;
    int temp_i;
    struct part temp_p;
    
    /* 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;
            }
        }
        
    /* Verify sort. */
    for ( int k = 0 ; k <= j ; 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)." );
            }
    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)." );
            }
        
    /* Recurse on the left? */
    if ( j > 0 && pivot > min )
        parts_sort( parts , ind , j+1 , min , pivot );
        
    /* Recurse on the right? */
    if ( i < N && pivot+1 < max )
        parts_sort( &parts[i], &ind[i], N-i , pivot+1 , max );

    }


Pedro Gonnet's avatar
Pedro Gonnet committed
358
/**
359
 * @brief Mapping function to free the sorted indices buffers.
Pedro Gonnet's avatar
Pedro Gonnet committed
360
361
362
363
364
365
366
367
368
369
370
371
 */

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

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

    }


372
373
/**
 * @brief Mapping function to append a ghost task to each cell.
Pedro Gonnet's avatar
Pedro Gonnet committed
374
375
376
377
 *
 * 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).
378
379
380
381
382
 */

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

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

Pedro Gonnet's avatar
Pedro Gonnet committed
385
386
387
388
389
390
391
    /* 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
392
    /* Make the ghost task */
Pedro Gonnet's avatar
Pedro Gonnet committed
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
    if ( c->super != c || c->nr_tasks > 0 )
        c->ghost = space_addtask( s , task_type_ghost , task_subtype_none , 0 , 0 , c , NULL , NULL , 0 , NULL , 0 );

    /* 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 );
    
    }


/**
 * @brief Mapping function to clear the number of tasks in each cell.
 */

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

    c->nr_tasks = 0;
411
    c->nr_density = 0;
412
413
414
415

    }


Pedro Gonnet's avatar
Pedro Gonnet committed
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
/**
 * @brief Get a task free of dependencies and conflicts.
 *
 * @param s The #space.
 */
 
struct task *space_gettask ( struct space *s ) {

    int k, tid = -1;
    struct task *res = NULL;
    struct cell *c;

    /* Main loop, while there are tasks... */
    while ( s->next_task < s->nr_tasks ) {
    
        /* Grab the task lock. */
        if ( lock_lock( &s->task_lock ) != 0 )
            error( "Locking the task_lock failed.\n" );
            
        /* Loop over the remaining task IDs. */
        for ( k = s->next_task ; k < s->nr_tasks ; k++ ) {
        
            /* Put a finger on the task. */
            res = &s->tasks[ s->tasks_ind[k] ];
            
            /* Is this task blocked? */
            if ( res->wait )
                continue;
            
            /* Different criteria for different types. */
            switch ( res->type ) {
447
                case task_type_self:
Pedro Gonnet's avatar
Pedro Gonnet committed
448
449
450
                    if ( res->ci->lock || res->ci->wait > 0 )
                        continue;
                    break;
451
                case task_type_pair:
Pedro Gonnet's avatar
Pedro Gonnet committed
452
453
454
                    if ( res->ci->lock || res->cj->lock || res->ci->wait || res->cj->wait )
                        continue;
                    break;
455
                case task_type_sort:
Pedro Gonnet's avatar
Pedro Gonnet committed
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
                    if ( res->ci->lock )
                        continue;
                    break;
                }
            
            /* If we made it this far, we're safe. */
            break;
        
            } /* loop over the task IDs. */
            
        /* Did we get a task? */
        if ( k < s->nr_tasks ) {
        
            // /* Swap to front. */
            // tid = s->tasks_ind[k];
            // s->tasks_ind[k] = s->tasks_ind[ s->next_task ];
            // s->tasks_ind[ s->next_task ] = tid;
            
            /* Bubble-down the task. */
            tid = s->tasks_ind[k];
            while ( k > s->next_task ) {
                s->tasks_ind[ k ] = s->tasks_ind[ k-1 ];
                k -= 1;
                }
            s->tasks_ind[ s->next_task ] = tid;
            
            /* Lock the cells, if needed. */
483
            if ( s->tasks[tid].type != task_type_sort ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
                for ( c = res->ci ; c != NULL ; c = c->parent )
                    __sync_fetch_and_add( &c->lock , 1 );
                for ( c = res->cj ; c != NULL ; c = c->parent )
                    __sync_fetch_and_add( &c->lock , 1 );
                }
            
            /* up the counter. */
            s->next_task += 1;
        
            }
    
        /* Release the task lock. */
        if ( lock_unlock( &s->task_lock ) != 0 )
            error( "Locking the task_lock failed.\n" );
            
        /* Leave? */
        if ( tid >= 0 )
            return &s->tasks[tid];
    
        } /* while there are tasks. */
        
    /* No beef. */
    return NULL;

    }


/**
 * @brief Map a function to all particles in a aspace.
 *
 * @param s The #space we are working in.
 */
 
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. */
    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.
549
 * @param full Map to all cells, including cells with sub-cells.
Pedro Gonnet's avatar
Pedro Gonnet committed
550
551
 */
 
552
void space_map_cells ( struct space *s , int full , void (*fun)( struct cell *c , void *data ) , void *data ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
553
554
555
556
557
558
559
560

    int i;

    void rec_map ( struct cell *c ) {
    
        int k;
        
        /* No progeny? */
561
        if ( full || !c->split )
Pedro Gonnet's avatar
Pedro Gonnet committed
562
563
            fun( c , data );
                
564
565
        /* Recurse. */
        if ( c->split )
Pedro Gonnet's avatar
Pedro Gonnet committed
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
            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. */
    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.
 */
 
585
struct task *space_addtask ( struct space *s , int type , int subtype , int flags , int wait , struct cell *ci , struct cell *cj , struct task *unlock_tasks[] , int nr_unlock_tasks , struct cell *unlock_cells[] , int nr_unlock_cells ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
586
587
588
589
590

    struct task *t = &s->tasks[ s->nr_tasks ];
    
    /* Copy the data. */
    t->type = type;
591
    t->subtype = subtype;
Pedro Gonnet's avatar
Pedro Gonnet committed
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
    t->flags = flags;
    t->wait = wait;
    t->ci = ci;
    t->cj = cj;
    if ( unlock_tasks != NULL )
        memcpy( t->unlock_tasks , unlock_tasks , sizeof(struct task *) * nr_unlock_tasks );
    t->nr_unlock_tasks = nr_unlock_tasks;
    if ( unlock_cells != NULL )
        memcpy( t->unlock_cells , unlock_cells , sizeof(struct task *) * nr_unlock_cells );
    t->nr_unlock_cells = nr_unlock_cells;
    
    /* Increase the task counter. */
    s->nr_tasks += 1;
    
    /* 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 ) {

    int k, sid, tid;
    struct cell *ci, *cj;
    double hi, hj, shift[3];
    struct task *t;

    /* Loop through the tasks... */
    for ( tid = 0 ; tid < s->nr_tasks ; tid++ ) {
    
        /* Get a pointer on the task. */
        t = &s->tasks[tid];
    
        /* If this task isn't a pair, i'm not interested. */
633
        if ( t->type != task_type_pair )
Pedro Gonnet's avatar
Pedro Gonnet committed
634
635
636
637
638
639
640
641
642
            continue;
            
        /* Get a handle on the cells involved. */
        ci = t->ci;
        cj = t->cj;
        hi = fmax( ci->h[0] , fmax( ci->h[1] , ci->h[2] ) );
        hj = fmax( cj->h[0] , fmax( cj->h[1] , cj->h[2] ) );
            
        /* Should this task be split-up? */
643
        if ( ci->split && cj->split && ci->h_max*space_stretch < hi/2 && cj->h_max*space_stretch < hj/2 ) {
Pedro Gonnet's avatar
Pedro Gonnet committed
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
        
            /* Get the relative distance between the pairs, wrapping. */
            for ( k = 0 ; k < 3 ; k++ ) {
                if ( cj->loc[k] - ci->loc[k] < -s->dim[k]/2 )
                    shift[k] = s->dim[k];
                else if ( cj->loc[k] - ci->loc[k] > s->dim[k]/2 )
                    shift[k] = -s->dim[k];
                else
                    shift[k] = 0.0;
                }

            /* Get the sorting index. */
            for ( sid = 0 , k = 0 ; k < 3 ; k++ )
                sid = 3*sid + ( (cj->loc[k] - ci->loc[k] + shift[k] < 0) ? 0 : (cj->loc[k] - ci->loc[k] + shift[k] > 0) ? 2 : 1 );

            /* Flip? */
            if ( sid < 13 ) {
                cj = t->ci;
                ci = t->cj;
                t->ci = ci; t->cj = cj;
                }
            else
                sid = 26 - sid;
                
            /* Remove the dependency of this task on the sorts of ci and cj. */
            task_rmunlock( ci->sorts[sid] , t );
            task_rmunlock( cj->sorts[sid] , t );
            ci->nr_pairs -= 1;
            cj->nr_pairs -= 1;
            t->nr_unlock_cells = 0;
                
            /* For each different sorting type... */
            switch ( sid ) {
            
                case 0: /* (  1 ,  1 ,  1 ) */
                    t->ci = ci->progeny[7]; t->cj = cj->progeny[0];
                    task_addunlock( ci->progeny[7]->sorts[0] , t ); task_addunlock( cj->progeny[0]->sorts[0] , t );
                    ci->progeny[7]->nr_pairs += 1;
                    cj->progeny[0]->nr_pairs += 1;
                    break;
                    
                case 1: /* (  1 ,  1 ,  0 ) */
                    if ( space_dosub &&
                         !ci->progeny[6]->split && !ci->progeny[7]->split &&
                         !cj->progeny[0]->split && !cj->progeny[1]->split ) {
689
                        t->type = task_type_sub; t->flags = 1;
Pedro Gonnet's avatar
Pedro Gonnet committed
690
691
692
693
694
695
696
697
                        task_addunlock( ci->progeny[6]->sorts[1] , t ); task_addunlock( cj->progeny[0]->sorts[1] , t );
                        task_addunlock( ci->progeny[7]->sorts[1] , t ); task_addunlock( cj->progeny[1]->sorts[1] , t );
                        task_addunlock( ci->progeny[6]->sorts[0] , t ); task_addunlock( cj->progeny[1]->sorts[0] , t );
                        task_addunlock( ci->progeny[7]->sorts[2] , t ); task_addunlock( cj->progeny[0]->sorts[2] , t );
                        }
                    else {
                        t->ci = ci->progeny[6]; t->cj = cj->progeny[0];
                        task_addunlock( ci->progeny[6]->sorts[1] , t ); task_addunlock( cj->progeny[0]->sorts[1] , t );
698
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
699
                        task_addunlock( ci->progeny[7]->sorts[1] , t ); task_addunlock( cj->progeny[1]->sorts[1] , t );
700
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
701
                        task_addunlock( ci->progeny[6]->sorts[0] , t ); task_addunlock( cj->progeny[1]->sorts[0] , t );
702
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
                        task_addunlock( ci->progeny[7]->sorts[2] , t ); task_addunlock( cj->progeny[0]->sorts[2] , t );
                        }
                    ci->progeny[6]->nr_pairs += 2;
                    ci->progeny[7]->nr_pairs += 2;
                    cj->progeny[0]->nr_pairs += 2;
                    cj->progeny[1]->nr_pairs += 2;
                    break;
                    
                case 2: /* (  1 ,  1 , -1 ) */
                    t->ci = ci->progeny[6]; t->cj = cj->progeny[1];
                    task_addunlock( ci->progeny[6]->sorts[2] , t ); task_addunlock( cj->progeny[1]->sorts[2] , t );
                    ci->progeny[6]->nr_pairs += 1;
                    cj->progeny[1]->nr_pairs += 1;
                    break;
                    
                case 3: /* (  1 ,  0 ,  1 ) */
                    if ( space_dosub &&
                         !ci->progeny[5]->split && !ci->progeny[7]->split &&
                         !cj->progeny[0]->split && !cj->progeny[2]->split ) {
722
                        t->type = task_type_sub; t->flags = 3;
Pedro Gonnet's avatar
Pedro Gonnet committed
723
724
725
726
727
728
729
730
                        task_addunlock( ci->progeny[5]->sorts[3] , t ); task_addunlock( cj->progeny[0]->sorts[3] , t );
                        task_addunlock( ci->progeny[7]->sorts[3] , t ); task_addunlock( cj->progeny[2]->sorts[3] , t );
                        task_addunlock( ci->progeny[5]->sorts[0] , t ); task_addunlock( cj->progeny[2]->sorts[0] , t );
                        task_addunlock( ci->progeny[7]->sorts[6] , t ); task_addunlock( cj->progeny[0]->sorts[6] , t );
                        }
                    else {
                        t->ci = ci->progeny[5]; t->cj = cj->progeny[0];
                        task_addunlock( ci->progeny[5]->sorts[3] , t ); task_addunlock( cj->progeny[0]->sorts[3] , t );
731
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
732
                        task_addunlock( ci->progeny[7]->sorts[3] , t ); task_addunlock( cj->progeny[2]->sorts[3] , t );
733
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
734
                        task_addunlock( ci->progeny[5]->sorts[0] , t ); task_addunlock( cj->progeny[2]->sorts[0] , t );
735
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
736
737
738
739
740
741
742
743
744
745
746
747
                        task_addunlock( ci->progeny[7]->sorts[6] , t ); task_addunlock( cj->progeny[0]->sorts[6] , t );
                        }
                    ci->progeny[5]->nr_pairs += 2;
                    ci->progeny[7]->nr_pairs += 2;
                    cj->progeny[0]->nr_pairs += 2;
                    cj->progeny[2]->nr_pairs += 2;
                    break;
                    
                case 4: /* (  1 ,  0 ,  0 ) */
                    if ( space_dosub &&
                         !ci->progeny[4]->split && !ci->progeny[5]->split && !ci->progeny[6]->split && !ci->progeny[7]->split &&
                         !cj->progeny[0]->split && !cj->progeny[1]->split && !cj->progeny[2]->split && !cj->progeny[3]->split ) {
748
                        t->type = task_type_sub; t->flags = 4;
Pedro Gonnet's avatar
Pedro Gonnet committed
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
                        task_addunlock( ci->progeny[4]->sorts[4] , t ); task_addunlock( cj->progeny[0]->sorts[4] , t );
                        task_addunlock( ci->progeny[5]->sorts[5] , t ); task_addunlock( cj->progeny[0]->sorts[5] , t );
                        task_addunlock( ci->progeny[6]->sorts[7] , t ); task_addunlock( cj->progeny[0]->sorts[7] , t );
                        task_addunlock( ci->progeny[7]->sorts[8] , t ); task_addunlock( cj->progeny[0]->sorts[8] , t );
                        task_addunlock( ci->progeny[4]->sorts[3] , t ); task_addunlock( cj->progeny[1]->sorts[3] , t );
                        task_addunlock( ci->progeny[5]->sorts[4] , t ); task_addunlock( cj->progeny[1]->sorts[4] , t );
                        task_addunlock( ci->progeny[6]->sorts[6] , t ); task_addunlock( cj->progeny[1]->sorts[6] , t );
                        task_addunlock( ci->progeny[7]->sorts[7] , t ); task_addunlock( cj->progeny[1]->sorts[7] , t );
                        task_addunlock( ci->progeny[4]->sorts[1] , t ); task_addunlock( cj->progeny[2]->sorts[1] , t );
                        task_addunlock( ci->progeny[5]->sorts[2] , t ); task_addunlock( cj->progeny[2]->sorts[2] , t );
                        task_addunlock( ci->progeny[6]->sorts[4] , t ); task_addunlock( cj->progeny[2]->sorts[4] , t );
                        task_addunlock( ci->progeny[7]->sorts[5] , t ); task_addunlock( cj->progeny[2]->sorts[5] , t );
                        task_addunlock( ci->progeny[4]->sorts[0] , t ); task_addunlock( cj->progeny[3]->sorts[0] , t );
                        task_addunlock( ci->progeny[5]->sorts[1] , t ); task_addunlock( cj->progeny[3]->sorts[1] , t );
                        task_addunlock( ci->progeny[6]->sorts[3] , t ); task_addunlock( cj->progeny[3]->sorts[3] , t );
                        task_addunlock( ci->progeny[7]->sorts[4] , t ); task_addunlock( cj->progeny[3]->sorts[4] , t );
                        }
                    else {
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[0];
                        task_addunlock( ci->progeny[4]->sorts[4] , t ); task_addunlock( cj->progeny[0]->sorts[4] , t );
769
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
770
                        task_addunlock( ci->progeny[5]->sorts[5] , t ); task_addunlock( cj->progeny[0]->sorts[5] , t );
771
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
772
                        task_addunlock( ci->progeny[6]->sorts[7] , t ); task_addunlock( cj->progeny[0]->sorts[7] , t );
773
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
774
                        task_addunlock( ci->progeny[7]->sorts[8] , t ); task_addunlock( cj->progeny[0]->sorts[8] , t );
775
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[4] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
776
                        task_addunlock( ci->progeny[4]->sorts[3] , t ); task_addunlock( cj->progeny[1]->sorts[3] , t );
777
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
778
                        task_addunlock( ci->progeny[5]->sorts[4] , t ); task_addunlock( cj->progeny[1]->sorts[4] , t );
779
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
780
                        task_addunlock( ci->progeny[6]->sorts[6] , t ); task_addunlock( cj->progeny[1]->sorts[6] , t );
781
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
782
                        task_addunlock( ci->progeny[7]->sorts[7] , t ); task_addunlock( cj->progeny[1]->sorts[7] , t );
783
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[4] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
784
                        task_addunlock( ci->progeny[4]->sorts[1] , t ); task_addunlock( cj->progeny[2]->sorts[1] , t );
785
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
786
                        task_addunlock( ci->progeny[5]->sorts[2] , t ); task_addunlock( cj->progeny[2]->sorts[2] , t );
787
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
788
                        task_addunlock( ci->progeny[6]->sorts[4] , t ); task_addunlock( cj->progeny[2]->sorts[4] , t );
789
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
790
                        task_addunlock( ci->progeny[7]->sorts[5] , t ); task_addunlock( cj->progeny[2]->sorts[5] , t );
791
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[4] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
792
                        task_addunlock( ci->progeny[4]->sorts[0] , t ); task_addunlock( cj->progeny[3]->sorts[0] , t );
793
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
794
                        task_addunlock( ci->progeny[5]->sorts[1] , t ); task_addunlock( cj->progeny[3]->sorts[1] , t );
795
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
796
                        task_addunlock( ci->progeny[6]->sorts[3] , t ); task_addunlock( cj->progeny[3]->sorts[3] , t );
797
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
                        task_addunlock( ci->progeny[7]->sorts[4] , t ); task_addunlock( cj->progeny[3]->sorts[4] , t );
                        }
                    ci->progeny[4]->nr_pairs += 4;
                    ci->progeny[5]->nr_pairs += 4;
                    ci->progeny[6]->nr_pairs += 4;
                    ci->progeny[7]->nr_pairs += 4;
                    cj->progeny[0]->nr_pairs += 4;
                    cj->progeny[1]->nr_pairs += 4;
                    cj->progeny[2]->nr_pairs += 4;
                    cj->progeny[3]->nr_pairs += 4;
                    break;
                    
                case 5: /* (  1 ,  0 , -1 ) */
                    if ( space_dosub &&
                         !ci->progeny[4]->split && !ci->progeny[6]->split &&
                         !cj->progeny[1]->split && !cj->progeny[3]->split ) {
814
                        t->type = task_type_sub; t->flags = 5;
Pedro Gonnet's avatar
Pedro Gonnet committed
815
816
817
818
819
820
821
822
                        task_addunlock( ci->progeny[4]->sorts[5] , t ); task_addunlock( cj->progeny[1]->sorts[5] , t );
                        task_addunlock( ci->progeny[6]->sorts[5] , t ); task_addunlock( cj->progeny[3]->sorts[5] , t );
                        task_addunlock( ci->progeny[4]->sorts[2] , t ); task_addunlock( cj->progeny[3]->sorts[2] , t );
                        task_addunlock( ci->progeny[6]->sorts[8] , t ); task_addunlock( cj->progeny[1]->sorts[8] , t );
                        }
                    else {
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[1];
                        task_addunlock( ci->progeny[4]->sorts[5] , t ); task_addunlock( cj->progeny[1]->sorts[5] , t );
823
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
824
                        task_addunlock( ci->progeny[6]->sorts[5] , t ); task_addunlock( cj->progeny[3]->sorts[5] , t );
825
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[4] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
826
                        task_addunlock( ci->progeny[4]->sorts[2] , t ); task_addunlock( cj->progeny[3]->sorts[2] , t );
827
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
                        task_addunlock( ci->progeny[6]->sorts[8] , t ); task_addunlock( cj->progeny[1]->sorts[8] , t );
                        }
                    ci->progeny[4]->nr_pairs += 2;
                    ci->progeny[6]->nr_pairs += 2;
                    cj->progeny[1]->nr_pairs += 2;
                    cj->progeny[3]->nr_pairs += 2;
                    break;
                    
                case 6: /* (  1 , -1 ,  1 ) */
                    t->ci = ci->progeny[5]; t->cj = cj->progeny[2];
                    task_addunlock( ci->progeny[5]->sorts[6] , t ); task_addunlock( cj->progeny[2]->sorts[6] , t );
                    ci->progeny[5]->nr_pairs += 1;
                    cj->progeny[2]->nr_pairs += 1;
                    break;
                    
                case 7: /* (  1 , -1 ,  0 ) */
                    if ( space_dosub &&
                         !ci->progeny[4]->split && !ci->progeny[5]->split &&
                         !cj->progeny[2]->split && !cj->progeny[3]->split ) {
847
                        t->type = task_type_sub; t->flags = 7;
Pedro Gonnet's avatar
Pedro Gonnet committed
848
849
850
851
852
853
854
855
                        task_addunlock( ci->progeny[4]->sorts[6] , t ); task_addunlock( cj->progeny[3]->sorts[6] , t );
                        task_addunlock( ci->progeny[5]->sorts[8] , t ); task_addunlock( cj->progeny[2]->sorts[8] , t );
                        task_addunlock( ci->progeny[4]->sorts[7] , t ); task_addunlock( cj->progeny[2]->sorts[7] , t );
                        task_addunlock( ci->progeny[5]->sorts[7] , t ); task_addunlock( cj->progeny[3]->sorts[7] , t );
                        }
                    else {
                        t->ci = ci->progeny[4]; t->cj = cj->progeny[3];
                        task_addunlock( ci->progeny[4]->sorts[6] , t ); task_addunlock( cj->progeny[3]->sorts[6] , t );
856
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
857
                        task_addunlock( ci->progeny[5]->sorts[8] , t ); task_addunlock( cj->progeny[2]->sorts[8] , t );
858
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[4] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
859
                        task_addunlock( ci->progeny[4]->sorts[7] , t ); task_addunlock( cj->progeny[2]->sorts[7] , t );
860
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[3] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
                        task_addunlock( ci->progeny[5]->sorts[7] , t ); task_addunlock( cj->progeny[3]->sorts[7] , t );
                        }
                    ci->progeny[4]->nr_pairs += 2;
                    ci->progeny[5]->nr_pairs += 2;
                    cj->progeny[2]->nr_pairs += 2;
                    cj->progeny[3]->nr_pairs += 2;
                    break;
                    
                case 8: /* (  1 , -1 , -1 ) */
                    t->ci = ci->progeny[4]; t->cj = cj->progeny[3];
                    task_addunlock( ci->progeny[4]->sorts[8] , t ); task_addunlock( cj->progeny[3]->sorts[8] , t );
                    ci->progeny[4]->nr_pairs += 1;
                    cj->progeny[3]->nr_pairs += 1;
                    break;
                    
                case 9: /* (  0 ,  1 ,  1 ) */
                    if ( space_dosub &&
                         !ci->progeny[3]->split && !ci->progeny[7]->split &&
                         !cj->progeny[0]->split && !cj->progeny[4]->split ) {
880
                        t->type = task_type_sub; t->flags = 9;
Pedro Gonnet's avatar
Pedro Gonnet committed
881
882
883
884
885
886
887
888
                        task_addunlock( ci->progeny[3]->sorts[9] , t ); task_addunlock( cj->progeny[0]->sorts[9] , t );
                        task_addunlock( ci->progeny[7]->sorts[9] , t ); task_addunlock( cj->progeny[4]->sorts[9] , t );
                        task_addunlock( ci->progeny[3]->sorts[0] , t ); task_addunlock( cj->progeny[4]->sorts[0] , t );
                        task_addunlock( ci->progeny[7]->sorts[8] , t ); task_addunlock( cj->progeny[0]->sorts[8] , t );
                        }
                    else {
                        t->ci = ci->progeny[3]; t->cj = cj->progeny[0];
                        task_addunlock( ci->progeny[3]->sorts[9] , t ); task_addunlock( cj->progeny[0]->sorts[9] , t );
889
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
890
                        task_addunlock( ci->progeny[7]->sorts[9] , t ); task_addunlock( cj->progeny[4]->sorts[9] , t );
891
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
892
                        task_addunlock( ci->progeny[3]->sorts[0] , t ); task_addunlock( cj->progeny[4]->sorts[0] , t );
893
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
894
895
896
897
898
899
900
901
902
                        task_addunlock( ci->progeny[7]->sorts[8] , t ); task_addunlock( cj->progeny[0]->sorts[8] , t );
                        }
                    ci->progeny[3]->nr_pairs += 2;
                    ci->progeny[7]->nr_pairs += 2;
                    cj->progeny[0]->nr_pairs += 2;
                    cj->progeny[4]->nr_pairs += 2;
                    break;
                    
                case 10: /* (  0 ,  1 ,  0 ) */
Pedro Gonnet's avatar
Pedro Gonnet committed
903
904
                    if ( space_dosub &&
                         !ci->progeny[2]->split && !ci->progeny[3]->split && !ci->progeny[6]->split && !ci->progeny[7]->split &&
Pedro Gonnet's avatar
Pedro Gonnet committed
905
                         !cj->progeny[0]->split && !cj->progeny[1]->split && !cj->progeny[4]->split && !cj->progeny[5]->split ) {
906
                        t->type = task_type_sub; t->flags = 10;
Pedro Gonnet's avatar
Pedro Gonnet committed
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
                        task_addunlock( ci->progeny[2]->sorts[10] , t ); task_addunlock( cj->progeny[0]->sorts[10] , t );
                        task_addunlock( ci->progeny[3]->sorts[11] , t ); task_addunlock( cj->progeny[0]->sorts[11] , t );
                        task_addunlock( ci->progeny[6]->sorts[7] , t ); task_addunlock( cj->progeny[0]->sorts[7] , t );
                        task_addunlock( ci->progeny[7]->sorts[6] , t ); task_addunlock( cj->progeny[0]->sorts[6] , t );
                        task_addunlock( ci->progeny[2]->sorts[9] , t ); task_addunlock( cj->progeny[1]->sorts[9] , t );
                        task_addunlock( ci->progeny[3]->sorts[10] , t ); task_addunlock( cj->progeny[1]->sorts[10] , t );
                        task_addunlock( ci->progeny[6]->sorts[8] , t ); task_addunlock( cj->progeny[1]->sorts[8] , t );
                        task_addunlock( ci->progeny[7]->sorts[7] , t ); task_addunlock( cj->progeny[1]->sorts[7] , t );
                        task_addunlock( ci->progeny[2]->sorts[1] , t ); task_addunlock( cj->progeny[4]->sorts[1] , t );
                        task_addunlock( ci->progeny[3]->sorts[2] , t ); task_addunlock( cj->progeny[4]->sorts[2] , t );
                        task_addunlock( ci->progeny[6]->sorts[10] , t ); task_addunlock( cj->progeny[4]->sorts[10] , t );
                        task_addunlock( ci->progeny[7]->sorts[11] , t ); task_addunlock( cj->progeny[4]->sorts[11] , t );
                        task_addunlock( ci->progeny[2]->sorts[0] , t ); task_addunlock( cj->progeny[5]->sorts[0] , t );
                        task_addunlock( ci->progeny[3]->sorts[1] , t ); task_addunlock( cj->progeny[5]->sorts[1] , t );
                        task_addunlock( ci->progeny[6]->sorts[9] , t ); task_addunlock( cj->progeny[5]->sorts[9] , t );
                        task_addunlock( ci->progeny[7]->sorts[10] , t ); task_addunlock( cj->progeny[5]->sorts[10] , t );
                        }
                    else {
                        t->ci = ci->progeny[2]; t->cj = cj->progeny[0];
                        task_addunlock( ci->progeny[2]->sorts[10] , t ); task_addunlock( cj->progeny[0]->sorts[10] , t );
927
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
928
                        task_addunlock( ci->progeny[3]->sorts[11] , t ); task_addunlock( cj->progeny[0]->sorts[11] , t );
929
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
930
                        task_addunlock( ci->progeny[6]->sorts[7] , t ); task_addunlock( cj->progeny[0]->sorts[7] , t );
931
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
932
                        task_addunlock( ci->progeny[7]->sorts[6] , t ); task_addunlock( cj->progeny[0]->sorts[6] , t );
933
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[2] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
934
                        task_addunlock( ci->progeny[2]->sorts[9] , t ); task_addunlock( cj->progeny[1]->sorts[9] , t );
935
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
936
                        task_addunlock( ci->progeny[3]->sorts[10] , t ); task_addunlock( cj->progeny[1]->sorts[10] , t );
937
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
938
                        task_addunlock( ci->progeny[6]->sorts[8] , t ); task_addunlock( cj->progeny[1]->sorts[8] , t );
939
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
940
                        task_addunlock( ci->progeny[7]->sorts[7] , t ); task_addunlock( cj->progeny[1]->sorts[7] , t );
941
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[2] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
942
                        task_addunlock( ci->progeny[2]->sorts[1] , t ); task_addunlock( cj->progeny[4]->sorts[1] , t );
943
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
944
                        task_addunlock( ci->progeny[3]->sorts[2] , t ); task_addunlock( cj->progeny[4]->sorts[2] , t );
945
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
946
                        task_addunlock( ci->progeny[6]->sorts[10] , t ); task_addunlock( cj->progeny[4]->sorts[10] , t );
947
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
948
                        task_addunlock( ci->progeny[7]->sorts[11] , t ); task_addunlock( cj->progeny[4]->sorts[11] , t );
949
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[2] , cj->progeny[5] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
950
                        task_addunlock( ci->progeny[2]->sorts[0] , t ); task_addunlock( cj->progeny[5]->sorts[0] , t );
951
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[5] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
952
                        task_addunlock( ci->progeny[3]->sorts[1] , t ); task_addunlock( cj->progeny[5]->sorts[1] , t );
953
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[5] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
954
                        task_addunlock( ci->progeny[6]->sorts[9] , t ); task_addunlock( cj->progeny[5]->sorts[9] , t );
955
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[5] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
                        task_addunlock( ci->progeny[7]->sorts[10] , t ); task_addunlock( cj->progeny[5]->sorts[10] , t );
                        }
                    ci->progeny[2]->nr_pairs += 4;
                    ci->progeny[3]->nr_pairs += 4;
                    ci->progeny[6]->nr_pairs += 4;
                    ci->progeny[7]->nr_pairs += 4;
                    cj->progeny[0]->nr_pairs += 4;
                    cj->progeny[1]->nr_pairs += 4;
                    cj->progeny[4]->nr_pairs += 4;
                    cj->progeny[5]->nr_pairs += 4;
                    break;
                    
                case 11: /* (  0 ,  1 , -1 ) */
                    if ( space_dosub &&
                         !ci->progeny[2]->split && !ci->progeny[6]->split &&
                         !cj->progeny[1]->split && !cj->progeny[5]->split ) {
972
                        t->type = task_type_sub; t->flags = 11;
Pedro Gonnet's avatar
Pedro Gonnet committed
973
974
975
976
977
978
979
980
                        task_addunlock( ci->progeny[2]->sorts[11] , t ); task_addunlock( cj->progeny[1]->sorts[11] , t );
                        task_addunlock( ci->progeny[6]->sorts[11] , t ); task_addunlock( cj->progeny[5]->sorts[11] , t );
                        task_addunlock( ci->progeny[2]->sorts[2] , t ); task_addunlock( cj->progeny[5]->sorts[2] , t );
                        task_addunlock( ci->progeny[6]->sorts[6] , t ); task_addunlock( cj->progeny[1]->sorts[6] , t );
                        }
                    else {
                        t->ci = ci->progeny[2]; t->cj = cj->progeny[1];
                        task_addunlock( ci->progeny[2]->sorts[11] , t ); task_addunlock( cj->progeny[1]->sorts[11] , t );
981
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[5] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
982
                        task_addunlock( ci->progeny[6]->sorts[11] , t ); task_addunlock( cj->progeny[5]->sorts[11] , t );
983
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[2] , cj->progeny[5] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
984
                        task_addunlock( ci->progeny[2]->sorts[2] , t ); task_addunlock( cj->progeny[5]->sorts[2] , t );
985
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[6] , cj->progeny[1] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
986
987
988
989
990
991
992
993
994
995
996
997
                        task_addunlock( ci->progeny[6]->sorts[6] , t ); task_addunlock( cj->progeny[1]->sorts[6] , t );
                        }
                    ci->progeny[2]->nr_pairs += 2;
                    ci->progeny[6]->nr_pairs += 2;
                    cj->progeny[1]->nr_pairs += 2;
                    cj->progeny[5]->nr_pairs += 2;
                    break;
                    
                case 12: /* (  0 ,  0 ,  1 ) */
                    if ( space_dosub &&
                         !ci->progeny[1]->split && !ci->progeny[3]->split && !ci->progeny[5]->split && !ci->progeny[7]->split &&
                         !cj->progeny[0]->split && !cj->progeny[2]->split && !cj->progeny[4]->split && !cj->progeny[6]->split ) {
998
                        t->type = task_type_sub; t->flags = 12;
Pedro Gonnet's avatar
Pedro Gonnet committed
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
                        task_addunlock( ci->progeny[1]->sorts[12] , t ); task_addunlock( cj->progeny[0]->sorts[12] , t );
                        task_addunlock( ci->progeny[3]->sorts[11] , t ); task_addunlock( cj->progeny[0]->sorts[11] , t );
                        task_addunlock( ci->progeny[5]->sorts[5] , t ); task_addunlock( cj->progeny[0]->sorts[5] , t );
                        task_addunlock( ci->progeny[7]->sorts[2] , t ); task_addunlock( cj->progeny[0]->sorts[2] , t );
                        task_addunlock( ci->progeny[1]->sorts[9] , t ); task_addunlock( cj->progeny[2]->sorts[9] , t );
                        task_addunlock( ci->progeny[3]->sorts[12] , t ); task_addunlock( cj->progeny[2]->sorts[12] , t );
                        task_addunlock( ci->progeny[5]->sorts[8] , t ); task_addunlock( cj->progeny[2]->sorts[8] , t );
                        task_addunlock( ci->progeny[7]->sorts[5] , t ); task_addunlock( cj->progeny[2]->sorts[5] , t );
                        task_addunlock( ci->progeny[1]->sorts[3] , t ); task_addunlock( cj->progeny[4]->sorts[3] , t );
                        task_addunlock( ci->progeny[3]->sorts[6] , t ); task_addunlock( cj->progeny[4]->sorts[6] , t );
                        task_addunlock( ci->progeny[5]->sorts[12] , t ); task_addunlock( cj->progeny[4]->sorts[12] , t );
                        task_addunlock( ci->progeny[7]->sorts[11] , t ); task_addunlock( cj->progeny[4]->sorts[11] , t );
                        task_addunlock( ci->progeny[1]->sorts[0] , t ); task_addunlock( cj->progeny[6]->sorts[0] , t );
                        task_addunlock( ci->progeny[3]->sorts[3] , t ); task_addunlock( cj->progeny[6]->sorts[3] , t );
                        task_addunlock( ci->progeny[5]->sorts[9] , t ); task_addunlock( cj->progeny[6]->sorts[9] , t );
                        task_addunlock( ci->progeny[7]->sorts[12] , t ); task_addunlock( cj->progeny[6]->sorts[12] , t );
                        }
                    else {
                        t->ci = ci->progeny[1]; t->cj = cj->progeny[0];
                        task_addunlock( ci->progeny[1]->sorts[12] , t ); task_addunlock( cj->progeny[0]->sorts[12] , t );
1019
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1020
                        task_addunlock( ci->progeny[3]->sorts[11] , t ); task_addunlock( cj->progeny[0]->sorts[11] , t );
1021
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1022
                        task_addunlock( ci->progeny[5]->sorts[5] , t ); task_addunlock( cj->progeny[0]->sorts[5] , t );
1023
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[0] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1024
                        task_addunlock( ci->progeny[7]->sorts[2] , t ); task_addunlock( cj->progeny[0]->sorts[2] , t );
1025
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[1] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1026
                        task_addunlock( ci->progeny[1]->sorts[9] , t ); task_addunlock( cj->progeny[2]->sorts[9] , t );
1027
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1028
                        task_addunlock( ci->progeny[3]->sorts[12] , t ); task_addunlock( cj->progeny[2]->sorts[12] , t );
1029
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1030
                        task_addunlock( ci->progeny[5]->sorts[8] , t ); task_addunlock( cj->progeny[2]->sorts[8] , t );
1031
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[2] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1032
                        task_addunlock( ci->progeny[7]->sorts[5] , t ); task_addunlock( cj->progeny[2]->sorts[5] , t );
1033
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[1] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1034
                        task_addunlock( ci->progeny[1]->sorts[3] , t ); task_addunlock( cj->progeny[4]->sorts[3] , t );
1035
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1036
                        task_addunlock( ci->progeny[3]->sorts[6] , t ); task_addunlock( cj->progeny[4]->sorts[6] , t );
1037
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1038
                        task_addunlock( ci->progeny[5]->sorts[12] , t ); task_addunlock( cj->progeny[4]->sorts[12] , t );
1039
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[4] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1040
                        task_addunlock( ci->progeny[7]->sorts[11] , t ); task_addunlock( cj->progeny[4]->sorts[11] , t );
1041
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[1] , cj->progeny[6] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1042
                        task_addunlock( ci->progeny[1]->sorts[0] , t ); task_addunlock( cj->progeny[6]->sorts[0] , t );
1043
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[3] , cj->progeny[6] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1044
                        task_addunlock( ci->progeny[3]->sorts[3] , t ); task_addunlock( cj->progeny[6]->sorts[3] , t );
1045
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[5] , cj->progeny[6] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1046
                        task_addunlock( ci->progeny[5]->sorts[9] , t ); task_addunlock( cj->progeny[6]->sorts[9] , t );
1047
                        t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , ci->progeny[7] , cj->progeny[6] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
                        task_addunlock( ci->progeny[7]->sorts[12] , t ); task_addunlock( cj->progeny[6]->sorts[12] , t );
                        }
                    ci->progeny[1]->nr_pairs += 4;
                    ci->progeny[3]->nr_pairs += 4;
                    ci->progeny[5]->nr_pairs += 4;
                    ci->progeny[7]->nr_pairs += 4;
                    cj->progeny[0]->nr_pairs += 4;
                    cj->progeny[2]->nr_pairs += 4;
                    cj->progeny[4]->nr_pairs += 4;
                    cj->progeny[6]->nr_pairs += 4;
                    break;
            
                }
                
            /* Take a step back... */
            tid -= 1;
            
            } /* split this task? */
    
        } /* loop over all tasks. */
        
    }
    
    
/**
 * @brief Fill the #space's task list.
 *
 * @param s The #space we are working in.
 * @param do_sort Flag to add sorting tasks to the list.
 */
 
void space_maketasks ( struct space *s , int do_sort ) {

    int i, j, k, ii, jj, kk, iii, jjj, kkk, cid, cjd;
    int *cdim = s->cdim;
Pedro Gonnet's avatar
Pedro Gonnet committed
1083
    struct task *t , *t2;
Pedro Gonnet's avatar
Pedro Gonnet committed
1084
1085
1086
1087
1088
1089
1090
    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 } ,
                      { -1 , -1 , -1 , -1 , -1 , -1 , 11 , 10 } ,
                      { -1 , -1 , -1 , -1 , -1 , -1 , -1 , 12 } };
1091
    int counts[task_type_count];
Pedro Gonnet's avatar
Pedro Gonnet committed
1092
1093
1094
1095
1096

    /* Recursive function to generate tasks in the cell tree. */
    void maketasks_rec ( struct cell *c , struct task *sort_up[] , int nr_sort_up , struct cell *parent ) {

        int j, k, nr_sort = 0;
1097
        struct task *sort[7], *t;
Pedro Gonnet's avatar
Pedro Gonnet committed
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107

        /* Clear the waits on this cell. */
        c->wait = 0;
        sort[0] = NULL;
        
        /* Start by generating the sort task. */
        if ( c->count > 0 ) {
        
            if ( do_sort ) {
                if ( c->count < 1000 ) {
1108
                    sort[0] = space_addtask( s , task_type_sort , task_subtype_none , 0x1fff , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1109
1110
1111
1112
1113
                    for ( k = 0 ; k < 13 ; k++ )
                        c->sorts[k] = sort[0];
                    nr_sort = 1;
                    }
                else if ( c->count < 5000 ) {
1114
                    sort[0] = space_addtask( s , task_type_sort , task_subtype_none , 0x7f , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
1115
                    sort[1] = space_addtask( s , task_type_sort , task_subtype_none , 0x1f80 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
1116
                    for ( k = 0 ; k < 7 ; k++ )
Pedro Gonnet's avatar
Pedro Gonnet committed
1117
                        c->sorts[k] = sort[0];
1118
                    for ( k = 7 ; k < 14 ; k++ )
Pedro Gonnet's avatar
Pedro Gonnet committed
1119
                        c->sorts[k] = sort[1];
1120
                    nr_sort = 2;
Pedro Gonnet's avatar
Pedro Gonnet committed
1121
1122
                    }
                else {
1123
1124
1125
1126
1127
1128
                    c->sorts[0] = c->sorts[1] = sort[0] = space_addtask( s , task_type_sort , task_subtype_none , 0x1 + 0x2 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
                    c->sorts[2] = c->sorts[3] = sort[1] = space_addtask( s , task_type_sort , task_subtype_none , 0x4 + 0x8 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
                    c->sorts[4] = c->sorts[5] = sort[2] = space_addtask( s , task_type_sort , task_subtype_none , 0x10 + 0x20 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
                    c->sorts[6] = c->sorts[7] = sort[3] = space_addtask( s , task_type_sort , task_subtype_none , 0x40 + 0x80 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
                    c->sorts[8] = c->sorts[9] = sort[4] = space_addtask( s , task_type_sort , task_subtype_none , 0x100 + 0x200 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
                    c->sorts[10] = c->sorts[11] = sort[5] = space_addtask( s , task_type_sort , task_subtype_none , 0x400 + 0x800 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
1129
                    c->sorts[12] = c->sorts[13] = sort[6] = space_addtask( s , task_type_sort , task_subtype_none , 0x1000 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
1130
                    nr_sort = 7;
Pedro Gonnet's avatar
Pedro Gonnet committed
1131
1132
1133
1134
1135
                    }
                }

            /* Generate a self-interaction if not split. */
            if ( !c->split && c->count > 1 )
1136
                space_addtask( s , task_type_self , task_subtype_density , 0 , 0 , c , NULL , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
                
            }
            
        /* Otherwise, add the interactions between progeny. */
        if ( c->split ) {
        
            /* Recurse. */
            for ( k = 0 ; k < 8 ; k++ )
                if ( c->progeny[k] != NULL )
                    maketasks_rec( c->progeny[k] , sort , nr_sort , c );
                        
            /* Worth splitting into several tasks? */
            if ( !space_dosub || c->count > 2*space_splitsize ) {
            
                /* Make a task for each pair of progeny. */
                for ( j = 0 ; j < 8 ; j++ )
                    if ( c->progeny[j] != NULL && c->progeny[j]->count > 0 )
                        for ( k = j + 1 ; k < 8 ; k++ )
                            if ( c->progeny[k] != NULL && c->progeny[k]->count > 0 ) {
1156
                                t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , c->progeny[j] , c->progeny[k] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
                                task_addunlock( c->progeny[j]->sorts[ pts[j][k] ] , t );
                                task_addunlock( c->progeny[k]->sorts[ pts[j][k] ] , t );
                                c->progeny[k]->nr_pairs += 1;
                                c->progeny[j]->nr_pairs += 1;
                                }
                                
                }
                
            /* Otherwise, dispatch as one large task. */
            else {
            
                /* Add the task. */
1169
                t = space_addtask( s , task_type_sub , task_subtype_density , 0 , 0 , c , NULL , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
                
                /* Make it depend on all the sorts of its progeny. */
                for ( k = 0 ; k < 8 ; k++ )
                    for ( j = 0 ; j < 13 ; j++ )
                        if ( c->progeny[k] != NULL )
                            task_addunlock( c->progeny[k]->sorts[j] , t );
            
                }

            }

        }
        
    /* Allocate the task-list, if needed. */
1184
1185
1186
1187
1188
1189
1190
    if ( s->tasks == NULL || s->tasks_size < s->tot_cells * 30 ) {
        if ( s->tasks != NULL )
            free( s->tasks );
        if ( s->tasks_ind != NULL )
            free( s->tasks_ind );
        s->tasks_size = s->tot_cells * 30;
        if ( posix_memalign( (void *)&s->tasks , 64 , sizeof(struct task) * s->tasks_size ) != 0 )
Pedro Gonnet's avatar
Pedro Gonnet committed
1191
            error( "Failed to allocate task list." );
1192
1193
1194
        if ( ( s->tasks_ind = (int *)malloc( sizeof(int) * s->tasks_size ) ) == NULL )
            error( "Failed to allocate task indices." );
        }
Pedro Gonnet's avatar
Pedro Gonnet committed
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
    s->nr_tasks = 0;
    
    /* Loop over the cells and get their sub-tasks. */
    for ( k = 0 ; k < s->nr_cells ; k++ )
        maketasks_rec( &s->cells[k] , NULL , 0 , NULL );

    /* Run through the highest level of cells and add pairs. */
    for ( i = 0 ; i < cdim[0] ; i++ )
        for ( j = 0 ; j < cdim[1] ; j++ )
            for ( k = 0 ; k < cdim[2] ; k++ ) {
                cid = cell_getid( cdim , i , j , k );
                if ( s->cells[cid].count == 0 )
                    continue;
                for ( ii = -1 ; ii < 2 ; ii++ ) {
                    iii = i + ii;
                    if ( !s->periodic && ( iii < 0 || iii >= cdim[0] ) )
                        continue;
                    iii = ( iii + cdim[0] ) % cdim[0];
                    for ( jj = -1 ; jj < 2 ; jj++ ) {
                        jjj = j + jj;
                        if ( !s->periodic && ( jjj < 0 || jjj >= cdim[1] ) )
                            continue;
                        jjj = ( jjj + cdim[1] ) % cdim[1];
                        for ( kk = -1 ; kk < 2 ; kk++ ) {
                            kkk = k + kk;
                            if ( !s->periodic && ( kkk < 0 || kkk >= cdim[2] ) )
                                continue;
                            kkk = ( kkk + cdim[2] ) % cdim[2];
                            cjd = cell_getid( cdim , iii , jjj , kkk );
                            if ( s->cells[cjd].count == 0 )
                                continue;
                            if ( cid >= cjd )
                                continue;
1228
                            t = space_addtask( s , task_type_pair , task_subtype_density , 0 , 0 , &s->cells[cid] , &s->cells[cjd] , NULL , 0 , NULL , 0 );
Pedro Gonnet's avatar
Pedro Gonnet committed
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
                            task_addunlock( s->cells[cid].sorts[ sortlistID[ (kk+1) + 3*( (jj+1) + 3*(ii+1) ) ] ] , t );
                            task_addunlock( s->cells[cjd].sorts[ sortlistID[ (kk+1) + 3*( (jj+1) + 3*(ii+1) ) ] ] , t );
                            s->cells[cid].nr_pairs += 1;
                            s->cells[cjd].nr_pairs += 1;
                            }
                        }
                    }
                }

    /* Split the tasks. */
    space_splittasks( s );
1240
    
Pedro Gonnet's avatar
Pedro Gonnet committed
1241
1242
1243
1244
1245
1246
1247
1248
1249
    /* Remove sort tasks with no dependencies. */
    for ( k = 0 ; k < s->nr_tasks ; k++ ) {
        t = &s->tasks[k];
        if ( t->type == task_type_sort && t->nr_unlock_tasks == 0 ) {
            if ( t->ci->split )
                for ( i = 0 ; i < 13 ; i++ )
                    if ( t->flags & ( 1 << i ) ) {
                        for ( j = 0 ; j < 8 ; j++ )
                            if ( t->ci->progeny[j] != NULL )
Pedro Gonnet's avatar
Pedro Gonnet committed
1250
                                task_rmunlock_blind( t->ci->progeny[j]->sorts[i] , t );
Pedro Gonnet's avatar
Pedro Gonnet committed
1251
1252
1253
1254
1255
1256
                        t->ci->sorts[i] = NULL;
                        }
            t->type = task_type_none;
            }
        }
        
1257
1258
    /* Count the number of tasks associated with each cell and
       store the density tasks in each cell. */
Pedro Gonnet's avatar
Pedro Gonnet committed
1259
    space_map_cells( s , 1 , &space_map_clearnrtasks , NULL );
Pedro Gonnet's avatar
Pedro Gonnet committed
1260
1261
    for ( k = 0 ; k < s->nr_tasks ; k++ ) {
        t = &s->tasks[k];