From 623e9cc8b527ac916caf2b1186ecb8c7ad7e493d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 4 May 2019 16:42:36 +0200
Subject: [PATCH] fix doc
---
api/api.texi | 6 +++---
api/gen.py | 2 +-
api/gmsh.h | 10 +++++-----
api/gmsh.h_cwrap | 6 +++---
api/gmsh.jl | 8 ++++----
api/gmsh.py | 12 ++++++------
api/gmshc.h | 10 +++++-----
doc/texinfo/api.texi | 6 +++---
8 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/api/api.texi b/api/api.texi
index c7c7715192..96c242dbad 100644
--- a/api/api.texi
+++ b/api/api.texi
@@ -1231,11 +1231,11 @@ Precomputes the basis functions corresponding to @code{elementType}.
@item getIntegrationPoints
Get the numerical quadrature information for the given element type
-@code{elementType@code{ and integration rule @code{integrationType} (e.g.
-"Gauss4" for a Gauss quadrature suited for integrating 4th order polynomials).
+@code{elementType} and integration rule @code{integrationType} (e.g. "Gauss4"
+for a Gauss quadrature suited for integrating 4th order polynomials).
@code{integrationPoints} contains the u, v, w coordinates of the G integration
points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw].
-@code{integrationWeigths@code{ contains the associated weights: [g1q, ..., gGq].
+@code{integrationWeigths} contains the associated weights: [g1q, ..., gGq].
@table @asis
@item Input:
diff --git a/api/gen.py b/api/gen.py
index d57195debc..605d50d3ba 100644
--- a/api/gen.py
+++ b/api/gen.py
@@ -297,7 +297,7 @@ mesh.add('getInformationForElements',doc,None,ivectorpair('keys'),ovectorpair('i
doc = '''Precomputes the basis functions corresponding to `elementType'. '''
mesh.add('precomputeBasisFunctions',doc,None,iint('elementType'))
-doc = '''Get the numerical quadrature information for the given element type `elementType` and integration rule `integrationType' (e.g. "Gauss4" for a Gauss quadrature suited for integrating 4th order polynomials). `integrationPoints' contains the u, v, w coordinates of the G integration points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw]. `integrationWeigths` contains the associated weights: [g1q, ..., gGq].'''
+doc = '''Get the numerical quadrature information for the given element type `elementType' and integration rule `integrationType' (e.g. "Gauss4" for a Gauss quadrature suited for integrating 4th order polynomials). `integrationPoints' contains the u, v, w coordinates of the G integration points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw]. `integrationWeigths' contains the associated weights: [g1q, ..., gGq].'''
mesh.add('getIntegrationPoints',doc,None,iint('elementType'),istring('integrationType'),ovectordouble('integrationPoints'),ovectordouble('integrationWeights'))
doc = '''Get the barycenters of all elements of type `elementType' classified on the entity of tag `tag'. If `primary' is set, only the primary nodes of the elements are taken into account for the barycenter calculation. If `fast' is set, the function returns the sum of the primary node coordinates (without normalizing by the number of nodes). If `tag' < 0, get the barycenters for all entities. If `numTasks' > 1, only compute and return the part of the data indexed by `task'.'''
diff --git a/api/gmsh.h b/api/gmsh.h
index 8edbbff2b1..1ff9bd260b 100644
--- a/api/gmsh.h
+++ b/api/gmsh.h
@@ -6,7 +6,7 @@
#ifndef GMSH_H
#define GMSH_H
-// This file defines the Gmsh C++ API (v4.3).
+// This file defines the Gmsh C++ API (v4.4).
//
// Do not edit it directly: it is automatically generated by `api/gen.py'.
//
@@ -22,9 +22,9 @@
#include <string>
#include <utility>
-#define GMSH_API_VERSION "4.3"
+#define GMSH_API_VERSION "4.4"
#define GMSH_API_VERSION_MAJOR 4
-#define GMSH_API_VERSION_MINOR 3
+#define GMSH_API_VERSION_MINOR 4
#if defined(GMSH_DLL)
#if defined(GMSH_DLL_EXPORT)
@@ -696,11 +696,11 @@ namespace gmsh { // Top-level functions
GMSH_API void precomputeBasisFunctions(const int elementType);
// Get the numerical quadrature information for the given element type
- // `elementType` and integration rule `integrationType' (e.g. "Gauss4" for a
+ // `elementType' and integration rule `integrationType' (e.g. "Gauss4" for a
// Gauss quadrature suited for integrating 4th order polynomials).
// `integrationPoints' contains the u, v, w coordinates of the G integration
// points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw].
- // `integrationWeigths` contains the associated weights: [g1q, ..., gGq].
+ // `integrationWeigths' contains the associated weights: [g1q, ..., gGq].
GMSH_API void getIntegrationPoints(const int elementType,
const std::string & integrationType,
std::vector<double> & integrationPoints,
diff --git a/api/gmsh.h_cwrap b/api/gmsh.h_cwrap
index 16bdf3d60b..40d11289f3 100644
--- a/api/gmsh.h_cwrap
+++ b/api/gmsh.h_cwrap
@@ -6,7 +6,7 @@
#ifndef GMSH_H
#define GMSH_H
-// This file redefines the Gmsh C++ API in terms of the C API (v4.3).
+// This file redefines the Gmsh C++ API in terms of the C API (v4.4).
//
// This is provided as a convenience for users of the binary Gmsh SDK whose C++
// compiler ABI is not compatible with the ABI of the C++ compiler used to create
@@ -1299,11 +1299,11 @@ namespace gmsh { // Top-level functions
}
// Get the numerical quadrature information for the given element type
- // `elementType` and integration rule `integrationType' (e.g. "Gauss4" for a
+ // `elementType' and integration rule `integrationType' (e.g. "Gauss4" for a
// Gauss quadrature suited for integrating 4th order polynomials).
// `integrationPoints' contains the u, v, w coordinates of the G integration
// points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw].
- // `integrationWeigths` contains the associated weights: [g1q, ..., gGq].
+ // `integrationWeigths' contains the associated weights: [g1q, ..., gGq].
inline void getIntegrationPoints(const int elementType,
const std::string & integrationType,
std::vector<double> & integrationPoints,
diff --git a/api/gmsh.jl b/api/gmsh.jl
index 7e214a72b8..c627be77a1 100644
--- a/api/gmsh.jl
+++ b/api/gmsh.jl
@@ -3,7 +3,7 @@
# See the LICENSE.txt file for license information. Please report all
# issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
-# This file defines the Gmsh Julia API (v4.3).
+# This file defines the Gmsh Julia API (v4.4).
#
# Do not edit it directly: it is automatically generated by `api/gen.py'.
#
@@ -17,11 +17,11 @@ Top-level functions
"""
module gmsh
-const GMSH_API_VERSION = "4.3"
+const GMSH_API_VERSION = "4.4"
const GMSH_API_VERSION_MAJOR = 4
-const GMSH_API_VERSION_MINOR = 3
+const GMSH_API_VERSION_MINOR = 4
const libdir = dirname(@__FILE__)
-const libname = Sys.iswindows() ? "gmsh-4.3" : "libgmsh"
+const libname = Sys.iswindows() ? "gmsh-4.4" : "libgmsh"
import Libdl
const lib = Libdl.find_library([libname], [libdir])
diff --git a/api/gmsh.py b/api/gmsh.py
index dacf66a8b1..4c479eaafe 100644
--- a/api/gmsh.py
+++ b/api/gmsh.py
@@ -3,7 +3,7 @@
# See the LICENSE.txt file for license information. Please report all
# issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
-# This file defines the Gmsh Python API (v4.3).
+# This file defines the Gmsh Python API (v4.4).
#
# Do not edit it directly: it is automatically generated by `api/gen.py'.
#
@@ -18,16 +18,16 @@ import os
import platform
from math import pi
-GMSH_API_VERSION = "4.3"
+GMSH_API_VERSION = "4.4"
GMSH_API_VERSION_MAJOR = 4
-GMSH_API_VERSION_MINOR = 3
+GMSH_API_VERSION_MINOR = 4
__version__ = GMSH_API_VERSION
signal.signal(signal.SIGINT, signal.SIG_DFL)
libdir = os.path.dirname(os.path.realpath(__file__))
if platform.system() == "Windows":
- libpath = os.path.join(libdir, "gmsh-4.3.dll")
+ libpath = os.path.join(libdir, "gmsh-4.4.dll")
elif platform.system() == "Darwin":
libpath = os.path.join(libdir, "libgmsh.dylib")
else:
@@ -2019,11 +2019,11 @@ class model:
def getIntegrationPoints(elementType, integrationType):
"""
Get the numerical quadrature information for the given element type
- `elementType` and integration rule `integrationType' (e.g. "Gauss4" for a
+ `elementType' and integration rule `integrationType' (e.g. "Gauss4" for a
Gauss quadrature suited for integrating 4th order polynomials).
`integrationPoints' contains the u, v, w coordinates of the G integration
points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw].
- `integrationWeigths` contains the associated weights: [g1q, ..., gGq].
+ `integrationWeigths' contains the associated weights: [g1q, ..., gGq].
Return `integrationPoints', `integrationWeights'.
"""
diff --git a/api/gmshc.h b/api/gmshc.h
index a976b2eac8..827188eb36 100644
--- a/api/gmshc.h
+++ b/api/gmshc.h
@@ -9,7 +9,7 @@
#define GMSHC_H
/*
- * This file defines the Gmsh C API (v4.3).
+ * This file defines the Gmsh C API (v4.4).
*
* Do not edit it directly: it is automatically generated by `api/gen.py'.
*
@@ -19,9 +19,9 @@
#include <stddef.h>
-#define GMSH_API_VERSION "4.3"
+#define GMSH_API_VERSION "4.4"
#define GMSH_API_VERSION_MAJOR 4
-#define GMSH_API_VERSION_MINOR 3
+#define GMSH_API_VERSION_MINOR 4
#if defined(GMSH_DLL)
#if defined(GMSH_DLL_EXPORT)
@@ -746,11 +746,11 @@ GMSH_API void gmshModelMeshPrecomputeBasisFunctions(const int elementType,
int * ierr);
/* Get the numerical quadrature information for the given element type
- * `elementType` and integration rule `integrationType' (e.g. "Gauss4" for a
+ * `elementType' and integration rule `integrationType' (e.g. "Gauss4" for a
* Gauss quadrature suited for integrating 4th order polynomials).
* `integrationPoints' contains the u, v, w coordinates of the G integration
* points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw].
- * `integrationWeigths` contains the associated weights: [g1q, ..., gGq]. */
+ * `integrationWeigths' contains the associated weights: [g1q, ..., gGq]. */
GMSH_API void gmshModelMeshGetIntegrationPoints(const int elementType,
const char * integrationType,
double ** integrationPoints, size_t * integrationPoints_n,
diff --git a/doc/texinfo/api.texi b/doc/texinfo/api.texi
index c7c7715192..96c242dbad 100644
--- a/doc/texinfo/api.texi
+++ b/doc/texinfo/api.texi
@@ -1231,11 +1231,11 @@ Precomputes the basis functions corresponding to @code{elementType}.
@item getIntegrationPoints
Get the numerical quadrature information for the given element type
-@code{elementType@code{ and integration rule @code{integrationType} (e.g.
-"Gauss4" for a Gauss quadrature suited for integrating 4th order polynomials).
+@code{elementType} and integration rule @code{integrationType} (e.g. "Gauss4"
+for a Gauss quadrature suited for integrating 4th order polynomials).
@code{integrationPoints} contains the u, v, w coordinates of the G integration
points in the reference element: [g1u, g1v, g1w, ..., gGu, gGv, gGw].
-@code{integrationWeigths@code{ contains the associated weights: [g1q, ..., gGq].
+@code{integrationWeigths} contains the associated weights: [g1q, ..., gGq].
@table @asis
@item Input:
--
GitLab