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-10-30 03:00:02 -04:00
parent 6b8c6d1718 e4a15f12fb
commit 737b2a73bf
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.207 1.5.208

5
base/netcmp.c
View File

@ -3125,7 +3125,7 @@ int FirstElementPass(struct Element *E, int noflat, int dolist)
ostr = CALLOC(right_col_end + 2, sizeof(char)); ostr = CALLOC(right_col_end + 2, sizeof(char));
if (Debug == 0) { if (Debug == 0) {
Fprintf(stdout, "\nSubcircuit summary:\n"); Fprintf(stdout, "Subcircuit summary:\n");
*(ostr + left_col_end) = '|'; *(ostr + left_col_end) = '|';
*(ostr + right_col_end) = '\n'; *(ostr + right_col_end) = '\n';
*(ostr + right_col_end + 1) = '\0'; *(ostr + right_col_end + 1) = '\0';
@ -3736,8 +3736,9 @@ void CreateTwoLists(char *name1, int file1, char *name2, int file2, int dolist)
ResetState(); ResetState();
Fprintf(stdout, "\n"); // blank line before new circuit diagnostics in log file
/* print preliminary statistics */ /* print preliminary statistics */
Printf("Contents of circuit 1: "); Printf("\nContents of circuit 1: ");
DescribeInstance(name1, file1); DescribeInstance(name1, file1);
Printf("Contents of circuit 2: "); Printf("Contents of circuit 2: ");
DescribeInstance(name2, file2); DescribeInstance(name2, file2);

5
base/netgen.c
View File

@ -3441,7 +3441,7 @@ int CombineParallel(char *model, int file)
} }
HashKill(&devdict); HashKill(&devdict);
if (dcnt > 0) { if (dcnt > 0) {
Fprintf(stdout, "Class %s: Merged %d devices.\n", model, dcnt); Fprintf(stdout, "Class %s(%d): Merged %d parallel devices.\n", model, file, dcnt);
} }
FREE(nodecount); FREE(nodecount);
return dcnt; return dcnt;
@ -3738,6 +3738,9 @@ int CombineSeries(char *model, int file)
} }
} }
FREE(instlist); FREE(instlist);
if (scnt > 0) {
Fprintf(stdout, "Class %s(%d): Merged %d series devices.\n", model, file, scnt);
}
return scnt; return scnt;
} }

4
base/query.c
View File

@ -807,9 +807,9 @@ void DescribeInstance(char *name, int file)
if (!(tp->flags & CELL_PLACEHOLDER) && (tp->class != CLASS_MODULE)) if (!(tp->flags & CELL_PLACEHOLDER) && (tp->class != CLASS_MODULE))
{ {
if (disconnectednodes == 0) Fprintf(stderr, "\n"); //if (disconnectednodes == 0) Fprintf(stderr, "\n");
disconnectednodes++; disconnectednodes++;
Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name); Fprintf(stderr, "Cell %s(%d) disconnected node: %s\n", tp->name, tp->file, ob->name);
} }
} }
} }

12
tcltk/netgen.tcl.in
View File

@ -567,7 +567,8 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
netgen::flatten class "[lindex $endval 1] $fnum2" netgen::flatten class "[lindex $endval 1] $fnum2"
} else { } else {
netgen::log put " Continuing with black-boxed subcircuits $endval\n" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0] lappend matcherr [lindex $endval 0]"($fnum1)"
lappend matcherr [lindex $endval 1]"($fnum2)"
# Match pins # Match pins
netgen::log echo off netgen::log echo off
if {$dolist == 1} { if {$dolist == 1} {
@ -616,9 +617,8 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
netgen::flatten class "[lindex $endval 1] $fnum2" netgen::flatten class "[lindex $endval 1] $fnum2"
} else { } else {
netgen::log put " Continuing with black-boxed subcircuits $endval\n" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0]"(1)" lappend matcherr [lindex $endval 0]"($fnum1)"
netgen::log put " Continuing with black-boxed subcircuits $endval\n" lappend matcherr [lindex $endval 0]"($fnum2)"
lappend matcherr [lindex $endval 0]"(2)"
# Match pins # Match pins
netgen::log echo off netgen::log echo off
if {$dolist == 1} { if {$dolist == 1} {
@ -656,10 +656,10 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
verify only verify only
} }
if {$properr != {}} { if {$properr != {}} {
netgen::log put "The following cells had property errors: $properr\n" netgen::log put "The following cells had property errors:\n " [regsub -all { } $properr "\n "] "\n"
} }
if {$matcherr != {}} { if {$matcherr != {}} {
netgen::log put "The following subcells failed to match: $matcherr\n" netgen::log put "The following subcells failed to match:\n " [regsub -all { } $matcherr "\n "] "\n"
} }
if {$dolog} { if {$dolog} {
netgen::log end netgen::log end