Merge branch 'master' into netgen-1.5
This commit is contained in:
commit
4250525e19
|
|
@ -4331,6 +4331,7 @@ void series_sort(struct objlist *ob1, struct nlist *tp1, int idx1, int run)
|
||||||
|
|
||||||
// Re-sort list
|
// Re-sort list
|
||||||
obp = ob1;
|
obp = ob1;
|
||||||
|
for (i = 0; i < idx1; i++) obp = obp->next;
|
||||||
for (i = 0; i < run; i++) {
|
for (i = 0; i < run; i++) {
|
||||||
obp->next = proplist[i].ob;
|
obp->next = proplist[i].ob;
|
||||||
obp = obp->next;
|
obp = obp->next;
|
||||||
|
|
@ -4534,6 +4535,7 @@ void parallel_sort(struct objlist *ob1, struct nlist *tp1, int idx1, int run)
|
||||||
|
|
||||||
// Re-sort list
|
// Re-sort list
|
||||||
obp = ob1;
|
obp = ob1;
|
||||||
|
for (i = 0; i < idx1; i++) obp = obp->next;
|
||||||
for (i = 0; i < run; i++) {
|
for (i = 0; i < run; i++) {
|
||||||
obp->next = proplist[i].ob;
|
obp->next = proplist[i].ob;
|
||||||
obp = obp->next;
|
obp = obp->next;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue