Integration of Chaco into Gmsh

contrib/Chaco/Makefile

-DEST_DIR = 	../exec
-DEST=		${DEST_DIR}/chaco
-CC = 		gcc
-IFLAG =		-Imain
-CFLAGS =	-O2
-OFLAGS =	-O2
 
-FILES.c=	main/user_params.c main/interface.c main/main.c \
+include ../../variables
+
+LIB = ../../lib/libGmshChaco${LIBEXT}
+
+INC = ${DASH}Imain
+
+CFLAGS  = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
+
+SRCX	 =	main/Gmsh_printf.cpp main/Gmsh_exit.cpp
+SRC =		main/user_params.c main/interface.c \
 		submain/balance.c submain/divide.c submain/submain.c \
 		input/input_assign.c \
 		input/check_input.c input/input.c input/input_geom.c \
@@ -87,20 +90,30 @@ FILES.c=	main/user_params.c main/interface.c main/main.c \
 		util/update.c  util/vecout.c util/vecran.c \
                 util/vecscale.c 
 
-FILES.o=	$(FILES.c:.c=.o) 
+OBJ = ${SRC:.c=${OBJEXT}}
+OBJX = ${SRCX:.cpp=${OBJEXT}}
 
+.SUFFIXES: ${OBJEXT} .c .cpp
 
-${DEST}:	${FILES.o} Makefile
-		${CC} ${OFLAGS} ${FILES.o} -lm -o ${DEST}
+${LIB}: ${OBJ} ${OBJX}
+	${AR} ${ARFLAGS}${LIB} ${OBJ} ${OBJX} 
+	${RANLIB} ${LIB}
 
-lint:
-		lint ${IFLAG} ${FILES.c} -lm
+.c${OBJEXT}:
+	${CC} ${CFLAGS} ${DASH}c $< ${DASH}o ${<:.c=${OBJEXT}}
 
-alint:
-		alint ${IFLAG} ${FILES.c} -lm
+.cpp${OBJEXT}:
+	${CXX} ${CFLAGS} ${DASH}c $< ${DASH}o ${<:.cpp=${OBJEXT}}
 
 clean:
-		rm -f */*.o ${DEST_DIR}/core
+	rm -f */*.o */*.obj
+
+depend:
+	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
+	${CXX} -MM ${CFLAGS} ${SRC} \
+	) >Makefile.new
+	cp Makefile Makefile.bak
+	cp Makefile.new Makefile
+	rm -f Makefile.new
 
-.c.o:
-		${CC} -c ${IFLAG} ${CFLAGS} -o $*.o $*.c
+# DO NOT DELETE THIS LINE

contrib/Chaco/README

-This directory contains all the necessary source code files
-for Chaco.  Simply type "make", and the code will be compiled
-and the executable image placed in "../exec/chaco".  
-
-The default values for the user accessible parameters discussed 
-in the user's guide "doc/User_guide.ps" can be modified by 
-editing the file "main/user_params.c".  You must recompile for 
-these changes to take affect. 
-
-You can also change the code parameters at run time (i.e. without 
-recompiling) by including a file "User_Params" in whichever 
-directory you are running the code from (so in the file 
-"exec/User_Params" in our orignal set-up). Parameter changes 
-can be specified in a natural way in this file using the rules 
-described in the user's guide.
+Chaco version 2.2
+
+This software was developed by Bruce Hendrickson and Robert Leland
+at Sandia National Laboratories under US Department of Energy
+contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation.
+
+--------------------------------------------------------------------------------
+
+Chaco has been slightly modified for integration into the Gmsh program.  Most
+changes are to 'main/interface.c'.  Elsewhere, the 'printf' routine has been
+defined as Gmsh_printf to write through a Gmsh Msg::Info.  All other
+modifications are tagged by 'Gmsh' and 'Gmsh - end'
+
+Parameters explicitly set to false
+FREE_GRAPH
+
+Parameters that are read through Gmsh and overwrite the parameters file
+REFINE_PARTITION
+INTERNAL_VERTICES
+REFINE_MAP
+TERMINAL_PROPOGATION
+

contrib/Chaco/assign/assign.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include	<stdio.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 #include	"structs.h"
 

contrib/Chaco/bpmatch/checkbp.c

@@ -4,6 +4,7 @@
 
 #include	<stdio.h>
 #include	<math.h>
+#include        "Gmsh_printf.h"
 #include	"structs.h"
 #include	"params.h"
 #include	"defs.h"

contrib/Chaco/bpmatch/map2d.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include	<stdio.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 #include	"params.h"
 #include	"structs.h"

contrib/Chaco/bpmatch/map3d.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include	<stdio.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 #include	"params.h"
 #include	"structs.h"

contrib/Chaco/coarsen/coarsen.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <math.h>
+#include "Gmsh_printf.h"
 #include "params.h"
 #include "defs.h"
 #include "structs.h"

contrib/Chaco/coarsen/makecgraph.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/coarsen/makecgraph2.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/coarsen/makefgraph.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/coarsen/maxmatch.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/connect/connected.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include	<stdio.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 #include	"structs.h"
 

contrib/Chaco/eigen/bisect.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 
 /* Finds selected eigenvalues of T using Sturm sequence bisection. Based 

contrib/Chaco/eigen/checkeig_ext.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/eigen/checkorth.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <math.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/eigen/eigensolve.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <math.h>
+#include "Gmsh_printf.h"
 #include "params.h"
 #include "defs.h"
 #include "structs.h"

contrib/Chaco/eigen/get_extval.c

@@ -4,6 +4,7 @@
 
 #include <math.h>
 #include <stdio.h>
+#include "Gmsh_printf.h"
 
 /* Finds first extended eigenpair of system corresponding to
    tridiagonal T using using Rafael's bisection technique. */

contrib/Chaco/eigen/get_ritzvals.c

@@ -4,6 +4,7 @@
 
 #include <math.h>
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 
 /* Finds needed eigenvalues of tridiagonal T using either the QL algorithm 

contrib/Chaco/eigen/lanczos_FO.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "structs.h"
 #include "defs.h"
 

contrib/Chaco/eigen/lanczos_SO.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <math.h>
+#include "Gmsh_printf.h"
 #include "structs.h"
 #include "defs.h"
 #include "params.h"