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

Found one more error that was causing issues with the hierarchical 

capacitance adjustments, and may have caused issues with basic
hierarchical extraction as well (although I have not checked or
proven the latter).
This commit is contained in:
Tim Edwards 2022-06-04 21:09:54 -04:00
parent bcf35db713
commit 1d570a5b67
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extract/ExtBasic.c
View File

@ -4018,10 +4018,13 @@ extNodeAreaFunc(tile, arg)
TITORECT(tile, &r);
/* Check if the tile is outside the clip area */
if (!GEO_OVERLAP(&r, extNodeClipArea)) continue;
GEOCLIP(&r, extNodeClipArea);
area = (dlong)(r.r_xtop - r.r_xbot) * (dlong)(r.r_ytop - r.r_ybot);
if (GEO_OVERLAP(&r, extNodeClipArea))
{
GEOCLIP(&r, extNodeClipArea);
area = (dlong)(r.r_xtop - r.r_xbot) * (dlong)(r.r_ytop - r.r_ybot);
}
else
area = (dlong)0;
}
else area = (dlong)(TOP(tile) - BOTTOM(tile)) * (dlong)(RIGHT(tile) - LEFT(tile));

2
extract/ExtHier.c
View File

@ -772,7 +772,7 @@ extHierAdjustments(ha, cumFlat, oneFlat, lookFlat)
&& (he = HashLookOnly(&ha->ha_connHash, name))
&& (nn = (NodeName *) HashGetValue(he)))
{
/* Adjust the capacitance and resistance */
/* Adjust the capacitance and resistance on the node */
nn->nn_node->node_cap -= np->nreg_cap;
for (n = 0; n < ExtCurStyle->exts_numResistClasses; n++)
{