Merge branch 'master' into work

Update at Thu Sep 8 22:08:20 EDT 2016 by tim
Corrected error in tclnetgen for command option "property default",
2026-08-24 15:07:18 +02:00 · 2016-09-08 22:08:22 -04:00 · 2016-09-08 22:08:20 -04:00 · 2016-09-08 22:07:35 -04:00 · 2016-07-21 11:24:28 -04:00 · 2016-07-21 11:24:27 -04:00
10 changed files with 168 additions and 57 deletions
@@ -1 +1 @@
-1.5.56
+1.5.59
@@ -3302,6 +3302,7 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
   ptop = NULL;
   pcount = 1;
   crit = -1;
+   ctype = -1;
   kl = (struct property *)HashFirst(&(tp->propdict));
   while (kl != NULL) {
      // Make a linked list so we don't have to iterate through the hash again 
@@ -3319,8 +3320,10 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
      // Set critical property index, if there is one (TO-DO:  Handle types
      // other than MERGE_ADD_CRIT, and deal with possibility of multiple
      // critical properties per instance).
-      if (kl->merge == MERGE_ADD_CRIT) crit = kl->idx;
-
+      if (kl->merge == MERGE_ADD_CRIT) {
+	 crit = kl->idx;
+	 ctype = kl->merge;
+      }
      kl = (struct property *)HashNext(&(tp->propdict));
   }
   // Recast the linked list as an array
@@ -3434,7 +3437,7 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)

 	       // Add "M" record behind it
 	       vl = &newvlist[--p];
-	       vl->key = strdup("M");
+	       vl->key = strsave("M");
 	       vl->type = PROP_INTEGER;
 	       vl->value.ival = 1;
 	       vlist[0][i] = vl;
