[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r4896 - in /trunk/getfem: contrib/crack_plate/ interfac
|
From: |
logari81 |
|
Subject: |
[Getfem-commits] r4896 - in /trunk/getfem: contrib/crack_plate/ interface/src/ interface/src/scilab/help/en_US/ interface/src/scilab/help/lat... |
|
Date: |
Mon, 23 Mar 2015 14:41:18 -0000 |
Author: logari81
Date: Mon Mar 23 15:41:18 2015
New Revision: 4896
URL: http://svn.gna.org/viewcvs/getfem?rev=4896&view=rev
Log:
fix typo (breaks API)
Modified:
trunk/getfem/contrib/crack_plate/mortar_bilaplacian.h
trunk/getfem/interface/src/gf_mesh_set.cc
trunk/getfem/interface/src/scilab/help/en_US/gf_mesh_set.xml
trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.lyx
trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.tex
trunk/getfem/interface/src/scilab/tests/unit_tests/check_mesh_fem.sce
trunk/getfem/interface/tests/matlab/check_mesh_fem.m
trunk/getfem/interface/tests/python/demo_stokes_3D_tank.py
trunk/getfem/interface/tests/python/demo_stokes_3D_tank_draw.py
trunk/getfem/src/getfem/bgeot_mesh_structure.h
trunk/getfem/src/getfem/bgeot_poly.h
trunk/getfem/src/getfem/getfem_mesh_region.h
trunk/getfem/src/getfem_generic_assembly.cc
trunk/getfem/src/getfem_mesh_region.cc
trunk/getfem/tests/test_assembly.cc
trunk/getfem/tests/test_mesh_generation.cc
Modified: trunk/getfem/contrib/crack_plate/mortar_bilaplacian.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/crack_plate/mortar_bilaplacian.h?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/contrib/crack_plate/mortar_bilaplacian.h (original)
+++ trunk/getfem/contrib/crack_plate/mortar_bilaplacian.h Mon Mar 23
15:41:18 2015
@@ -420,7 +420,7 @@
/* The aim of this function is to provide the errors without
assembling the norms, as it is some expensive computations.
The error is computed after interpolation on a lagrangian
- mesh, so the error can be calculated by a single substraction.
+ mesh, so the error can be calculated by a single subtraction.
This method is only useful for plotting the 2D graph of the error,
when we don't need the L2 or H1 norm evaluation of the error. */
void bilaplacian_mortar_problem::compute_error_without_assembling(plain_vector
&U, plain_vector &V) {
Modified: trunk/getfem/interface/src/gf_mesh_set.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_set.cc?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_set.cc (original)
+++ trunk/getfem/interface/src/gf_mesh_set.cc Mon Mar 23 15:41:18 2015
@@ -74,12 +74,12 @@
r1 = getfem::mesh_region::merge(r1, r2);
}
-static void substract_regions(getfem::mesh &mesh, getfemint::mexargs_in& in) {
+static void subtract_regions(getfem::mesh &mesh, getfemint::mexargs_in& in) {
unsigned ir1 = in.pop().to_integer(1,100000);
unsigned ir2 = in.pop().to_integer(1,100000);
getfem::mesh_region &r1 = mesh.region(ir1);
getfem::mesh_region &r2 = mesh.region(ir2);
- r1 = getfem::mesh_region::substract(r1, r2);
+ r1 = getfem::mesh_region::subtract(r1, r2);
}
@@ -325,12 +325,12 @@
);
- /address@hidden ('region substract', @int r1, @int r2)
+ /address@hidden ('region subtract', @int r1, @int r2)
Replace the region number `r1` with its difference with region
number address@hidden/
sub_command
- ("region substract", 2, 2, 0, 0,
- substract_regions(*pmesh,in);
+ ("region subtract", 2, 2, 0, 0,
+ subtract_regions(*pmesh,in);
);
Modified: trunk/getfem/interface/src/scilab/help/en_US/gf_mesh_set.xml
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/scilab/help/en_US/gf_mesh_set.xml?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/src/scilab/help/en_US/gf_mesh_set.xml
(original)
+++ trunk/getfem/interface/src/scilab/help/en_US/gf_mesh_set.xml Mon Mar
23 15:41:18 2015
@@ -28,7 +28,7 @@
<synopsis>gf_mesh_set(mesh M, 'region', int rnum, mat CVFIDs)</synopsis>
<synopsis>gf_mesh_set(mesh M, 'region intersect', int r1, int
r2)</synopsis>
<synopsis>gf_mesh_set(mesh M, 'region merge', int r1, int r2)</synopsis>
- <synopsis>gf_mesh_set(mesh M, 'region substract', int r1, int
r2)</synopsis>
+ <synopsis>gf_mesh_set(mesh M, 'region subtract', int r1, int r2)</synopsis>
<synopsis>gf_mesh_set(mesh M, 'delete boundary', int rnum, mat
CVFIDs)</synopsis>
<synopsis>gf_mesh_set(mesh M, 'delete region', ivec RIDs)</synopsis>
<synopsis>gf_mesh_set(mesh M, 'merge', mesh m2)</synopsis>
@@ -170,7 +170,7 @@
</listitem>
<listitem>
- <para><literal>gf_mesh_set(mesh M, 'region substract', int r1, int
r2)</literal></para>
+ <para><literal>gf_mesh_set(mesh M, 'region subtract', int r1, int
r2)</literal></para>
<para> Replace the region number <literal>r1</literal> with its
difference with region
number <literal>r2</literal>.
Modified: trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.lyx
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.lyx?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.lyx
(original)
+++ trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.lyx Mon Mar
23 15:41:18 2015
@@ -15281,7 +15281,7 @@
\end_inset
- R2) gf_mesh_set(M, 'region substract',
+ R2) gf_mesh_set(M, 'region subtract',
\begin_inset ERT
status collapsed
@@ -15762,7 +15762,7 @@
\end_inset
address@hidden, 'region substract', R1, R2)@@
+@@gf_mesh_set(M, 'region subtract', R1, R2)@@
\begin_inset ERT
status collapsed
Modified: trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.tex
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.tex?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.tex
(original)
+++ trunk/getfem/interface/src/scilab/help/latex/getfemmatlab.tex Mon Mar
23 15:41:18 2015
@@ -1516,7 +1516,7 @@
gf\_mesh\_set(M, 'region', \tint bnum, \timat CVFLST)
gf\_mesh\_set(M, 'region intersect', \tint R1, \tint R2)
gf\_mesh\_set(M, 'region merge', \tint R1, \tint R2)
-gf\_mesh\_set(M, 'region substract', \tint R1, \tint R2)
+gf\_mesh\_set(M, 'region subtract', \tint R1, \tint R2)
gf\_mesh\_set(M, 'delete region', \tivec blst)
gf\_mesh\_set(M, 'translate', \tvec\ V)
gf\_mesh\_set(M, 'transform', \tmat\ T)
@@ -1570,7 +1570,7 @@
\sep{@@gf\_mesh\_set(M, 'region merge', R1, R2)@@} :
merge region number @@R2@@ into region number @@R1@@.
- \sep{@@gf\_mesh\_set(M, 'region substract', R1, R2)@@} :
+ \sep{@@gf\_mesh\_set(M, 'region subtract', R1, R2)@@} :
replace the region number @@R1@@ with its difference with region number
@@R2@@.
Modified: trunk/getfem/interface/src/scilab/tests/unit_tests/check_mesh_fem.sce
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/scilab/tests/unit_tests/check_mesh_fem.sce?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/src/scilab/tests/unit_tests/check_mesh_fem.sce
(original)
+++ trunk/getfem/interface/src/scilab/tests/unit_tests/check_mesh_fem.sce
Mon Mar 23 15:41:18 2015
@@ -244,7 +244,7 @@
// The setdiff function is not yet in scilab
if 1 then
gf_mesh_set(m,'region', 11, R2);
- gf_mesh_set(m,'region substract', 11, 10);
+ gf_mesh_set(m,'region subtract', 11, 10);
rr = gf_mesh_get(m,'region',11);
RR = _setdiff(R2',R1','rows')';
gfassert('rr==RR');
Modified: trunk/getfem/interface/tests/matlab/check_mesh_fem.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/check_mesh_fem.m?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/check_mesh_fem.m (original)
+++ trunk/getfem/interface/tests/matlab/check_mesh_fem.m Mon Mar 23
15:41:18 2015
@@ -287,7 +287,7 @@
gfassert('rr==RR');
gf_mesh_set(m,'region', 11, R2);
- gf_mesh_set(m,'region substract', 11, 10);
+ gf_mesh_set(m,'region subtract', 11, 10);
rr=gf_mesh_get(m,'region',11);
RR=setdiff(R2',R1','rows')';
gfassert('rr==RR');
Modified: trunk/getfem/interface/tests/python/demo_stokes_3D_tank.py
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/python/demo_stokes_3D_tank.py?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/tests/python/demo_stokes_3D_tank.py (original)
+++ trunk/getfem/interface/tests/python/demo_stokes_3D_tank.py Mon Mar 23
15:41:18 2015
@@ -58,9 +58,9 @@
m.set_region(2, OUTfaces)
m.set_region(3, TOPfaces)
m.set_region(4, m.outer_faces())
-m.region_substract(4, 1)
-m.region_substract(4, 2)
-m.region_substract(4, 3)
+m.region_subtract(4, 1)
+m.region_subtract(4, 2)
+m.region_subtract(4, 3)
Modified: trunk/getfem/interface/tests/python/demo_stokes_3D_tank_draw.py
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/python/demo_stokes_3D_tank_draw.py?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/interface/tests/python/demo_stokes_3D_tank_draw.py
(original)
+++ trunk/getfem/interface/tests/python/demo_stokes_3D_tank_draw.py Mon Mar
23 15:41:18 2015
@@ -51,7 +51,7 @@
#print fig.scalar_range()
m.set_region(42, m.outer_faces());
-m.region_substract(42, 3);
+m.region_subtract(42, 3);
sl2=getfem.Slice(('boundary',('planar',+1,[0,0,0],[0,1,0])),m,3, m.region(42))
fig.show(sl2, faces=False, edges_color=(1,1,1))
Modified: trunk/getfem/src/getfem/bgeot_mesh_structure.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_mesh_structure.h?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_mesh_structure.h (original)
+++ trunk/getfem/src/getfem/bgeot_mesh_structure.h Mon Mar 23 15:41:18 2015
@@ -287,7 +287,7 @@
/* */
/* ********************************************************************* */
- /* maybe this should be remove from the matlab interface and obsoleted */
+ /* maybe this should be removed from the matlab interface and obsoleted */
struct APIDECL edge_list_elt {
size_type i, j;
size_type cv;
Modified: trunk/getfem/src/getfem/bgeot_poly.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_poly.h?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_poly.h (original)
+++ trunk/getfem/src/getfem/bgeot_poly.h Mon Mar 23 15:41:18 2015
@@ -206,12 +206,12 @@
void add_monomial(const T &coeff, const power_index &power);
/// Add Q to P. P contains the result.
polynomial &operator +=(const polynomial &Q);
- /// Substract Q to P. P contains the result.
+ /// Subtract Q from P. P contains the result.
polynomial &operator -=(const polynomial &Q);
/// Add Q to P.
polynomial operator +(const polynomial &Q) const
{ polynomial R = *this; R += Q; return R; }
- /// Substract Q to P.
+ /// Subtract Q from P.
polynomial operator -(const polynomial &Q) const
{ polynomial R = *this; R -= Q; return R; }
polynomial operator -(void) const;
Modified: trunk/getfem/src/getfem/getfem_mesh_region.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_mesh_region.h?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_region.h (original)
+++ trunk/getfem/src/getfem/getfem_mesh_region.h Mon Mar 23 15:41:18 2015
@@ -161,8 +161,8 @@
/** return the union of two mesh_regions */
static mesh_region merge(const mesh_region &a,
const mesh_region &b);
- /** remove the second region from the first one */
- static mesh_region substract(const mesh_region &a,
+ /** subtract the second region from the first one */
+ static mesh_region subtract(const mesh_region &a,
const mesh_region &b);
size_type id() const { return id_; }
Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Mon Mar 23 15:41:18 2015
@@ -3323,7 +3323,7 @@
struct ga_instruction_sub : public ga_instruction {
base_tensor &t, &tc1, &tc2;
virtual int exec(void) {
- GA_DEBUG_INFO("Instruction: substraction");
+ GA_DEBUG_INFO("Instruction: subtraction");
GA_DEBUG_ASSERT(t.size() == tc1.size() && t.size() == tc2.size(),
"internal error");
gmm::add(tc1.as_vector(), gmm::scaled(tc2.as_vector(), scalar_type(-1)),
@@ -3761,7 +3761,7 @@
size_type s2 = tc2.sizes()[0];
base_tensor::iterator it = t.begin();
for (size_type i = 0; i < s11; ++i)
- for (size_type n = 0; n < s2; ++n)
+ for (size_type n = 0; n < s2; ++n)
for (size_type m = 0; m < s1; ++m, ++it) {
*it = scalar_type(0);
for (size_type j = 0; j < nn; ++j)
@@ -3771,7 +3771,7 @@
return 0;
}
ga_instruction_spec_reduction(base_tensor &t_, base_tensor &tc1_,
- base_tensor &tc2_, size_type n_)
+ base_tensor &tc2_, size_type n_)
: t(t_), tc1(tc1_), tc2(tc2_), nn(n_) {}
};
@@ -3797,7 +3797,7 @@
return 0;
}
ga_instruction_spec2_reduction(base_tensor &t_, base_tensor &tc1_,
- base_tensor &tc2_, size_type n_)
+ base_tensor &tc2_, size_type n_)
: t(t_), tc1(tc1_), tc2(tc2_), nn(n_) {}
};
@@ -5442,7 +5442,7 @@
if (size1[i] != 1) compatible = false;
if (!compatible)
- ga_throw_error(expr, pnode->pos, "Addition or substraction of "
+ ga_throw_error(expr, pnode->pos, "Addition or subtraction of "
"expressions of different sizes: "
<< size0 << " != " << size1);
@@ -5459,7 +5459,7 @@
}
if (!compatible)
- ga_throw_error(expr, pnode->pos, "Addition or substraction of "
+ ga_throw_error(expr, pnode->pos, "Addition or subtraction of "
"incompatible test functions");
if (all_cte) {
pnode->node_type = GA_NODE_CONSTANT;
@@ -8048,7 +8048,7 @@
{
const mesh_fem *mf = workspace.associated_mf(pnode->name);
if (mf) {
-
+
// An instruction for pfp update
if (rmi.pfps.find(mf) == rmi.pfps.end() ||
!(if_hierarchy.is_compatible(rmi.pfps_hierarchy[mf]))) {
@@ -8230,7 +8230,7 @@
}
} else {
if (child1->test_function_type == 1 ||
- child1->test_function_type == 3) {
+ child1->test_function_type == 3) {
if (child1->test_function_type == 3 ||
child1->tensor_proper_size() <= s2) {
if (s2 == 2) // Unroll loop test ... to be extended
Modified: trunk/getfem/src/getfem_mesh_region.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_region.cc?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_region.cc (original)
+++ trunk/getfem/src/getfem_mesh_region.cc Mon Mar 23 15:41:18 2015
@@ -424,8 +424,8 @@
}
- mesh_region mesh_region::substract(const mesh_region &a,
- const mesh_region &b)
+ mesh_region mesh_region::subtract(const mesh_region &a,
+ const mesh_region &b)
{
GMM_TRACE2("subtraction of "<<a.id()<<" and "<<b.id());
mesh_region r;
Modified: trunk/getfem/tests/test_assembly.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/tests/test_assembly.cc?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/tests/test_assembly.cc (original)
+++ trunk/getfem/tests/test_assembly.cc Mon Mar 23 15:41:18 2015
@@ -918,7 +918,7 @@
= getfem::select_faces_of_normal(m, border_faces, Dir, 0.1);
m.region(NEUMANN_BOUNDARY_NUM) = Neumann_faces;
m.region(DIRICHLET_BOUNDARY_NUM)
- = getfem::mesh_region::substract(border_faces, Neumann_faces);
+ = getfem::mesh_region::subtract(border_faces, Neumann_faces);
getfem::mesh_fem mf_u(m);
Modified: trunk/getfem/tests/test_mesh_generation.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/tests/test_mesh_generation.cc?rev=4896&r1=4895&r2=4896&view=diff
==============================================================================
--- trunk/getfem/tests/test_mesh_generation.cc (original)
+++ trunk/getfem/tests/test_mesh_generation.cc Mon Mar 23 15:41:18 2015
@@ -178,7 +178,7 @@
case 11: dist = &D11; break; /* half-balls */
case 12: dist = &D12; break; /* UFO */
case 13: dist = &D13; break; /* moon */
- case 14: dist = &D14; break; /* substraction of two balls */
+ case 14: dist = &D14; break; /* subtraction of two balls */
case 15: dist = &D15; break; /* torus */
case 16: dist = &D16; break; /* cube with a hole */
case 17: dist = &D17; break; /* space station */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r4896 - in /trunk/getfem: contrib/crack_plate/ interface/src/ interface/src/scilab/help/en_US/ interface/src/scilab/help/lat...,
logari81 <=