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 2021-06-09 03:00:10 -04:00
parent ca119edc0a 0614461c84
commit 43c018f3bc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.183 1.5.184

8
base/netcmp.c
View File

@ -7245,7 +7245,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
/* so apply only to black-box (CELL_PLACEHOLDER) entries. */ /* so apply only to black-box (CELL_PLACEHOLDER) entries. */
/* (Semi-hack: Allow "!" global flag) */ /* (Semi-hack: Allow "!" global flag) */
if ((tc1->flags & CELL_PLACEHOLDER) && (tc2->flags & CELL_PLACEHOLDER)) { if (((tc1->flags & CELL_PLACEHOLDER) && (tc2->flags & CELL_PLACEHOLDER)) ||
(NodeClasses == NULL)) {
ob1 = tc1->cell; ob1 = tc1->cell;
bangptr1 = strrchr(ob1->name, '!'); bangptr1 = strrchr(ob1->name, '!');
if (bangptr1 && (*(bangptr1 + 1) == '\0')) if (bangptr1 && (*(bangptr1 + 1) == '\0'))
@ -7349,7 +7350,6 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
Tcl_NewStringObj(ob2->name, -1)); Tcl_NewStringObj(ob2->name, -1));
} }
#endif #endif
result = 0;
/* Before making a proxy pin, check to see if */ /* Before making a proxy pin, check to see if */
/* flattening instances has left a port with a */ /* flattening instances has left a port with a */
@ -7368,6 +7368,10 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
needclean2 = 1; needclean2 = 1;
continue; continue;
} }
else if (notempty == 1) {
/* Flag this as an error */
result = 0;
}
ob2->model.port = numnodes++; // Assign a port order ob2->model.port = numnodes++; // Assign a port order
/* Add a proxy pin to tc1 */ /* Add a proxy pin to tc1 */