diff --git a/Makefile b/Makefile
index 5632d02be77d4ae41dc2eaa07bf3fa4c4a98f5f4..2e141cb4a257fbf8ad082c0d3b16dc3143ed53f0 100644
--- a/Makefile
+++ b/Makefile
@@ -202,8 +202,7 @@ source-tree: purge
source: source-tree
cd gmsh-${GMSH_VERSION} && rm -rf ${GMSH_VERSION_FILE}\
- contrib/NR contrib/Triangle/triangle.* contrib/Tetgen/tetgen.*\
- contrib/Tetgen/predicates.* utils/nightly
+ contrib/NR contrib/Tetgen/*.{cxx,h} contrib/misc/variables.i*\
tar zcf gmsh-${GMSH_VERSION}-source.tgz gmsh-${GMSH_VERSION}
# Rules to package the binaries
diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 6d9d2b5ec5752765dd72b9af2a3e97629efd3e07..05a2a6f38419a487b07fc84408f392f542332e82 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -187,8 +187,8 @@ void GMSH_AnnotatePlugin::getName(char *name) const
void GMSH_AnnotatePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Annotate) adds the text string `Text',\n"
"in font `Font' and size `FontSize', in the view\n"
diff --git a/Plugin/Curl.cpp b/Plugin/Curl.cpp
index 152d5f8bd176ea0ca8f019a105d8451695b28e93..5fd51064407607d4fff062771cc688f7c83d753e 100644
--- a/Plugin/Curl.cpp
+++ b/Plugin/Curl.cpp
@@ -26,8 +26,8 @@ void GMSH_CurlPlugin::getName(char *name) const
void GMSH_CurlPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Curl) computes the curl of the field\n"
"in the view `iView'. If `iView' < 0, the plugin\n"
diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index 27188d3426b3f788c2f7fe56eebf2a4924b00f8e..442995011461c197d0e7ed3bd908dd4779bd3c16 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -167,8 +167,8 @@ void GMSH_CutGridPlugin::getName(char *name) const
void GMSH_CutGridPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J.-F. Remacle");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(CutGrid) cuts the view `iView' with a\n"
"rectangular grid defined by the 3 points\n"
diff --git a/Plugin/CutMap.cpp b/Plugin/CutMap.cpp
index e746d3475e5bb1a8d5983109e17e5b40aabc206c..a745f6018726532d348b6d844d9ba6648ccdf94b 100644
--- a/Plugin/CutMap.cpp
+++ b/Plugin/CutMap.cpp
@@ -87,8 +87,8 @@ void GMSH_CutMapPlugin::getName(char *name) const
void GMSH_CutMapPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J.-F. Remacle");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(CutMap) extracts the isosurface of value\n"
"`A' from the view `iView' and draws the\n"
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 2c83b3bb4e94314f294a391f79ecf611ddeaf614..7deb59f3f53ef2f3894262788e7cdd6f91863ad5 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -199,8 +199,8 @@ void GMSH_CutParametricPlugin::getName(char *name) const
void GMSH_CutParametricPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(CutParametric) cuts the view `iView' with\n"
"the parametric function (`X'(u), `Y'(u), `Z'(u)),\n"
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index 42b5daab895703fc77b427095f185286d889237f..0f802b64b28af6afe246c72d6e9148426bed1bfc 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -120,8 +120,8 @@ void GMSH_CutPlanePlugin::getName(char *name) const
void GMSH_CutPlanePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J.-F. Remacle");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(CutPlane) cuts the view `iView' with\n"
"the plane `A'*X + `B'*Y + `C'*Z + `D' = 0. If\n"
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index 645924401a07dec6097408d55b5e8fb4d2954339..ddc9155eb4d20bdb3e533961e88675c0149e353b 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -116,8 +116,8 @@ void GMSH_CutSpherePlugin::getName(char *name) const
void GMSH_CutSpherePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J.-F. Remacle");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(CutSphere) cuts the view `iView' with the\n"
"sphere (X-`Xc')^2 + (Y-`Yc')^2 + (Z-`Zc')^2 = `R'^2.\n"
diff --git a/Plugin/Divergence.cpp b/Plugin/Divergence.cpp
index 1a916aed10c3c2aac61eda353e145dcbdbe74d0e..6f009a626228238aa1d43330b3470a63c0c13082 100644
--- a/Plugin/Divergence.cpp
+++ b/Plugin/Divergence.cpp
@@ -26,8 +26,8 @@ void GMSH_DivergencePlugin::getName(char *name) const
void GMSH_DivergencePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Divergence) computes the divergence of the\n"
"field in the view `iView'. If `iView' < 0, the plugin\n"
diff --git a/Plugin/Eigenvalues.cpp b/Plugin/Eigenvalues.cpp
index 985bf69c74f9b745cee8bd127d22ae489b07440a..06e7804b09be5749d04b755f0eaa36141e045343 100644
--- a/Plugin/Eigenvalues.cpp
+++ b/Plugin/Eigenvalues.cpp
@@ -25,8 +25,8 @@ void GMSH_EigenvaluesPlugin::getName(char *name) const
void GMSH_EigenvaluesPlugin::getInfos(char *author, char *copyright, char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Eigenvalues) computes the three real\n"
"eigenvalues of each tensor in the view `iView'.\n"
diff --git a/Plugin/Evaluate.cpp b/Plugin/Evaluate.cpp
index 76c1d36abc6cec466bb4602b501b780b4767885e..770316436738a030825e71957bad6009f2a33d8b 100644
--- a/Plugin/Evaluate.cpp
+++ b/Plugin/Evaluate.cpp
@@ -37,8 +37,8 @@ void GMSH_EvaluatePlugin::getName(char *name) const
void GMSH_EvaluatePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Evaluate) sets the `Component'-th\n"
"component of the `TimeStep'-th time step in the\n"
diff --git a/Plugin/Extract.cpp b/Plugin/Extract.cpp
index 29b2d9cd7e8b6e0fc87be016e17fbcae517cea6d..f2b395da3e1a3e1d62c4348c6eb0d1074058a2f0 100644
--- a/Plugin/Extract.cpp
+++ b/Plugin/Extract.cpp
@@ -45,8 +45,8 @@ void GMSH_ExtractPlugin::getName(char *name) const
void GMSH_ExtractPlugin::getInfos(char *author, char *copyright, char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Extract) extracts a combination of\n"
"components from the `TimeStep'th time step\n"
diff --git a/Plugin/ExtractEdges.cpp b/Plugin/ExtractEdges.cpp
index 23c8f0e960b9acd6decb25c348d43208ee52fb5c..03a8f60fd49e7cd11bb9b074a7af4312c0531107 100644
--- a/Plugin/ExtractEdges.cpp
+++ b/Plugin/ExtractEdges.cpp
@@ -31,8 +31,8 @@ void GMSH_ExtractEdgesPlugin::getName(char *name) const
void GMSH_ExtractEdgesPlugin::getInfos(char *author, char *copyright, char *help_text) const
{
- strcpy(author, "C. Geuzaine (geuz@geuz.org)");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(ExtractEdges) extracts the geometry edges\n"
"from the surface view `iView', using `Angle' as\n"
diff --git a/Plugin/ExtractElements.cpp b/Plugin/ExtractElements.cpp
index 1b98f1c769a1ca9c7141aa08a52c1d01f975782b..f281e5eb90dd0b75be44531612bcef307ff17674 100644
--- a/Plugin/ExtractElements.cpp
+++ b/Plugin/ExtractElements.cpp
@@ -30,8 +30,8 @@ void GMSH_ExtractElementsPlugin::getName(char *name) const
void GMSH_ExtractElementsPlugin::getInfos(char *author, char *copyright, char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(ExtractElements) extracts the elements\n"
"from the view `iView' whose `TimeStep'-th values\n"
diff --git a/Plugin/FieldView.cpp b/Plugin/FieldView.cpp
index cfe61bc09ea8796c50eb3bab7e229f867650e908..d156e5c61298ff8af6d64301a0033d56b2b1a7fa 100644
--- a/Plugin/FieldView.cpp
+++ b/Plugin/FieldView.cpp
@@ -29,10 +29,10 @@ void GMSH_FieldViewPlugin::getName(char *name) const
void GMSH_FieldViewPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J. Lambrechts (jonathanlambrechts@gmail.org)");
- strcpy(copyright, "GPL");
+ strcpy(author, "J. Lambrechts");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
- "Plugin(FieldView) evaluate a field on the choosen view.\n");
+ "Plugin(FieldView) evaluates a field on the choosen view.\n");
}
int GMSH_FieldViewPlugin::getNbOptions() const
diff --git a/Plugin/GSHHS.cpp b/Plugin/GSHHS.cpp
index 252c85f8058c7923a78f233535b09f27fd638e44..41e9b544192d01280b5833ce0735a5156f84e70b 100644
--- a/Plugin/GSHHS.cpp
+++ b/Plugin/GSHHS.cpp
@@ -284,7 +284,7 @@ class GeoEarthImport
}
};
-/* $Id: GSHHS.cpp,v 1.14 2008-08-18 14:24:42 remacle Exp $
+/* $Id: GSHHS.cpp,v 1.15 2008-08-21 07:31:49 geuzaine Exp $
*
* PROGRAM: gshhs.c
* AUTHOR: Paul Wessel (pwessel@hawaii.edu)
@@ -438,8 +438,8 @@ void GMSH_GSHHSPlugin::getName(char *name) const
void GMSH_GSHHSPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J. Lambrechts (jonathanlambrechts@gmail.com)");
- strcpy(copyright, "GPL");
+ strcpy(author, "J. Lambrechts");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text, "Plugin(GSHHS) read differenct kind of contour lines data and write a .geo file.\n"
"Valid values for \"Format\" are :\n"
" -\"gshhs\" : open GSHHS file\n"
diff --git a/Plugin/Gradient.cpp b/Plugin/Gradient.cpp
index 8987890c12f7b0f0bdea314f5ea56dda4688f06f..db9287d43fe53234ab83a6255e5f0e23820d34d7 100644
--- a/Plugin/Gradient.cpp
+++ b/Plugin/Gradient.cpp
@@ -26,8 +26,8 @@ void GMSH_GradientPlugin::getName(char *name) const
void GMSH_GradientPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Gradient) computes the gradient of the\n"
"field in the view `iView'. If `iView' < 0, the\n"
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 67fa64d1ae64e001f9b36aab0ebd0f3794c99c5c..6e81ddb4dd510771aab10c130a13e35428b7fe1d 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -34,8 +34,8 @@ void GMSH_HarmonicToTimePlugin::getName(char *name) const
void GMSH_HarmonicToTimePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(HarmonicToTime) takes the values in the\n"
"time steps `RealPart' and `ImaginaryPart' of\n"
diff --git a/Plugin/Integrate.cpp b/Plugin/Integrate.cpp
index 68849d46c748880af1042412bc5a48c275397ed5..e8b4a0b50f1ab814b854a04bac2f6be657c023b2 100644
--- a/Plugin/Integrate.cpp
+++ b/Plugin/Integrate.cpp
@@ -32,8 +32,8 @@ void GMSH_IntegratePlugin::getName(char *name) const
void GMSH_IntegratePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Integrate) integrates scalar fields over\n"
"all the elements in the view `iView', as well\n"
diff --git a/Plugin/Lambda2.cpp b/Plugin/Lambda2.cpp
index d35ed582340bc448431d50703c956dd9fdce759f..dc9464836b8af9b073c2ef30306e30a2b12d8cff 100644
--- a/Plugin/Lambda2.cpp
+++ b/Plugin/Lambda2.cpp
@@ -33,7 +33,7 @@ void GMSH_Lambda2Plugin::getInfos(char *author, char *copyright,
char *help_text) const
{
strcpy(author, "E. Marchandise");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Lambda2) computes the eigenvalues\n"
"Lambda(1,2,3) of the tensor (S_ik S_kj +\n"
diff --git a/Plugin/MakeSimplex.cpp b/Plugin/MakeSimplex.cpp
index f97e5270b6a42a5ddd2e3775c706735fd9c9d4f5..6836e21f0593bd348e98ba8e7c6b930951dbe67a 100644
--- a/Plugin/MakeSimplex.cpp
+++ b/Plugin/MakeSimplex.cpp
@@ -30,8 +30,8 @@ void GMSH_MakeSimplexPlugin::getName(char *name) const
void GMSH_MakeSimplexPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(MakeSimplex) decomposes all non-\n"
"simplectic elements (quadrangles, prisms,\n"
diff --git a/Plugin/ModulusPhase.cpp b/Plugin/ModulusPhase.cpp
index f32b960a1747123f9fdb28cc2f8ff6ac75c050dd..68346ea1a6d6c07190b9fbb4cbdfa7a1778fe865 100644
--- a/Plugin/ModulusPhase.cpp
+++ b/Plugin/ModulusPhase.cpp
@@ -27,8 +27,8 @@ void GMSH_ModulusPhasePlugin::getName(char *name) const
void GMSH_ModulusPhasePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(ModulusPhase) interprets the time steps\n"
"`realPart' and `imaginaryPart' in the view `iView'\n"
diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp
index ba064ba612fd2f7e70ea421de0798d684459f817..810563dc189f522b29144e160ea18b556ddeb621 100644
--- a/Plugin/Probe.cpp
+++ b/Plugin/Probe.cpp
@@ -106,8 +106,8 @@ void GMSH_ProbePlugin::getName(char *name) const
void GMSH_ProbePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Probe) gets the value of the view `iView' at\n"
"the point (`X',`Y',`Z'). If `iView' < 0, the plugin is\n"
diff --git a/Plugin/Remove.cpp b/Plugin/Remove.cpp
index 9b3c48ef82a58359008d2ee25447e3aba88e5861..035c0bec30d5f3a1eadbe4adbed7da57b986af20 100644
--- a/Plugin/Remove.cpp
+++ b/Plugin/Remove.cpp
@@ -38,8 +38,8 @@ void GMSH_RemovePlugin::getName(char *name) const
void GMSH_RemovePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Remove) removes the marked items\n"
"from the view `iView'. If `iView' < 0, the plugin\n"
diff --git a/Plugin/Skin.cpp b/Plugin/Skin.cpp
index c6991ef239307e0376174d87a3520190a26e0404..00b7a169803846bc3f7124fd4ac55b22bf258fa7 100644
--- a/Plugin/Skin.cpp
+++ b/Plugin/Skin.cpp
@@ -35,8 +35,8 @@ void GMSH_SkinPlugin::getName(char *name) const
void GMSH_SkinPlugin::getInfos(char *author, char *copyright, char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Skin) extracts the skin (the boundary) of\n"
"the view `iView'. If `iView' < 0, the plugin is run\n"
diff --git a/Plugin/Smooth.cpp b/Plugin/Smooth.cpp
index d832f7fd4e1d0fd6235aca2799e5bfdd14b2d8de..66296710d88e66815219ac0c9b8d74b93ad90ed6 100644
--- a/Plugin/Smooth.cpp
+++ b/Plugin/Smooth.cpp
@@ -25,8 +25,8 @@ void GMSH_SmoothPlugin::getName(char *name) const
void GMSH_SmoothPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Smooth) averages the values at the nodes\n"
"of the scalar view `iView'. If `iView' < 0, the\n"
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index 2f1caad1fbe46659c275f4a7f8e1e2239e0272b2..07b95be06a7299ea2ca65798f6fda8f8f3382376 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -32,8 +32,8 @@ void GMSH_SphericalRaisePlugin::getName(char *name) const
void GMSH_SphericalRaisePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(SphericalRaise) transforms the\n"
"coordinates of the elements in the view\n"
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index 2b52fbd1401f437feb5c929e60732e492f9db197..7e984054601cc6b3aab69e726f20b7f3be641a78 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -147,8 +147,8 @@ void GMSH_StreamLinesPlugin::getName(char *name) const
void GMSH_StreamLinesPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "J.-F. Remacle");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(StreamLines) computes stream lines\n"
"from the `TimeStep'-th time step of a vector\n"
diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp
index bfa70573b24fc98f1a1b9ec691eeac47bf4b68a6..2831b26b2aa1d7a40e007c00cf8c19feabda1dea 100644
--- a/Plugin/Transform.cpp
+++ b/Plugin/Transform.cpp
@@ -38,8 +38,8 @@ void GMSH_TransformPlugin::getName(char *name) const
void GMSH_TransformPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Transform) transforms the homogeneous\n"
"node coordinates (x,y,z,1) of the elements in\n"
diff --git a/Plugin/TransformLatLon.cpp b/Plugin/TransformLatLon.cpp
index dc1acd563247b872ab42cbf6966bc75319ce6d15..6c8d7545e723eb03acbb1ea2b932c526ccade71c 100644
--- a/Plugin/TransformLatLon.cpp
+++ b/Plugin/TransformLatLon.cpp
@@ -31,8 +31,8 @@ void GMSH_TransformLatLonPlugin::getName(char *name) const
void GMSH_TransformLatLonPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "J. Lambrechts");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(TransformLatLon) transforms the homogeneous\n"
"node coordinates (x,y,z,1) of the elements in\n"
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 1c25505166616641be5f96aa90eff684e0e396a8..7a4f7c0a436f818a4fb27afb476c825066f612a0 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -34,8 +34,8 @@ void GMSH_TriangulatePlugin::getName(char *name) const
void GMSH_TriangulatePlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Triangulate) triangulates the points in the\n"
"view `iView', assuming that all the points belong\n"
diff --git a/Plugin/Warp.cpp b/Plugin/Warp.cpp
index 0009417a943aeb054af85a959be0601b69dee92d..0a20162466d8092833ea7d20af20124726c80d11 100644
--- a/Plugin/Warp.cpp
+++ b/Plugin/Warp.cpp
@@ -31,8 +31,8 @@ void GMSH_WarpPlugin::getName(char *name) const
void GMSH_WarpPlugin::getInfos(char *author, char *copyright,
char *help_text) const
{
- strcpy(author, "C. Geuzaine");
- strcpy(copyright, "DGR (www.multiphysics.com)");
+ strcpy(author, "C. Geuzaine, J.-F. Remacle");
+ strcpy(copyright, "C. Geuzaine, J.-F. Remacle");
strcpy(help_text,
"Plugin(Warp) transforms the elements in the\n"
"view `iView' by adding to their node coordinates\n"
diff --git a/configure b/configure
index 550ce399ed5b3877b9d528d6a8519d7dd860f2c4..b272482aab11cf9a42ca33025e317c188eac262f 100755
--- a/configure
+++ b/configure
@@ -4458,9 +4458,8 @@ fi
FLAGS="-DHAVE_ANN ${FLAGS}"
echo "********************************************************************"
echo " You are building a version of Gmsh that contains ANN, the"
- echo " Approximate Nearest Neighbor library."
- echo " Please note that by doing so, you agree with ANN's licensing"
- echo " requirements stated in contrib/ANN/Copyright.txt."
+ echo " Approximate Nearest Neighbor library. ANN is available under"
+ echo " the GNU LGPL."
echo " To disable ANN, run configure again with the --disable-ann"
echo " option."
echo "********************************************************************"
@@ -4535,8 +4534,8 @@ fi
echo "********************************************************************"
echo " You are building a version of Gmsh that contains the METIS mesh"
echo " partitioner."
- echo " Please note that by including METIS, you agree with the METIS"
- echo " licensing requirements stated in contrib/Metis/README."
+ echo " Please note that by including METIS, you agree with METIS'"
+ echo " special licensing requirements stated in contrib/Metis/README."
echo " To disable METIS, run configure again with the --disable-metis"
echo " option."
echo "********************************************************************"
@@ -4573,7 +4572,7 @@ fi
FLAGS="-DHAVE_NETGEN ${FLAGS}"
echo "********************************************************************"
echo " You are building a version of Gmsh that contains the Netgen 3D"
- echo " mesh generator. Netgen is distributed under the GNU LGPL."
+ echo " mesh generator. Netgen is available under the GNU LGPL."
echo " To disable Netgen, run configure again with the --disable-netgen"
echo " option."
echo "********************************************************************"
@@ -4611,9 +4610,8 @@ fi
echo "********************************************************************"
echo " You are building a version of Gmsh that contains the Tetgen 3D"
echo " mesh generator."
- echo " Please note that by doing so, you agree with Tetgen's licensing"
- echo " requirements stated in contrib/Tetgen/LICENSE. (Most notably,"
- echo " you may then only redistribute Gmsh for non-commercial purposes.)"
+ echo " Please note that by doing so, you agree with Tetgen's special"
+ echo " licensing requirements stated in contrib/Tetgen/LICENSE."
echo " To disable Tetgen, run configure again with the --disable-tetgen"
echo " option."
echo "********************************************************************"
@@ -4648,6 +4646,12 @@ fi
GMSH_DIRS="${GMSH_DIRS} contrib/MathEval"
GMSH_LIBS="${GMSH_LIBS} -lGmshMathEval"
FLAGS="-DHAVE_MATH_EVAL ${FLAGS}"
+ echo "********************************************************************"
+ echo " You are building a version of Gmsh that contains GNU MathEval."
+ echo " MathEval is available under the GNU GPL."
+ echo " To disable MathEval, run configure again with the"
+ echo " --disable-matheval option."
+ echo "********************************************************************"
fi
fi
@@ -4818,14 +4822,14 @@ else
fi
if test "x${NR}" = "xyes"; then
+ GMSH_DIRS="${GMSH_DIRS} contrib/NR"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshNR"
echo "********************************************************************"
echo " You are building a non-free version of Gmsh, using code copyright"
- echo " (C) 1986-92 Numerical Recipes Software J!0."
+ echo " (C) 1986-92 Numerical Recipes Software."
echo " To use the GSL instead, run configure again with the --enable-gsl"
echo " option."
echo "********************************************************************"
- GMSH_DIRS="${GMSH_DIRS} contrib/NR"
- GMSH_LIBS="${GMSH_LIBS} -lGmshNR"
else
{ { echo "$as_me:$LINENO: error: Could not find GSL, aborting." >&5
echo "$as_me: error: Could not find GSL, aborting." >&2;}
diff --git a/configure.in b/configure.in
index 93d76f0f3f227fe281698f6d8251b2e4c28891c5..057f7f1cc2916e435118077a91c81c29c7e7e96c 100644
--- a/configure.in
+++ b/configure.in
@@ -407,9 +407,8 @@ if test "x$enable_contrib" != "xno"; then
FLAGS="-DHAVE_ANN ${FLAGS}"
echo "********************************************************************"
echo " You are building a version of Gmsh that contains ANN, the"
- echo " Approximate Nearest Neighbor library."
- echo " Please note that by doing so, you agree with ANN's licensing"
- echo " requirements stated in contrib/ANN/Copyright.txt."
+ echo " Approximate Nearest Neighbor library. ANN is available under"
+ echo " the GNU LGPL."
echo " To disable ANN, run configure again with the --disable-ann"
echo " option."
echo "********************************************************************"
@@ -442,8 +441,8 @@ if test "x$enable_contrib" != "xno"; then
echo "********************************************************************"
echo " You are building a version of Gmsh that contains the METIS mesh"
echo " partitioner."
- echo " Please note that by including METIS, you agree with the METIS"
- echo " licensing requirements stated in contrib/Metis/README."
+ echo " Please note that by including METIS, you agree with METIS'"
+ echo " special licensing requirements stated in contrib/Metis/README."
echo " To disable METIS, run configure again with the --disable-metis"
echo " option."
echo "********************************************************************"
@@ -459,7 +458,7 @@ if test "x$enable_contrib" != "xno"; then
FLAGS="-DHAVE_NETGEN ${FLAGS}"
echo "********************************************************************"
echo " You are building a version of Gmsh that contains the Netgen 3D"
- echo " mesh generator. Netgen is distributed under the GNU LGPL."
+ echo " mesh generator. Netgen is available under the GNU LGPL."
echo " To disable Netgen, run configure again with the --disable-netgen"
echo " option."
echo "********************************************************************"
@@ -476,9 +475,8 @@ if test "x$enable_contrib" != "xno"; then
echo "********************************************************************"
echo " You are building a version of Gmsh that contains the Tetgen 3D"
echo " mesh generator."
- echo " Please note that by doing so, you agree with Tetgen's licensing"
- echo " requirements stated in contrib/Tetgen/LICENSE. (Most notably,"
- echo " you may then only redistribute Gmsh for non-commercial purposes.)"
+ echo " Please note that by doing so, you agree with Tetgen's special"
+ echo " licensing requirements stated in contrib/Tetgen/LICENSE."
echo " To disable Tetgen, run configure again with the --disable-tetgen"
echo " option."
echo "********************************************************************"
@@ -492,6 +490,12 @@ if test "x$enable_contrib" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/MathEval"
GMSH_LIBS="${GMSH_LIBS} -lGmshMathEval"
FLAGS="-DHAVE_MATH_EVAL ${FLAGS}"
+ echo "********************************************************************"
+ echo " You are building a version of Gmsh that contains GNU MathEval."
+ echo " MathEval is available under the GNU GPL."
+ echo " To disable MathEval, run configure again with the"
+ echo " --disable-matheval option."
+ echo "********************************************************************"
fi
fi
@@ -518,14 +522,14 @@ if test "x${GSL}" != "xyes"; then
dnl Check if non-free numerical recipes routines are in the tree
AC_CHECK_FILE(./contrib/NR/dsvdcmp.cpp,NR="yes",NR="no")
if test "x${NR}" = "xyes"; then
+ GMSH_DIRS="${GMSH_DIRS} contrib/NR"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshNR"
echo "********************************************************************"
echo " You are building a non-free version of Gmsh, using code copyright"
- echo " (C) 1986-92 Numerical Recipes Software J!0."
+ echo " (C) 1986-92 Numerical Recipes Software."
echo " To use the GSL instead, run configure again with the --enable-gsl"
echo " option."
echo "********************************************************************"
- GMSH_DIRS="${GMSH_DIRS} contrib/NR"
- GMSH_LIBS="${GMSH_LIBS} -lGmshNR"
else
AC_MSG_ERROR([Could not find GSL, aborting.])
fi