From b11092255c62c90fde286497bd9bc1e044b16f06 Mon Sep 17 00:00:00 2001
From: Stefen Guzik <guzik2@llnl.gov>
Date: Thu, 31 Jul 2008 20:58:29 +0000
Subject: [PATCH] *** empty log message ***
---
contrib/Chaco/Makefile | 15 ++++++++-------
contrib/Chaco/main/Gmsh_exit.h | 13 ++++++-------
contrib/Chaco/main/Gmsh_printf.h | 16 ++++++++--------
contrib/Chaco/main/interface.c | 9 +++++++++
4 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/contrib/Chaco/Makefile b/contrib/Chaco/Makefile
index 5dc3c1a411..b4c7d1ed6b 100644
--- a/contrib/Chaco/Makefile
+++ b/contrib/Chaco/Makefile
@@ -108,12 +108,13 @@ ${LIB}: ${OBJ} ${OBJX}
clean:
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
+# Doesn't quite work
+# 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
# DO NOT DELETE THIS LINE
diff --git a/contrib/Chaco/main/Gmsh_exit.h b/contrib/Chaco/main/Gmsh_exit.h
index ab9b44bad4..1f331ae2ee 100644
--- a/contrib/Chaco/main/Gmsh_exit.h
+++ b/contrib/Chaco/main/Gmsh_exit.h
@@ -1,13 +1,12 @@
-// Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
-//
-// See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
-
-// Overload the printf statements in Chaco to write using Msg::Direct gmsh
-
+/* Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
+ *
+ * See the LICENSE.txt file for license information. Please report all
+ * bugs and problems to <gmsh@geuz.org>.
+ */
#ifndef _GMSH_EXIT_H_
#define _GMSH_EXIT_H_
+/* Throw instead of exit */
int Gmsh_exit();
#endif
diff --git a/contrib/Chaco/main/Gmsh_printf.h b/contrib/Chaco/main/Gmsh_printf.h
index 69e4ed1f3f..a5f2dddede 100644
--- a/contrib/Chaco/main/Gmsh_printf.h
+++ b/contrib/Chaco/main/Gmsh_printf.h
@@ -1,14 +1,14 @@
-// Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
-//
-// See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
-
-// Overload the printf statements in Chaco to write using Msg::Direct gmsh
-
+/* Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
+ *
+ * See the LICENSE.txt file for license information. Please report all
+ * bugs and problems to <gmsh@geuz.org>.
+ */
#ifndef _GMSH_PRINTF_H_
#define _GMSH_PRINTF_H_
-#define printf Gmsh_printf
+/* Overload the printf statements in Chaco to write using Msg::Direct gmsh */
+#define printf(fmt, ...) Gmsh_printf(fmt, ##__VA_ARGS__)
+/* #define fprintf(file, fmt, ...) Gmsh_printf(fmt, ##__VA_ARGS__) */
int Gmsh_printf(const char *fmt, ...);
#endif
diff --git a/contrib/Chaco/main/interface.c b/contrib/Chaco/main/interface.c
index 6f6cac7f6a..26b4fc2cd1 100644
--- a/contrib/Chaco/main/interface.c
+++ b/contrib/Chaco/main/interface.c
@@ -49,6 +49,9 @@ int terminal_propogation;
/* Gmsh - end */
{
extern char *PARAMS_FILENAME; /* name of file with parameter updates */
+ extern int ECHO; /* copy input to screen? results to file? */
+ extern int OUTPUT_METRICS; /* controls displaying of results (-2..2) */
+ extern int OUTPUT_TIME; /* at what level to display timings (0..2) */
extern int MAKE_VWGTS; /* make vertex weights equal to degrees? */
extern int MATCH_TYPE; /* matching routine to use */
extern int FREE_GRAPH; /* free graph data structure after reformat? */
@@ -87,6 +90,12 @@ int terminal_propogation;
graph = NULL;
coords = NULL;
+/* Gmsh - change to default parameters (these can be overridden by a parameters
+ * file */
+ ECHO = 0;
+ OUTPUT_METRICS = 1;
+ OUTPUT_TIME = 0;
+/* Gmsh - end */
/* Gmsh - disable this for now. It would be interesting to let someone include
* it though */
/* if (!Using_Main) { /\* If not using main, need to read parameters file. *\/ */
--
GitLab