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-09-08 03:00:04 -04:00
parent 66cf2b82d9 18dcac73bc
commit cdd768addc
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.201 1.5.202

5
base/netcmp.c
View File

@ -6892,11 +6892,6 @@ int reorderpins(struct hashlist *p, int file)
"Ordering will be arbitrary.\n", tc2->name); "Ordering will be arbitrary.\n", tc2->name);
for (ob = ptr->cell; ob != NULL; ) { for (ob = ptr->cell; ob != NULL; ) {
/* Catch badness */
if (ob->next && (ob->next->node > 100000)) {
Fprintf(stdout, "Bad.\n");
}
if (ob->type == FIRSTPIN) { if (ob->type == FIRSTPIN) {
if ((*matchfunc)(ob->model.class, tc2->name)) { if ((*matchfunc)(ob->model.class, tc2->name)) {
char *sptr = ob->instance.name; char *sptr = ob->instance.name;

10
tcltk/netgen.tcl.in
View File

@ -562,11 +562,11 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
if {[netgen::print queue] != {}} { if {[netgen::print queue] != {}} {
if {([lsearch $noflat [lindex $endval 0]] == -1) && if {([lsearch $noflat [lindex $endval 0]] == -1) &&
([lsearch $noflat [lindex $endval 1]] == -1)} { ([lsearch $noflat [lindex $endval 1]] == -1)} {
netgen::log put " Flattening non-matched subcircuits $endval" netgen::log put " Flattening non-matched subcircuits $endval\n"
netgen::flatten class "[lindex $endval 0] $fnum1" netgen::flatten class "[lindex $endval 0] $fnum1"
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" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0] lappend matcherr [lindex $endval 0]
# Match pins # Match pins
netgen::log echo off netgen::log echo off
@ -611,13 +611,13 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
if {[netgen::print queue] != {}} { if {[netgen::print queue] != {}} {
if {([lsearch $noflat [lindex $endval 1]] == -1) && if {([lsearch $noflat [lindex $endval 1]] == -1) &&
([lsearch $noflat [lindex $endval 1]] == -1)} { ([lsearch $noflat [lindex $endval 1]] == -1)} {
netgen::log put " Flattening non-matched subcircuits $endval" netgen::log put " Flattening non-matched subcircuits $endval\n"
netgen::flatten class "[lindex $endval 0] $fnum1" netgen::flatten class "[lindex $endval 0] $fnum1"
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" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0] lappend matcherr [lindex $endval 0]
netgen::log put " Continuing with black-boxed subcircuits $endval" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0] lappend matcherr [lindex $endval 0]
# Match pins # Match pins
netgen::log echo off netgen::log echo off