@@ -3473,10 +3476,24 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
 	       vlist[0][j] = &nullvl;	// Mark this position
 	       if (crit >= 0) {
 		  vl = vlist[crit][i];
-		  if (vl->type == PROP_INTEGER)
-		     vl->value.ival += vlist[crit][j]->value.ival;
-		  else if (vl->type == PROP_DOUBLE)
-		     vl->value.dval += vlist[crit][j]->value.dval;
+		  if (ctype == MERGE_ADD_CRIT) {
+		     if (vl->type == PROP_INTEGER)
+		        vl->value.ival += vlist[crit][j]->value.ival;
+		     else if (vl->type == PROP_DOUBLE)
+		        vl->value.dval += vlist[crit][j]->value.dval;
+		  }
+		  else {	/* MERGE_PAR_CRIT */
+		     if (vl->type == PROP_INTEGER) {
+			double di = vl->value.ival;
+			double dj = vlist[crit][j]->value.ival;
+			di = 1.0 / (1.0 / di + 1.0 / dj);
+		        vl->value.ival = (int)di;
+		     }
+		     else if (vl->type == PROP_DOUBLE) {
+		        vl->value.dval += 1.0 / (1.0 / vl->value.dval +
+					1.0 / vlist[crit][j]->value.dval);
+		     }
+		  }
 	       }
 	       else {
 	          vlist[0][i]->value.ival++;
@@ -3485,12 +3502,27 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
 	    else if (vlist[0][i]->value.ival > 0) {
 	       if (crit >= 0) {
 		  vl = vlist[crit][i];
-		  if (vl->type == PROP_INTEGER)
-		     vl->value.ival += vlist[0][j]->value.ival *
+		  if (ctype == MERGE_ADD_CRIT) {
+		     if (vl->type == PROP_INTEGER)
+		        vl->value.ival += vlist[0][j]->value.ival *
 				vlist[crit][j]->value.ival;
-		  else if (vl->type == PROP_DOUBLE)
-		     vl->value.dval += (double)vlist[0][j]->value.ival *
+		     else if (vl->type == PROP_DOUBLE)
+		        vl->value.dval += (double)vlist[0][j]->value.ival *
 				vlist[crit][j]->value.dval;
+		  }
+		  else {	/* MERGE_PAR_CRIT */
+		     if (vl->type == PROP_INTEGER) {
+			double d = (double)vlist[crit][j]->value.ival /
+					(double)vlist[0][j]->value.ival;
+		        vl->value.ival = (int)(1.0 / (1.0 / (double)vl->value.ival
+					+ 1.0 / d));
+		     }
+		     else if (vl->type == PROP_DOUBLE) {
+			double d = vlist[crit][j]->value.dval /
+					(double)vlist[0][j]->value.ival;
+		        vl->value.dval = 1.0 / (1.0 / vl->value.dval + 1.0 / d);
+		     }
+		  }
 	       }
 	       else {
 	          vlist[0][i]->value.ival += vlist[0][j]->value.ival;
@@ -65,7 +65,7 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@

 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"54\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"58\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -fPIC 

 DEPEND_FILE            = Depend
@@ -33,7 +33,6 @@ PATH: /sbin
 PATH: /usr/bin
 PATH: /usr/sbin
 PATH: /usr/local/bin
-PATH: /home/tim/src/timberwolf-6.3/bin


 ## ----------- ##
@@ -126,7 +125,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "58"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:3382: result: gcc -E
@@ -147,7 +146,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "58"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:3445: checking for library containing strerror
@@ -262,7 +261,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "58"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -303,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "58"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -383,7 +382,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "58"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -455,7 +454,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "58"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -492,37 +491,37 @@ configure:4831: checking for tclConfig.sh
 configure:4903: result: /usr/lib64/tclConfig.sh
 configure:4919: checking for tkConfig.sh
 configure:4992: result: /usr/lib64/tkConfig.sh
-configure:5106: checking for wish executable
-configure:5133: result: /usr/bin/wish
-configure:5139: checking for tclsh executable
-configure:5165: result: /usr/bin/tclsh
-configure:5288: checking for X
-configure:5427: gcc -o conftest -g   conftest.c -lX11  >&5
-configure:5427: $? = 0
-configure:5477: result: libraries , headers 
-configure:5576: gcc -o conftest -g   conftest.c   -lX11 >&5
-configure:5576: $? = 0
-configure:5674: checking for gethostbyname
-configure:5674: gcc -o conftest -g   conftest.c  >&5
-configure:5674: $? = 0
-configure:5674: result: yes
-configure:5771: checking for connect
-configure:5771: gcc -o conftest -g   conftest.c  >&5
-configure:5771: $? = 0
-configure:5771: result: yes
-configure:5820: checking for remove
-configure:5820: gcc -o conftest -g   conftest.c  >&5
-configure:5820: $? = 0
-configure:5820: result: yes
-configure:5869: checking for shmat
-configure:5869: gcc -o conftest -g   conftest.c  >&5
-configure:5869: $? = 0
-configure:5869: result: yes
-configure:5927: checking for IceConnectionNumber in -lICE
-configure:5952: gcc -o conftest -g   conftest.c -lICE   >&5
-configure:5952: $? = 0
-configure:5961: result: yes
-configure:6675: creating ./config.status
+configure:5125: checking for wish executable
+configure:5152: result: /usr/bin/wish
+configure:5158: checking for tclsh executable
+configure:5184: result: /usr/bin/tclsh
+configure:5307: checking for X
+configure:5446: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5446: $? = 0
+configure:5496: result: libraries , headers 
+configure:5595: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5595: $? = 0
+configure:5693: checking for gethostbyname
+configure:5693: gcc -o conftest -g   conftest.c  >&5
+configure:5693: $? = 0
+configure:5693: result: yes
+configure:5790: checking for connect
+configure:5790: gcc -o conftest -g   conftest.c  >&5
+configure:5790: $? = 0
+configure:5790: result: yes
+configure:5839: checking for remove
+configure:5839: gcc -o conftest -g   conftest.c  >&5
+configure:5839: $? = 0
+configure:5839: result: yes
+configure:5888: checking for shmat
+configure:5888: gcc -o conftest -g   conftest.c  >&5
+configure:5888: $? = 0
+configure:5888: result: yes
+configure:5946: checking for IceConnectionNumber in -lICE
+configure:5971: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:5971: $? = 0
+configure:5980: result: yes
+configure:6694: creating ./config.status

 ## ---------------------- ##
 ## Running config.status. ##
@@ -622,7 +621,7 @@ CC='gcc'
 CFLAGS='-g -m64 -fPIC'
 CPP='gcc -E -x c'
 CPPFLAGS=''
-DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"54\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"58\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
 DEPEND_FLAG='-MM'
 ECHO_C=''
 ECHO_N='printf'
@@ -735,7 +734,7 @@ unused=''
 #define PACKAGE_BUGREPORT "[email protected]"
 #define PACKAGE_URL ""
 #define NETGEN_VERSION "1.5"
-#define NETGEN_REVISION "54"
+#define NETGEN_REVISION "58"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
@@ -657,7 +657,7 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\
-"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"54\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
+"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"58\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
 "DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -D"\
 "SIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHA"\
 "VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"
@@ -4861,7 +4861,7 @@ $as_echo_n "checking for tclConfig.sh... " >&6; }
    #  1. Search previously named locations.

    for dir in \
-     $prefix \
+     $ac_default_prefix \
     $exec_prefix
    do
      if test -r "$dir/tclConfig.sh" ; then
@@ -4948,7 +4948,7 @@ $as_echo_n "checking for tkConfig.sh... " >&6; }
    #  1. Search previously named locations.
    #
    for dir in \
-     $prefix \
+     $ac_default_prefix \
     $exec_prefix
    do
      if test -r "$dir/tkConfig.sh" ; then
@@ -5007,6 +5007,25 @@ if test $usingTcl ; then
  . $tcl_config_sh
  . $tk_config_sh

+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
  if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
    :
  elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
@@ -472,6 +472,25 @@ if test $usingTcl ; then
  . $tcl_config_sh
  . $tk_config_sh

+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
  if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
    :
  elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
@@ -65,7 +65,7 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@

 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"54\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"58\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -fPIC 

 DEPEND_FILE            = Depend
@@ -126,6 +126,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
      }
   } else {
      netgen::permute default	;# transistors and resistors
+      netgen::property default
   }

   puts stdout "Comparison output logged to file $logfile"
