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-05-02 03:00:09 -04:00
parent 0b014e6efd 01b2484be3
commit 45d4004d43
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.173
1.5.174

19
base/netgen.c
View File

@ -3632,12 +3632,21 @@ int CombineSeries(char *model, int file)
/* Device may have been moved by the above code. If so, look for */
/* it from the beginning of the list. */
if (ob2 == NULL)
for (ob2 = tp->cell; ob2->next != instlist[i][1]; ob2 = ob2->next);
for (obs = ob2->next; obs->next && (obs->next->type > FIRSTPIN
if ((ob2 == NULL) && (tp->cell == instlist[i][1]))
{
ob2 = tp->cell;
for (obs = ob2; obs->next && (obs->next->type > FIRSTPIN
|| obs->next->type == PROPERTY); obs = obs->next);
ob2->next = obs->next;
tp->cell = obs->next;
}
else
{
if (ob2 == NULL)
for (ob2 = tp->cell; ob2->next != instlist[i][1]; ob2 = ob2->next);
for (obs = ob2->next; obs->next && (obs->next->type > FIRSTPIN
|| obs->next->type == PROPERTY); obs = obs->next);
ob2->next = obs->next;
}
if (obs->next) obs->next = NULL; // Terminate 2nd instance record
/* If 1st device has unbalanced 'open' records, then add 'close' */