[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit 47120640fd208e2d4e26ac21fac77a973eece7b8
Author: Yves Renard <address@hidden>
Date:   Thu Apr 12 16:24:42 2018 +0200

    Minor modifications
---
 interface/tests/matlab/check_plasticity.m | 2 +-
 src/getfem/getfem_assembling.h            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/tests/matlab/check_plasticity.m 
b/interface/tests/matlab/check_plasticity.m
index f51360e..91c9671 100644
--- a/interface/tests/matlab/check_plasticity.m
+++ b/interface/tests/matlab/check_plasticity.m
@@ -16,7 +16,7 @@
 % Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-function check_asm(iverbose,idebug)
+function check_plasticity(iverbose,idebug)
   global gverbose;
   global gdebug;  
   if (nargin >= 1),
diff --git a/src/getfem/getfem_assembling.h b/src/getfem/getfem_assembling.h
index cfb0f4a..0232009 100644
--- a/src/getfem/getfem_assembling.h
+++ b/src/getfem/getfem_assembling.h
@@ -701,7 +701,7 @@ namespace getfem {
     gmm::sub_interval Iu1(0, mf1.nb_dof());
     base_vector u1(mf1.nb_dof());
     workspace.add_fem_variable("u1", mf1, Iu1, u1);
-    workspace.add_expression("Test_u1.Test2_u1", mim, rg);
+    workspace.add_expression("Test_u1:Test2_u1", mim, rg);
     workspace.assembly(2);
     if (gmm::mat_nrows(workspace.assembled_matrix()))
        gmm::add(workspace.assembled_matrix(), const_cast<MAT &>(M));
@@ -715,7 +715,7 @@ namespace getfem {
     gmm::sub_interval Iu1(0, mf1.nb_dof());
     base_vector u1(mf1.nb_dof());
     workspace.add_fem_variable("u1", mf1, Iu1, u1);
-    workspace.add_expression("Test_u1.Test2_u1", mim, rg);
+    workspace.add_expression("Test_u1:Test2_u1", mim, rg);
     workspace.set_assembled_matrix(M);
     workspace.assembly(2);
   }
@@ -734,7 +734,7 @@ namespace getfem {
     base_vector u1(mf1.nb_dof()), u2(mf2.nb_dof());
     workspace.add_fem_variable("u1", mf1, Iu1, u1);
     workspace.add_fem_variable("u2", mf2, Iu2, u2);
-    workspace.add_expression("Test_u1.Test2_u2", mim, rg);
+    workspace.add_expression("Test_u1:Test2_u2", mim, rg);
     workspace.assembly(2);
     if (gmm::mat_nrows(workspace.assembled_matrix()))
        gmm::add(gmm::sub_matrix(workspace.assembled_matrix(), Iu1, Iu2),
@@ -750,7 +750,7 @@ namespace getfem {
     base_vector u1(mf1.nb_dof()), u2(mf2.nb_dof());
     workspace.add_fem_variable("u1", mf1, Iu1, u1);
     workspace.add_fem_variable("u2", mf2, Iu2, u2);
-    workspace.add_expression("Test_u1.Test2_u2", mim, rg);
+    workspace.add_expression("Test_u1:Test2_u2", mim, rg);
     workspace.set_assembled_matrix(M);
     workspace.assembly(2);
   }