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 2023-04-14 02:00:01 -04:00
parent d111fa0a3b 47c3b34612
commit 7f727e6674
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.251 1.5.252

20
base/flatten.c
View File

@ -1929,6 +1929,16 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
if (ecomp->cell1->class != CLASS_ISOURCE) { if (ecomp->cell1->class != CLASS_ISOURCE) {
/* merge node of endpoints */ /* merge node of endpoints */
/* Prefer a port node over a non-port node */
for (ob2 = tc1->cell; ob2; ob2 = ob2->next) {
if (!IsPort(ob2)) break;
else if (ob2->node == node1) break;
else if (ob2->node == node2) {
int ntemp = node1;
node1 = node2;
node2 = ntemp;
}
}
for (ob2 = tc1->cell; ob2; ob2 = ob2->next) { for (ob2 = tc1->cell; ob2; ob2 = ob2->next) {
if (ob2->node == node2) if (ob2->node == node2)
ob2->node = node1; ob2->node = node1;
@ -2037,6 +2047,16 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
/* merge node of endpoints */ /* merge node of endpoints */
if (ecomp->cell2->class != CLASS_ISOURCE) { if (ecomp->cell2->class != CLASS_ISOURCE) {
/* Prefer a port node over a non-port node */
for (ob1 = tc2->cell; ob1; ob1 = ob1->next) {
if (!IsPort(ob1)) break;
else if (ob1->node == node1) break;
else if (ob1->node == node2) {
int ntemp = node1;
node1 = node2;
node2 = ntemp;
}
}
for (ob1 = tc2->cell; ob1; ob1 = ob1->next) { for (ob1 = tc2->cell; ob1; ob1 = ob1->next) {
if (ob1->node == node2) if (ob1->node == node2)
ob1->node = node1; ob1->node = node1;