From 68bfedaf7a4be4349fb28b1c5230e414ef11f9e2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 10 Jan 2013 10:28:34 +0000
Subject: [PATCH] tweaks
---
Common/CommandLine.cpp | 29 ++++++++++++++++++-----------
Common/GmshMessage.cpp | 2 +-
Fltk/onelabGroup.cpp | 2 ++
doc/gmsh.html | 5 ++++-
4 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index af8e1ce0ac..c3a5ff29b9 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -801,21 +801,28 @@ void GetOptions(int argc, char *argv[])
Msg::Exit(0);
}
else if(!strcmp(argv[i] + 1, "info") || !strcmp(argv[i] + 1, "-info")) {
- fprintf(stderr, "Version : %s\n", GMSH_VERSION);
+ fprintf(stderr, "Version : %s\n", GMSH_VERSION);
#if defined(HAVE_FLTK)
- fprintf(stderr, "GUI toolkit : FLTK %d.%d.%d\n", FL_MAJOR_VERSION,
+ fprintf(stderr, "GUI toolkit : FLTK %d.%d.%d\n", FL_MAJOR_VERSION,
FL_MINOR_VERSION, FL_PATCH_VERSION);
#else
- fprintf(stderr, "GUI toolkit : none\n");
+ fprintf(stderr, "GUI toolkit : none\n");
#endif
- fprintf(stderr, "License : %s\n", GMSH_SHORT_LICENSE);
- fprintf(stderr, "Build OS : %s\n", GMSH_OS);
- fprintf(stderr, "Build options :%s\n", GMSH_CONFIG_OPTIONS);
- fprintf(stderr, "Build date : %s\n", GMSH_DATE);
- fprintf(stderr, "Build host : %s\n", GMSH_HOST);
- fprintf(stderr, "Packager : %s\n", GMSH_PACKAGER);
- fprintf(stderr, "Web site : http://www.geuz.org/gmsh/\n");
- fprintf(stderr, "Mailing list : gmsh@geuz.org\n");
+#if defined(HAVE_PETSC)
+#if defined(PETSC_USE_COMPLEX)
+ fprintf(stderr, "PETSc arithmetic : Complex\n");
+#else
+ fprintf(stderr, "PETSc arithmetic : Real\n");
+#endif
+#endif
+ fprintf(stderr, "License : %s\n", GMSH_SHORT_LICENSE);
+ fprintf(stderr, "Build OS : %s\n", GMSH_OS);
+ fprintf(stderr, "Build options :%s\n", GMSH_CONFIG_OPTIONS);
+ fprintf(stderr, "Build date : %s\n", GMSH_DATE);
+ fprintf(stderr, "Build host : %s\n", GMSH_HOST);
+ fprintf(stderr, "Packager : %s\n", GMSH_PACKAGER);
+ fprintf(stderr, "Web site : http://www.geuz.org/gmsh/\n");
+ fprintf(stderr, "Mailing list : gmsh@geuz.org\n");
Msg::Exit(0);
}
else if(!strcmp(argv[i] + 1, "help") || !strcmp(argv[i] + 1, "-help")) {
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 8279b40196..4ef053ac4e 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -416,7 +416,7 @@ void Msg::StatusBar(bool log, const char *fmt, ...)
if(_client && log) _client->Info(str);
#if defined(HAVE_FLTK)
-#pragma omp master
+#pragma omp master
{
if(FlGui::available()){
if(log) FlGui::instance()->check();
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index 2d6fab09b4..7585ea868c 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -241,6 +241,8 @@ bool onelab::localNetworkClient::run()
server->SendMessage(GmshSocket::GMSH_PARAMETER, reply.size(), &reply[0]);
}
else{
+ // FIXME: introduce GMSH_PARAMETER_NOT_FOUND message to handle this
+ // (need to change onelab.h accordingly)
reply = "OneLab parameter '" + name + "' not found";
server->SendMessage(GmshSocket::GMSH_INFO, reply.size(), &reply[0]);
}
diff --git a/doc/gmsh.html b/doc/gmsh.html
index f5b086d122..a961f8c86e 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -298,7 +298,7 @@ thumbnail"></a>
parametrizations for surface remeshing</em>. Engineering with Computers,
in press, 2012. (<a href="gmsh_stl3_preprint.pdf">PDF</a>)
</ul>
- High-order meshing and visualization
+ High-order (curvilinear) meshing
<ul class="small">
<li>A. Johnen, J.-F. Remacle and C. Geuzaine. <em>Geometric validity of
High-Order Triangular Finite Elements</em>. Engineering with Computers, in
@@ -306,6 +306,9 @@ thumbnail"></a>
<li>A. Johnen, J.-F. Remacle and C. Geuzaine. <em>Geometric validity of
Curvilinear Finite elements</em>. Journal of Computational Physics, in
press, 2012. (<a href="gmsh_curved_preprint.pdf">PDF</a>)
+ </ul>
+ Adaptive high-order visualization
+ <ul class="small">
<li>J.-F. Remacle, N. Chevaugeon, E. Marchandise and
C. Geuzaine. <em>Efficient Visualization of High-Order Finite
Elements</em>. International Journal for Numerical Methods in Engineering
--
GitLab