luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2025-02-10 02:00:03 -05:00
parent 7bee1851fa 4457248ecd
commit 704bfbc871
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.291 1.5.292

25
base/netcmp.c
View File

@ -1217,7 +1217,8 @@ SortFanoutLists(nlist1, nlist2)
f2 -= 1; f2 -= 1;
matched[f1] = -1; matched[f1] = -1;
total++; total++;
if (f2 != f1) { if ((f2 != f1) && (nlist2->flist[f1].permute != 0) &&
(nlist2->flist[f2].permute != 0)) {
temp = nlist2->flist[f2]; temp = nlist2->flist[f2];
nlist2->flist[f2] = nlist2->flist[f1]; nlist2->flist[f2] = nlist2->flist[f1];
nlist2->flist[f1] = temp; nlist2->flist[f1] = temp;
@ -1251,7 +1252,8 @@ SortFanoutLists(nlist1, nlist2)
f1 -= 1; f1 -= 1;
matched[f2] = -1; matched[f2] = -1;
total++; total++;
if (f1 != f2) { if ((f1 != f2) && (nlist1->flist[f1].permute != 0) &&
(nlist1->flist[f2].permute != 0)) {
temp = nlist1->flist[f1]; temp = nlist1->flist[f1];
nlist1->flist[f1] = nlist1->flist[f2]; nlist1->flist[f1] = nlist1->flist[f2];
nlist1->flist[f2] = temp; nlist1->flist[f2] = temp;
@ -7013,10 +7015,21 @@ int Permute()
return (0); return (0);
} }
/* update magic numbers */ /* Update magic numbers. To ensure that this works */
for (NL = E->nodelist; NL != NULL; NL = NL->next) /* regardless of the pin order of the pins in each */
if (NL->pin_magic == one) /* netlist, always set both pins to the larger of */
NL->pin_magic = two; /* the two pin_magic values. */
if (one > two) {
for (NL = E->nodelist; NL != NULL; NL = NL->next)
if (NL->pin_magic == two)
NL->pin_magic = one;
}
else {
for (NL = E->nodelist; NL != NULL; NL = NL->next)
if (NL->pin_magic == one)
NL->pin_magic = two;
}
} }
} }
} }