[Getfem-commits] r5389 - in /trunk/getfem: src/getfem_fem.cc src/getfem_fem_composite.cc tests/laplacian.pl

[Yves . Renard]

Author: renard
Date: Thu Oct  6 20:22:04 2016
New Revision: 5389

URL: http://svn.gna.org/viewcvs/getfem?rev=5389&view=rev
Log:
minor fix

Modified:
    trunk/getfem/src/getfem_fem.cc
    trunk/getfem/src/getfem_fem_composite.cc
    trunk/getfem/tests/laplacian.pl

Modified: trunk/getfem/src/getfem_fem.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_fem.cc?rev=5389&r1=5388&r2=5389&view=diff
==============================================================================
--- trunk/getfem/src/getfem_fem.cc      (original)
+++ trunk/getfem/src/getfem_fem.cc      Thu Oct  6 20:22:04 2016
@@ -174,7 +174,7 @@
          break;
        default: t.mat_transp_reduction(pfp__->grad(ii()), B(), 2);
        }
-       if (!(pf()->is_equivalent())) {
+       if (!(pf__->is_equivalent())) {
          set_pfp(pfp__);
          base_tensor u = t; t.mat_transp_reduction(u, M(), 0);
        }

Modified: trunk/getfem/src/getfem_fem_composite.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_fem_composite.cc?rev=5389&r1=5388&r2=5389&view=diff
==============================================================================
--- trunk/getfem/src/getfem_fem_composite.cc    (original)
+++ trunk/getfem/src/getfem_fem_composite.cc    Thu Oct  6 20:22:04 2016
@@ -37,7 +37,7 @@
     auto p = std::make_shared<fem<bgeot::polynomial_composite>>();
     p->mref_convex() = cr;
     p->dim() = cr->structure()->dim();
-    p->is_polynomialcomp() = p->is_equivalent() = true;
+    p->is_polynomialcomp() = p->is_equivalent() = p->is_standard() = true;
     p->is_polynomial() = false;
     p->is_lagrange() = true;
     p->estimated_degree() = 0;
@@ -181,6 +181,7 @@
     is_equivalent() = true;
     is_polynomial() = false;
     is_lagrange() = false;
+    is_standard() = true;
     estimated_degree() = 3;
     init_cvs_node();
 
@@ -346,6 +347,7 @@
     is_equivalent() = false;
     is_polynomial() = false;
     is_lagrange() = false;
+    is_standard() = false;
     estimated_degree() = 5;
     init_cvs_node();
 
@@ -421,6 +423,7 @@
     is_equivalent() = false;
     is_polynomial() = false;
     is_lagrange() = false;
+    is_standard() = false;
     estimated_degree() = 5;
     base() = HCT->base();
 
@@ -610,6 +613,7 @@
     is_equivalent() = false;
     is_polynomial() = false;
     is_lagrange() = false;
+    is_standard() = false;
     estimated_degree() = 5;
     init_cvs_node();
 
@@ -690,6 +694,7 @@
     is_equivalent() = false;
     is_polynomial() = false;
     is_lagrange() = false;
+    is_standard() = false;
     estimated_degree() = 5;
     base() = HCT->base();
 

Modified: trunk/getfem/tests/laplacian.pl
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/tests/laplacian.pl?rev=5389&r1=5388&r2=5389&view=diff
==============================================================================
--- trunk/getfem/tests/laplacian.pl     (original)
+++ trunk/getfem/tests/laplacian.pl     Thu Oct  6 20:22:04 2016
@@ -96,6 +96,7 @@
 #start_program("-d INTEGRATION=33 -d MESH_TYPE=1");
 print ".";
 start_program("-d 'MESH_TYPE=\"GT_QK(2,1)\"' -d 'FEM_TYPE=\"FEM_QK(2,1)\"' -d 
'INTEGRATION=\"IM_QUAD(17)\"'");
+start_program("-d 'MESH_TYPE=\"GT_PK(2,1)\"' -d 'FEM_TYPE=\"FEM_ARGYRIS\"' -d 
'INTEGRATION=\"IM_TRIANGLE(5)\"' -d 'DATA_FEM_TYPE=\"FEM_PK(2,5)\"'");
 #start_program("-d INTEGRATION=35 -d MESH_TYPE=1");
 print ".";
 start_program("-d 'MESH_TYPE=\"GT_PRISM(3,1)\"' -d 
'FEM_TYPE=\"FEM_PK_PRISM(3,1)\"' -d 'INTEGRATION=\"IM_NC_PRISM(3,2)\"' -d NX=3 
-d FT=0.01 -d GENERIC_DIRICHLET=0");