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 2023-03-08 02:00:03 -05:00
parent 7870538ec9 40cf82c2cb
commit 178b172c06
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.249 1.5.250

14
tcltk/netgen.tcl.in
View File

@ -479,8 +479,12 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
netgen::compare assign "$fnum1 $cell1" "$fnum2 $cell2" netgen::compare assign "$fnum1 $cell1" "$fnum2 $cell2"
if {[file exists $setupfile]} { if {$setupfile == ""} {
puts stdout "Reading setup file $setupfile" puts stdout "\nNo setup file specified. Using trivial default setup.\n"
netgen::permute default ;# transistors and resistors
netgen::property default
} elseif {[file exists $setupfile]} {
puts stdout "\nReading setup file $setupfile\n"
# Instead of sourcing the setup file, run each line so we can # Instead of sourcing the setup file, run each line so we can
# catch individual errors and not let them halt the LVS process # catch individual errors and not let them halt the LVS process
set perrors 0 set perrors 0
@ -508,8 +512,10 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
puts stdout "Warning: There were errors reading the setup file" puts stdout "Warning: There were errors reading the setup file"
} }
} elseif {[string first nosetup $setupfile] < 0} { } elseif {[string first nosetup $setupfile] < 0} {
netgen::permute default ;# transistors and resistors puts stderr "\nError: Setup file $setupfile does not exist.\n"
netgen::property default return
} else {
puts stderr "\nNo setup file specified. Continuing without a setup.\n"
} }
if {[string first nolog $logfile] < 0} { if {[string first nolog $logfile] < 0} {