[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Konstantinos Poulios |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Wed, 20 Jun 2018 11:51:27 -0400 (EDT) |
branch: master
commit a3785e5b557fe7db326e5d6d642ec155df31efdc
Author: Konstantinos Poulios <address@hidden>
Date: Wed Jun 20 17:51:13 2018 +0200
Fix typos
---
doc/sphinx/source/project/images/getfem_structure.svg | 2 +-
doc/sphinx/source/project/libdesc_high_gen_assemb.rst | 2 +-
doc/sphinx/source/userdoc/interMM.rst | 6 +++---
doc/sphinx/source/userdoc/model_Nitsche.rst | 2 +-
doc/sphinx/source/userdoc/model_generic_assembly.rst | 2 +-
doc/sphinx/source/userdoc/model_plasticity_small_strain.rst | 2 +-
doc/sphinx/source/whatsnew/4.3.rst | 3 +--
src/getfem/bgeot_ftool.h | 4 ++--
src/getfem/getfem_generic_assembly.h | 2 +-
src/getfem/getfem_models.h | 2 +-
src/getfem_contact_and_friction_common.cc | 4 +++-
src/getfem_generic_assembly_tree.cc | 2 +-
tests/test_assembly.cc | 10 +++++-----
13 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/doc/sphinx/source/project/images/getfem_structure.svg
b/doc/sphinx/source/project/images/getfem_structure.svg
index 388d282..2191259 100644
--- a/doc/sphinx/source/project/images/getfem_structure.svg
+++ b/doc/sphinx/source/project/images/getfem_structure.svg
@@ -3637,7 +3637,7 @@
sodipodi:role="line"
id="tspan4923-2-1"
x="-113.04992"
- y="-251.24875">Interface with script langages :</tspan><tspan
+ y="-251.24875">Interface with script languages :</tspan><tspan
id="tspan6758"
sodipodi:role="line"
x="-113.04992"
diff --git a/doc/sphinx/source/project/libdesc_high_gen_assemb.rst
b/doc/sphinx/source/project/libdesc_high_gen_assemb.rst
index ad6a6d9..bcbf041 100644
--- a/doc/sphinx/source/project/libdesc_high_gen_assemb.rst
+++ b/doc/sphinx/source/project/libdesc_high_gen_assemb.rst
@@ -139,7 +139,7 @@ Optimized instructions for variable evaluation, operations,
vector and matrix as
Predefined functions
^^^^^^^^^^^^^^^^^^^^
-Some predefined scalar functions are available in |gf| weak form langage in
order to describe a weak formulation (or also to make basic algebraic
computations). This is limited to scalar functions of one or two arguments. Due
to the automatic differentiation used to obtain the tangent system of described
problems, the derivative each function have to be available. The principle
retained is the following: For each predefined function is available:
+Some predefined scalar functions are available in |gf| weak form language in
order to describe a weak formulation (or also to make basic algebraic
computations). This is limited to scalar functions of one or two arguments. Due
to the automatic differentiation used to obtain the tangent system of described
problems, the derivative each function have to be available. The principle
retained is the following: For each predefined function is available:
- A C++ function which computes the value given the argument(s).
- The support of the function in the first each argument in term of a
(possibly infinite) interval (this is for simplification of expressions).
diff --git a/doc/sphinx/source/userdoc/interMM.rst
b/doc/sphinx/source/userdoc/interMM.rst
index aa21f76..0140d20 100644
--- a/doc/sphinx/source/userdoc/interMM.rst
+++ b/doc/sphinx/source/userdoc/interMM.rst
@@ -51,10 +51,10 @@ the interpolation is done with a simple matrix
multiplication::
gmm::mult(M, U, V);
-Interpolation based on the high-level weak form langage
-*******************************************************
+Interpolation based on the high-level weak form language
+********************************************************
-It is possible to extract some arbitraries expressions on possibly several
fields thanks to the weak form langage and the interpolation functions.
+It is possible to extract some arbitrary expressions on possibly several
fields thanks to the weak form language and the interpolation functions.
This is specially dedicated to the model object (but it can also be used with
a ga_workspace object). For instance if ``md`` is a valid object containing
some defined variables ``u`` (vectorial) and ``p`` (scalar), one can
interpolate on a Lagrange finite element method an expression such as
``p*Trace(Grad_u)``. The resulting expression can be scalar, vectorial or
tensorial. The size of the resulting vector is automatically adapted.
diff --git a/doc/sphinx/source/userdoc/model_Nitsche.rst
b/doc/sphinx/source/userdoc/model_Nitsche.rst
index 3054f52..01cd514 100644
--- a/doc/sphinx/source/userdoc/model_Nitsche.rst
+++ b/doc/sphinx/source/userdoc/model_Nitsche.rst
@@ -80,7 +80,7 @@ The bricks adding a Dirichlet condition with Nitsche's method
to a model are the
This function adds a Dirichlet condition on the variable `varname` and the mesh
region `region`. This region should be a boundary. `Neumannterm`
is the expression of the Neumann term (obtained by the Green formula)
-described as an expression of the xeak form language. This term can be
obtained with
+described as an expression of the weak form language. This term can be
obtained with
md.Neumann_term(varname, region) once all volumic bricks have
been added to the model. The Dirichlet
condition is prescribed with Nitsche's method. `dataname` is the optional
diff --git a/doc/sphinx/source/userdoc/model_generic_assembly.rst
b/doc/sphinx/source/userdoc/model_generic_assembly.rst
index 17e22c4..64af4fe 100644
--- a/doc/sphinx/source/userdoc/model_generic_assembly.rst
+++ b/doc/sphinx/source/userdoc/model_generic_assembly.rst
@@ -13,7 +13,7 @@ Generic assembly bricks
-----------------------
-A mean to add a term either on one variable or on several ones is to directly
use the weak form langage described in Section :ref:`ud-gasm-high`. The more
general way is to use::
+A mean to add a term either on one variable or on several ones is to directly
use the weak form language described in Section :ref:`ud-gasm-high`. The more
general way is to use::
size_type getfem::add_nonlinear_term(md, mim, expr,
region = -1, is_sym = false, is_coercive = false);
diff --git a/doc/sphinx/source/userdoc/model_plasticity_small_strain.rst
b/doc/sphinx/source/userdoc/model_plasticity_small_strain.rst
index beffece..72a6608 100644
--- a/doc/sphinx/source/userdoc/model_plasticity_small_strain.rst
+++ b/doc/sphinx/source/userdoc/model_plasticity_small_strain.rst
@@ -66,7 +66,7 @@ In the case of linearized elasticity, one has
:math:`\psi^e(\varepsilon^e) = \fr
Plastic potential, yield function and plastic flow rule
=======================================================
-Plastic yielding is supposed to occur when the stress attains a critical
value. This is determinated by a yield function :math:`f(\sigma, A)` and the
condition
+Plastic yielding is supposed to occur when the stress attains a critical
value. This limit is determined by a yield function :math:`f(\sigma, A)` and
the condition
.. math:: f(\sigma, A) \le 0.
diff --git a/doc/sphinx/source/whatsnew/4.3.rst
b/doc/sphinx/source/whatsnew/4.3.rst
index f0dabf0..e891428 100644
--- a/doc/sphinx/source/whatsnew/4.3.rst
+++ b/doc/sphinx/source/whatsnew/4.3.rst
@@ -15,8 +15,7 @@ The main changes are:
which allows to describe non-linear coupled problems in a very easy way.
* The introduction of interpolate transformations in the weak form language
- to deal with the assembly of terms on different meshes
- or part of meshes.
+ to deal with the assembly of terms on different meshes or part of meshes.
Example of applications : mortar methods, periodic boundary conditions,
large sliding contact conditions
diff --git a/src/getfem/bgeot_ftool.h b/src/getfem/bgeot_ftool.h
index 8dac8a7..0a1e9dc 100644
--- a/src/getfem/bgeot_ftool.h
+++ b/src/getfem/bgeot_ftool.h
@@ -51,7 +51,7 @@ namespace bgeot
bool read_until(std::istream &ist, const char *st);
/** Very simple lexical analysis of general interest for reading small
- * langages with a "MATLAB like" syntax :
+ * languages with a "MATLAB like" syntax :
* spaces are ignored, '%' indicates a commentary until the end of the line,
* '...' indicates that the instruction continue on the next line
* (or separate two sub part of the same character string).
@@ -98,7 +98,7 @@ namespace bgeot
/* Read a parameter file. */
/* ********************************************************************* */
- // The associated langage has approximatively the following grammar:
+ // The associated language has approximatively the following grammar:
//
// 'instruction' := 'parameter_name' '=' 'expression';
// or 'if' 'expression'
diff --git a/src/getfem/getfem_generic_assembly.h
b/src/getfem/getfem_generic_assembly.h
index ae00f13..0e604b9 100644
--- a/src/getfem/getfem_generic_assembly.h
+++ b/src/getfem/getfem_generic_assembly.h
@@ -32,7 +32,7 @@
/** @file getfem_generic_assembly.h
@author Yves Renard <address@hidden>
@date November 18, 2013.
- @brief A langage for generic assembly of pde boundary value problems.
+ @brief A language for generic assembly of pde boundary value problems.
*/
diff --git a/src/getfem/getfem_models.h b/src/getfem/getfem_models.h
index a0aeb22..2027a00 100644
--- a/src/getfem/getfem_models.h
+++ b/src/getfem/getfem_models.h
@@ -838,7 +838,7 @@ namespace getfem {
/** Dictonnary of user defined macros. */
const ga_macro_dictionnary ¯o_dictionnary() const { return macro_dict;
}
- /** Add a macro definition for the high generic assembly langage.
+ /** Add a macro definition for the high generic assembly language.
This macro can be used for the definition of generic assembly bricks.
The name of a macro cannot coincide with a variable name. */
void add_macro(const std::string &name, const std::string &expr);
diff --git a/src/getfem_contact_and_friction_common.cc
b/src/getfem_contact_and_friction_common.cc
index ed7fc19..ebb468e 100644
--- a/src/getfem_contact_and_friction_common.cc
+++ b/src/getfem_contact_and_friction_common.cc
@@ -2009,7 +2009,9 @@ namespace getfem {
raytracing_interpolate_transformation(scalar_type d)
: release_distance(d) {}
};
-//=========================================================================
+
+
+ //=========================================================================
//
// Projection interpolate transformation for generic assembly
//
diff --git a/src/getfem_generic_assembly_tree.cc
b/src/getfem_generic_assembly_tree.cc
index 42c7551..c0b7f99 100644
--- a/src/getfem_generic_assembly_tree.cc
+++ b/src/getfem_generic_assembly_tree.cc
@@ -1423,7 +1423,7 @@ namespace getfem {
//=========================================================================
- // Syntax analysis for the generic assembly langage
+ // Syntax analysis for the generic assembly language
//=========================================================================
// Read a term with an (implicit) pushdown automaton.
diff --git a/tests/test_assembly.cc b/tests/test_assembly.cc
index 3d8cd62..fb12589 100644
--- a/tests/test_assembly.cc
+++ b/tests/test_assembly.cc
@@ -274,7 +274,7 @@ namespace getfem { // old assembly procedures with low
level generic assembly
}
/**
- Stiffness matrix for linear elasticity, with Lam� coefficients
+ Stiffness matrix for linear elasticity, with Lamé coefficients
@ingroup asm
*/
template<class MAT, class VECT>
@@ -312,7 +312,7 @@ namespace getfem { // old assembly procedures with low
level generic assembly
/**
- Stiffness matrix for linear elasticity, with constant Lam� coefficients
+ Stiffness matrix for linear elasticity, with constant Lamé coefficients
@ingroup asm
*/
template<class MAT, class VECT>
@@ -671,11 +671,11 @@ static void test_new_assembly(int N, int NX, int pK) {
if (all) {
if (N == 2) {
- getfem::ga_define_function("dummyfunc", 1,
+ getfem::ga_define_function("dummyfunc", 1,
"sin(pi*t/2)+2*sqr(t)-[t;t].[t;t]");
- SCAL_TEST_0("Test on user defined functions",
+ SCAL_TEST_0("Test on user defined functions",
"dummyfunc(5)", mim, 1);
- getfem::ga_define_function("dummyfunc2", 1, "cos(pi*t)");
+ getfem::ga_define_function("dummyfunc2", 1, "cos(pi*t)");
SCAL_TEST_0("Test on user defined functions",
"dummyfunc2(X(1))", mim, 0);
}