@@ -231,6 +231,7 @@ Command netcmp_cmds[] = {
 		"transistor: enable transistor permutations\n   "
 		"(none): enable transistor and resistor permutations"},
 	{"property",		_netcmp_property,
+		"default: apply property defaults\n   "
 		"<device>|<model> <property_key> [...]\n   "
 		"<device>: name of a device type (capacitor, etc.)\n  "
 		"<model>: name of a device model\n   "
@@ -2963,6 +2964,8 @@ _netcmp_equate(ClientData clientData,
 /*	remove	  --- delete existing property		*/
 /*	tolerance --- set property tolerance		*/
 /*	merge	  --- set property merge behavior	*/
+/* or							*/
+/*	netgen::property default			*/
 /* Formerly: (none)					*/
 /* Results:						*/
 /* Side Effects:					*/
@@ -3005,6 +3008,44 @@ _netcmp_property(ClientData clientData,
 	Tcl_WrongNumArgs(interp, 1, objv, "valid_cellname ?option?");
 	return TCL_ERROR;
    }
+
+    /* Check for special command "property default" */
+    if ((objc == 2) && (!strcmp(Tcl_GetString(objv[1]), "default"))) {
+
+	/* For each FET device, do "merge {w add_critical}" and	*/
+	/* "remove as ad ps pd".  This allows parallel devices	*/
+	/* to be added by width, and prevents attempts to	*/
+	/* compare source/drain area and perimeter.		*/
+
+	tp = FirstCell();
+	 while (tp != NULL) {
+	     switch (tp->class) {
+		case CLASS_NMOS: case CLASS_PMOS: case CLASS_FET3:
+		case CLASS_NMOS4: case CLASS_PMOS4: case CLASS_FET4:
+		case CLASS_FET:
+		    PropertyMerge(tp->name, tp->file, "w", MERGE_ADD_CRIT);
+		    PropertyDelete(tp->name, tp->file, "as");
+		    PropertyDelete(tp->name, tp->file, "ad");
+		    PropertyDelete(tp->name, tp->file, "ps");
+		    PropertyDelete(tp->name, tp->file, "pd");
+		    break;
+		case CLASS_RES: case CLASS_RES3:
+		    PropertyMerge(tp->name, tp->file, "l", MERGE_PAR_CRIT);
+		    break;
+		case CLASS_CAP: case CLASS_ECAP: case CLASS_CAP3:
+		    // NOTE:  No attempt to combine area, width, or length;
+		    // only value.
+		    PropertyMerge(tp->name, tp->file, "value", MERGE_ADD_CRIT);
+		    break;
+		case CLASS_INDUCTOR:
+		    PropertyMerge(tp->name, tp->file, "value", MERGE_PAR_CRIT);
+		    break;
+	    }
+	    tp = NextCell();
+	}
+	return TCL_OK;
+    }
+
    result = CommonParseCell(interp, objv[1], &tp, &fnum);
    if (result != TCL_OK) return result;
Author	SHA1	Message	Date
Tim Edwards	b7363862b3	Merge branch 'master' into work	2016-09-08 22:08:22 -04:00
Tim Edwards	29566bde4d	Update at Thu Sep 8 22:08:20 EDT 2016 by tim	2016-09-08 22:08:20 -04:00
Tim Edwards	99d096cfc1	Corrected error in tclnetgen for command option "property default", which did not return from the command after processing the "default" option.	2016-09-08 22:07:35 -04:00
Tim Edwards	9943676df4	Merge branch 'master' into work	2016-07-21 11:24:28 -04:00
Tim Edwards	568ed65c05	Update at Thu Jul 21 11:24:27 EDT 2016 by tim	2016-07-21 11:24:27 -04:00
Tim Edwards	cb85aa7115	Updated configure script to extract the paths for the Tcl and Tk lib and include files, so that subsequent checks for those files are not disjoint from the contents of tclConfig.sh and tkConfig.sh.	2016-07-21 11:24:21 -04:00
Tim Edwards	be819b7200	Added resistors and inductors to the list of devices whose merging properties are defined by "property default".	2016-07-16 15:48:51 -04:00
Tim Edwards	618f912cac	Implemented critical property combining in parallel for devices such as resistors.	2016-07-16 15:44:17 -04:00
Tim Edwards	17c2bff72b	Added command option "property default" which acts similarly to "permute default" by (1) handling the usual case for MOSFETs (resistors and adding in parallel not yet implemented), and (2) being done automatically when no setup script is specified.	2016-07-16 14:27:31 -04:00
Tim Edwards	7e68f3a32e	Merge branch 'master' into work	2016-07-16 13:52:35 -04:00
Tim Edwards	c60443b862	Update at Sat Jul 16 13:52:34 EDT 2016 by tim	2016-07-16 13:52:34 -04:00
Tim Edwards	4a295dbfe4	Corrected use of strdup instead of strsave, which causes a different malloc() to be called and can cause crashes.	2016-07-16 13:51:53 -04:00
@@ -1 +1 @@
 .5.56
 .5.59