[Getfem-commits] [getfem-commits] branch master updated: Use short names of functions for adding linear and nonlinear terms

[Konstantinos Poulios]

This is an automated email from the git hooks/post-receive script.

logari81 pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 2c046b66 Use short names of functions for adding linear and nonlinear 
terms
2c046b66 is described below

commit 2c046b668bbeff4eddd8a259d8fe712be0b05fa8
Author: Konstantinos Poulios <logari81@gmail.com>
AuthorDate: Mon Oct 16 13:37:51 2023 +0200

    Use short names of functions for adding linear and nonlinear terms
---
 contrib/continuum_mechanics/QLV_viscoelasticity.py |  4 +--
 ...ticity_fin_strain_lin_hardening_axisymmetric.py |  4 +--
 ...ticity_fin_strain_lin_hardening_plane_strain.py |  4 +--
 ...ty_finite_strain_linear_hardening_tension_3D.py |  4 +--
 .../static_contact_planetary.py                    | 10 +++---
 doc/sphinx/source/tutorial/basic_usage.rst         |  4 +--
 interface/tests/matlab-octave/demo_wheel_contact.m |  6 ++--
 interface/tests/python/check_mixed_mesh.py         |  2 +-
 src/getfem_contact_and_friction_integral.cc        |  4 +--
 src/getfem_linearized_plates.cc                    | 36 +++++++++++-----------
 src/getfem_models.cc                               |  2 +-
 src/getfem_nonlinear_elasticity.cc                 |  4 +--
 src/getfem_plasticity.cc                           |  6 ++--
 tests/test_condensation.cc                         | 20 ++++++------
 tests/test_internal_variables.cc                   | 12 ++++----
 15 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/contrib/continuum_mechanics/QLV_viscoelasticity.py 
b/contrib/continuum_mechanics/QLV_viscoelasticity.py
index 6c22f0de..b6cd9480 100644
--- a/contrib/continuum_mechanics/QLV_viscoelasticity.py
+++ b/contrib/continuum_mechanics/QLV_viscoelasticity.py
@@ -155,7 +155,7 @@ md.add_macro("SvD", "exp(-dt/tauD)*SvDprev"
 #                    "-(1-rD)*(1-tauD/dt*(1-exp(-dt/tauD)))*(SeD-SeDprev)")
 
 # Virtual work expression
-md.add_nonlinear_generic_assembly_brick(mim, 
"(F*(SeH+SvH+SeD+SvD)):Grad_Test_u")
+md.add_nonlinear_term(mim, "(F*(SeH+SvH+SeD+SvD)):Grad_Test_u")
 
 # Cauchy and von Mises definitions
 md.add_macro("Cauchy", "(F*(SeH+SvH+SeD+SvD)*F')/Det(F)")
@@ -163,7 +163,7 @@ md.add_macro("VM", 
"sqrt(1.5)*Norm(Deviator(F*(SeH+SvH+SeD+SvD)*F'))/Det(F)")
 
 # Dirichlet condition
 md.add_filtered_fem_variable("dirmult", mfmult, RG_TOP)
-md.add_linear_generic_assembly_brick(mim, "(epsYY*X(2)-u(2))*dirmult", RG_TOP)
+md.add_linear_term(mim, "(epsYY*X(2)-u(2))*dirmult", RG_TOP)
 
 Vol = gf.asm_generic(mim, 0, "1", -1, md)
 with open("QLV_viscoelasticity_results.dat", "w") as f:
diff --git 
a/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_axisymmetric.py
 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_axisymmetric.py
index f24d1db5..2e08eb19 100644
--- 
a/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_axisymmetric.py
+++ 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_axisymmetric.py
@@ -177,7 +177,7 @@ md.add_macro("devlogbe", "(1-2*ksi)*devlogbetr")
 md.add_macro("tauD2d", "mu*[1,0,0;0,1,0]*devlogbe*[1,0;0,1;0,0]")
 md.add_macro("tauD33", "mu*devlogbe(3,3)")
 
-md.add_nonlinear_generic_assembly_brick\
+md.add_nonlinear_term\
    (mim, 
"2*pi*X(2)*(((tauH*Id(2)+tauD2d)*Inv(F')):Grad_Test_u+(tauH+tauD33)/(X(2)+u(2))*Test_u(2))")
 
 md.add_macro("sigmaD", "(mu*pow(J,-5/3)*devlogbe)")
@@ -187,7 +187,7 @@ md.add_macro("invCp", 
"(Inv(F3d)*Expm(-ksi*devlogbetr)*(F3d))*invCp0"\
 
 # Dirichlet condition
 md.add_filtered_fem_variable("dirmult", mfmult, XP_RG)
-md.add_nonlinear_generic_assembly_brick(mim, "2*pi*X(2)*(disp-u(1))*dirmult", 
XP_RG)
+md.add_nonlinear_term(mim, "2*pi*X(2)*(disp-u(1))*dirmult", XP_RG)
 
 print(f"Model dofs: {md.nbdof()}\nDisplacement fem dofs: {mfu.nbdof()}")
 print("Dirichlet mult dofs: %i" % md.mesh_fem_of_variable("dirmult").nbdof())
diff --git 
a/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
index 20bc6c79..30ab2bc4 100644
--- 
a/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
+++ 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
@@ -175,7 +175,7 @@ md.add_macro("gamma", "gamma0+ksi*Norm(devlogbetr)")
 md.add_macro("devlogbe", "(1-2*ksi)*devlogbetr")
 md.add_macro("tauD2d", "mu*[1,0,0;0,1,0]*devlogbe*[1,0;0,1;0,0]")
 
-md.add_nonlinear_generic_assembly_brick\
+md.add_nonlinear_term\
    (mim, "((tauH*Id(2)+tauD2d)*Inv(F')):Grad_Test_u")
 
 md.add_macro("sigmaD", "(mu/J*devlogbe)")
@@ -185,7 +185,7 @@ md.add_macro("invCp", 
"(Inv(F3d)*Expm(-ksi*devlogbetr)*(F3d))*invCp0"\
 
 # Dirichlet condition
 md.add_filtered_fem_variable("dirmult", mfmult, XP_RG)
-md.add_nonlinear_generic_assembly_brick(mim, "(disp-u(1))*dirmult", XP_RG)
+md.add_nonlinear_term(mim, "(disp-u(1))*dirmult", XP_RG)
 
 print(f"Model dofs: {md.nbdof()}\nDisplacement fem dofs: {mfu.nbdof()}")
 print("Dirichlet mult dofs: %i" % md.mesh_fem_of_variable("dirmult").nbdof())
diff --git 
a/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_3D.py
 
b/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_3D.py
index 4c9ec016..f49cc8fc 100644
--- 
a/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_3D.py
+++ 
b/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_3D.py
@@ -187,7 +187,7 @@ md.add_macro("gamma", "gamma0+ksi*Norm(devlogbetr)")
 md.add_macro("devlogbe", "(1-2*ksi)*devlogbetr")
 md.add_macro("tauD", "mu*devlogbe")
 
-md.add_nonlinear_generic_assembly_brick\
+md.add_nonlinear_term\
    (mim, "((tauH*Id(3)+tauD)*Inv(F')):Grad_Test_u")
 
 md.add_macro("sigmaD", "tauD/J")
@@ -197,7 +197,7 @@ md.add_macro("invCp", 
"(Inv(F)*Expm(-ksi*devlogbetr)*(F))*invCp0"\
 
 # Dirichlet condition
 md.add_filtered_fem_variable("dirmult", mfmult, XP_RG)
-md.add_nonlinear_generic_assembly_brick(mim, "(disp-u(1))*dirmult", XP_RG)
+md.add_nonlinear_term(mim, "(disp-u(1))*dirmult", XP_RG)
 
 print(f"Model dofs: {md.nbdof()}\nDisplacement fem dofs: {mfu.nbdof()}")
 print("Dirichlet mult dofs: %i" % md.mesh_fem_of_variable("dirmult").nbdof())
diff --git a/contrib/static_contact_gears/static_contact_planetary.py 
b/contrib/static_contact_gears/static_contact_planetary.py
index 1dc4553e..127b847d 100644
--- a/contrib/static_contact_gears/static_contact_planetary.py
+++ b/contrib/static_contact_gears/static_contact_planetary.py
@@ -201,7 +201,7 @@ md.add_Dirichlet_condition_with_multipliers(mim_2, 'u_2', 
mfu_2, RG_DIRICHLET_2,
 area_1_in = gf.asm_generic(mim_1, 0, "1", RG_NEUMANN_1)
 m1 = torsion / area_1_in
 _expr_load_ = 
"{m}/Norm_sqr(X+u_1)*[-X(2)-u_1(2);X(1)+u_1(1)].Test_u_1".format(m=m1)
-md.add_nonlinear_generic_assembly_brick(mim_1, _expr_load_, RG_NEUMANN_1)
+md.add_nonlinear_term(mim_1, _expr_load_, RG_NEUMANN_1)
 
 
 # Add inertia, used temporarily for getting an initial solution
@@ -212,10 +212,10 @@ md.add_initialized_data('penalty_param', 1e0)
 #ibin_p2 = md.add_mass_brick(mim_p2, 'u_p2', 'penalty_param')
 #ibin_p3 = md.add_mass_brick(mim_p3, 'u_p3', 'penalty_param')
 
-ibin_1 = md.add_linear_generic_assembly_brick(mim_1, 
'penalty_param*u_1.Test_u_1')
-ibin_p1 = md.add_linear_generic_assembly_brick(mim_p1, 
'penalty_param*u_p1.Test_u_p1')
-ibin_p2 = md.add_linear_generic_assembly_brick(mim_p2, 
'penalty_param*u_p2.Test_u_p2')
-ibin_p3 = md.add_linear_generic_assembly_brick(mim_p3, 
'penalty_param*u_p3.Test_u_p3')
+ibin_1 = md.add_linear_term(mim_1, 'penalty_param*u_1.Test_u_1')
+ibin_p1 = md.add_linear_term(mim_p1, 'penalty_param*u_p1.Test_u_p1')
+ibin_p2 = md.add_linear_term(mim_p2, 'penalty_param*u_p2.Test_u_p2')
+ibin_p3 = md.add_linear_term(mim_p3, 'penalty_param*u_p3.Test_u_p3')
 
 md.add_filtered_fem_variable('mult_1', mfmult_1, RG_NEUMANN_1)
 #md.add_filtered_fem_variable('mult_2', mfmult_2, RG_CONTACT_2)
diff --git a/doc/sphinx/source/tutorial/basic_usage.rst 
b/doc/sphinx/source/tutorial/basic_usage.rst
index c3bf4300..04de7f6c 100644
--- a/doc/sphinx/source/tutorial/basic_usage.rst
+++ b/doc/sphinx/source/tutorial/basic_usage.rst
@@ -33,8 +33,8 @@ A program using getfem will often have the following 
structure ::
 
       Model.add_fem_data(MeshFem, "some data name")
 
-      Model.add_nonlinear_generic_assembly_brick(MeshIm,
-                              "copy & paste your PDE weak formulation here", 
MeshRegion)
+      Model.add_nonlinear_term(MeshIm,
+                               "copy & paste your PDE weak formulation here", 
MeshRegion)
        
       Model.solve(...options)
 
diff --git a/interface/tests/matlab-octave/demo_wheel_contact.m 
b/interface/tests/matlab-octave/demo_wheel_contact.m
index 2315d5c0..d98d7c01 100644
--- a/interface/tests/matlab-octave/demo_wheel_contact.m
+++ b/interface/tests/matlab-octave/demo_wheel_contact.m
@@ -119,8 +119,8 @@ md.add_Dirichlet_condition_with_multipliers(mim2, 'u2', 
elements_degree-1, BOTTO
 md.add_initialized_data('gamma0', [gamma0]);
 md.add_interpolate_transformation_from_expression('Proj1', mesh1, mesh2, 
'[X(1);0]');
 md.add_filtered_fem_variable('lambda1', mflambda_C, CONTACT_BOUND);
-md.add_nonlinear_generic_assembly_brick(mim1c, 
'lambda1*(Test_u1.[0;1])-lambda1*(Interpolate(Test_u2,Proj1).[0;1])', 
CONTACT_BOUND);
-md.add_nonlinear_generic_assembly_brick(mim1c, 
'-(gamma0*element_size)*(lambda1 + 
neg_part(lambda1+(1/(gamma0*element_size))*((u1-Interpolate(u2,Proj1)+X-Interpolate(X,Proj1)).[0;1])))*Test_lambda1',
 CONTACT_BOUND);
+md.add_nonlinear_term(mim1c, 
'lambda1*(Test_u1.[0;1])-lambda1*(Interpolate(Test_u2,Proj1).[0;1])', 
CONTACT_BOUND);
+md.add_nonlinear_term(mim1c, '-(gamma0*element_size)*(lambda1 + 
neg_part(lambda1+(1/(gamma0*element_size))*((u1-Interpolate(u2,Proj1)+X-Interpolate(X,Proj1)).[0;1])))*Test_lambda1',
 CONTACT_BOUND);
 
 % Prescribed force in the hole (or Dirichlet condition)
 if (Dirichlet_version)
@@ -130,7 +130,7 @@ else
   md.add_filtered_fem_variable('lambda_D', mflambda, HOLE_BOUND);
   md.add_initialized_data('F', [applied_force/(8.*2.*pi)]);
   md.add_variable('alpha_D', 1);
-  md.add_linear_generic_assembly_brick(mim1, '-lambda_D.Test_u1 + 
(alpha_D*[0;1] - u1).Test_lambda_D + (lambda_D.[0;1] + F)*Test_alpha_D + 
1E-6*alpha_D*Test_alpha_D', HOLE_BOUND);
+  md.add_linear_term(mim1, '-lambda_D.Test_u1 + (alpha_D*[0;1] - 
u1).Test_lambda_D + (lambda_D.[0;1] + F)*Test_alpha_D + 
1E-6*alpha_D*Test_alpha_D', HOLE_BOUND);
   % The small penalization 1E-6*alpha_D*Test_alpha_D seems necessary to
   % have a convergence in all cases. Why ?
 end
diff --git a/interface/tests/python/check_mixed_mesh.py 
b/interface/tests/python/check_mixed_mesh.py
index a786cf07..c2795a0f 100644
--- a/interface/tests/python/check_mixed_mesh.py
+++ b/interface/tests/python/check_mixed_mesh.py
@@ -121,7 +121,7 @@ md = gf.Model('real')
 md.add_fem_variable('u',mfu)
 md.add_initialized_data('mu_para', Mu)
 md.add_initialized_data('lambda_para', Lambda)
-md.add_linear_generic_assembly_brick(mim,"lambda_para*Div_u*Div_Test_u + 
2*mu_para*Sym(Grad_u):Grad_Test_u")
+md.add_linear_term(mim,"lambda_para*Div_u*Div_Test_u + 
2*mu_para*Sym(Grad_u):Grad_Test_u")
 md.add_initialized_data('Fdata',[0.0,-1.0, 0.0])
 md.add_source_term_brick(mim, 'u', 'Fdata', NEUMANN_BOUNDARY)
 md.add_initialized_data('DirichletData', [0, 0, 0])
diff --git a/src/getfem_contact_and_friction_integral.cc 
b/src/getfem_contact_and_friction_integral.cc
index db5bcd8b..1579b6bb 100644
--- a/src/getfem_contact_and_friction_integral.cc
+++ b/src/getfem_contact_and_friction_integral.cc
@@ -2578,7 +2578,7 @@ namespace getfem {
     }
     expr += "-Test_"+varname_u+")";
 
-    return add_nonlinear_generic_assembly_brick
+    return add_nonlinear_term
       (md, mim, expr, region, false, false,
        "Nitsche contact with rigid obstacle");
   }
@@ -2642,7 +2642,7 @@ namespace getfem {
     }
     expr += "-Test_"+varname_u+")";
 
-    return add_nonlinear_generic_assembly_brick
+    return add_nonlinear_term
       (md, mim, expr, region, false, false,
        "Nitsche contact with rigid obstacle");
   }
diff --git a/src/getfem_linearized_plates.cc b/src/getfem_linearized_plates.cc
index 4f04561a..62c6fe02 100644
--- a/src/getfem_linearized_plates.cc
+++ b/src/getfem_linearized_plates.cc
@@ -64,19 +64,19 @@ namespace getfem {
     
     switch(variant) {
     case 0: // Without reduction
-      return add_linear_generic_assembly_brick
+      return add_linear_term
         (md, mim, expr_left+"+"+expr_right, region, false, false,
          "Reissner-Mindlin plate model brick");
     case 1: // With reduced integration
-      add_linear_generic_assembly_brick
+      add_linear_term
         (md, mim, expr_left, region, false, false,
          "Reissner-Mindlin plate model brick, rotation term");
-      return add_linear_generic_assembly_brick
+      return add_linear_term
         (md, mim_red, expr_right, region, false, false,
          "Reissner-Mindlin plate model brick, transverse shear term");
     case 2: // Variant with projection on rotated RT0
       add_2D_rotated_RT0_projection(md, "_2D_rotated_RT0_projection__434");
-      return add_linear_generic_assembly_brick
+      return add_linear_term
         (md, mim, expr_left+"+"+expr_right, region, false, false,
          "Reissner-Mindlin plate model brick");
       break;
@@ -136,43 +136,43 @@ namespace getfem {
         
     switch(variant) {
     case 0: // Without reduction
-        add_nonlinear_generic_assembly_brick
+      add_nonlinear_term
         (md, mim, expr_no_coupled_1+"+"+expr_no_coupled_2, region, false, 
false,
          "enriched Reissner-Mindlin plate model brick, no coupled");
-        return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim, expr_coupled_1+"+"+expr_coupled_2, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled");
     case 1: // With reduced integration
-        add_nonlinear_generic_assembly_brick
+      add_nonlinear_term
         (md, mim, expr_no_coupled_1+"+"+expr_no_coupled_2, region, false, 
false,
          "enriched Reissner-Mindlin plate model brick, no coupled");
-        add_nonlinear_generic_assembly_brick
+      add_nonlinear_term
         (md, mim_red1, expr_coupled_1, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled MR");
-        return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim_red2, expr_coupled_2, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled eMR");
     case 2: // Variant with projection on rotated RT0 and reduction
-        add_2D_rotated_RT0_projection(md, "_2D_rotated_RT0_projection__434");
-        add_nonlinear_generic_assembly_brick
+      add_2D_rotated_RT0_projection(md, "_2D_rotated_RT0_projection__434");
+      add_nonlinear_term
         (md, mim, expr_no_coupled_1+"+"+expr_no_coupled_2, region, false, 
false,
          "enriched Reissner-Mindlin plate model brick, no coupled");
-        add_nonlinear_generic_assembly_brick
+      add_nonlinear_term
         (md, mim, expr_coupled_1, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled MR");
-        return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim_red2, expr_coupled_2, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled eMR");  
     case 3: // Variant with projection on rotated RT0 and projection P0
-        add_2D_rotated_RT0_projection(md, "_2D_rotated_RT0_projection__434");
-        add_P0_projection(md, "_P0_projection__434");
-        add_nonlinear_generic_assembly_brick
+      add_2D_rotated_RT0_projection(md, "_2D_rotated_RT0_projection__434");
+      add_P0_projection(md, "_P0_projection__434");
+      add_nonlinear_term
         (md, mim, expr_no_coupled_1+"+"+expr_no_coupled_2, region, false, 
false,
          "enriched Reissner-Mindlin plate model brick, no coupled");
-        add_nonlinear_generic_assembly_brick
+      add_nonlinear_term
         (md, mim, expr_coupled_1, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled MR");
-        return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim, expr_coupled_2, region, false, false,
          "enriched Reissner-Mindlin plate model brick, coupled eMR");  
       break;
diff --git a/src/getfem_models.cc b/src/getfem_models.cc
index c56b02e7..1a13a2fe 100644
--- a/src/getfem_models.cc
+++ b/src/getfem_models.cc
@@ -6131,7 +6131,7 @@ namespace getfem {
       if (dataname3.size()) dl.push_back(dataname3);
       return md.add_brick(pbr, vl, dl, tl, model::mimlist(1, &mim), region);
     } else {
-      return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim, dataname3.size() ? expr1 : expr2, region, false, false,
          "Linearized isotropic elasticity (with nonlinear dependance)");
     }
diff --git a/src/getfem_nonlinear_elasticity.cc 
b/src/getfem_nonlinear_elasticity.cc
index fbfd1a80..10cbc5dd 100644
--- a/src/getfem_nonlinear_elasticity.cc
+++ b/src/getfem_nonlinear_elasticity.cc
@@ -2317,7 +2317,7 @@ namespace getfem {
     std::string expr = "((Id(meshdim)+Grad_"+varname+")*(" + adapted_lawname
       + "_PK2(Grad_"+varname+","+params+"))):Grad_" + test_varname;
 
-    return add_nonlinear_generic_assembly_brick
+    return add_nonlinear_term
       (md, mim, expr, region, true, false,
        "Finite strain elasticity brick for " + adapted_lawname + " law");
   }
@@ -2333,7 +2333,7 @@ namespace getfem {
       + "-(" + multname + ")*(Det(Id(meshdim)+Grad_" + varname + ")"
       + "*((Inv(Id(meshdim)+Grad_" + varname + "))':Grad_"
       + test_varname + "))" ;
-    return add_nonlinear_generic_assembly_brick
+    return add_nonlinear_term
       (md, mim, expr, region, true, false,
        "Finite strain incompressibility brick");
   }
diff --git a/src/getfem_plasticity.cc b/src/getfem_plasticity.cc
index cb90dff4..79166277 100644
--- a/src/getfem_plasticity.cc
+++ b/src/getfem_plasticity.cc
@@ -1287,11 +1287,11 @@ namespace getfem {
     if (unknowns_type == DISPLACEMENT_AND_PLASTIC_MULTIPLIER) {
       std::string expr = ("("+sigma_np1+"):Grad_Test_"+dispname
                           + "+("+compcond+")*Test_"+xi);
-      return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim, expr, region, false, false,
          "Small strain isotropic perfect elastoplasticity brick");
     } else {
-      return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim, "("+sigma_np1+"):Grad_Test_"+dispname, region, true, false,
          "Small strain isotropic perfect elastoplasticity brick");
     }
@@ -1592,7 +1592,7 @@ namespace getfem {
       std::string expr, dummy1, dummy2, dummy3;
       build_Simo_Miehe_elastoplasticity_expressions
         (md, unknowns_type, varnames, params, expr, dummy1, dummy2, dummy3);
-      return add_nonlinear_generic_assembly_brick
+      return add_nonlinear_term
         (md, mim, expr, region, true, false, "Simo Miehe elastoplasticity 
brick");
     } else
       GMM_ASSERT1(false, lawname << " is not a known elastoplastic law");
diff --git a/tests/test_condensation.cc b/tests/test_condensation.cc
index e92e95ae..2b5ade1f 100644
--- a/tests/test_condensation.cc
+++ b/tests/test_condensation.cc
@@ -110,25 +110,25 @@ int main(int argc, char *argv[]) {
     exprC = "(p+K*Div_u)*Test_p";
   else
     exprC = "((p+1e3*pow(p,3))+K*Div_u)*Test_p";
-  getfem::add_nonlinear_generic_assembly_brick(md1, mim, exprA);
-  getfem::add_nonlinear_generic_assembly_brick(md2, mim, exprA);
+  getfem::add_nonlinear_term(md1, mim, exprA);
+  getfem::add_nonlinear_term(md2, mim, exprA);
   if (DIFFICULTY % 100 > 9) {
-    getfem::add_nonlinear_generic_assembly_brick(md1, mim, exprB);
-    getfem::add_nonlinear_generic_assembly_brick(md2, mim, exprB);
+    getfem::add_nonlinear_term(md1, mim, exprB);
+    getfem::add_nonlinear_term(md2, mim, exprB);
   }
-  getfem::add_nonlinear_generic_assembly_brick(md1, mim, exprC);
-  getfem::add_nonlinear_generic_assembly_brick(md2, mim, exprC);
+  getfem::add_nonlinear_term(md1, mim, exprC);
+  getfem::add_nonlinear_term(md2, mim, exprC);
 
   if (DIFFICULTY % 1000 > 99) {
     md1.add_filtered_fem_variable("dirmult", mf, 98);
     md2.add_filtered_fem_variable("dirmult", mf, 98);
-    getfem::add_linear_generic_assembly_brick(md1, mim, "u.dirmult", 98);
-    getfem::add_linear_generic_assembly_brick(md2, mim, "u.dirmult", 98);
+    getfem::add_linear_term(md1, mim, "u.dirmult", 98);
+    getfem::add_linear_term(md2, mim, "u.dirmult", 98);
   }
 
   // load
-  getfem::add_linear_generic_assembly_brick(md1, mim, "1e-3*Test_u(2)", 99);
-  getfem::add_linear_generic_assembly_brick(md2, mim, "1e-3*Test_u(2)", 99);
+  getfem::add_linear_term(md1, mim, "1e-3*Test_u(2)", 99);
+  getfem::add_linear_term(md2, mim, "1e-3*Test_u(2)", 99);
 
   std::cout << "Displacement dofs: " << mf.nb_dof() << std::endl;
   std::cout << "Total dofs of model 1: " << md1.nb_dof() << std::endl;
diff --git a/tests/test_internal_variables.cc b/tests/test_internal_variables.cc
index bd25bb16..6fe57be0 100644
--- a/tests/test_internal_variables.cc
+++ b/tests/test_internal_variables.cc
@@ -85,15 +85,15 @@ int main(int argc, char *argv[]) {
     exprA = "(-p*Id(2)+2*G*(Sym(Grad_u)-Div_u*Id(2)/3)):Grad_Test_u";
     exprB = "(p+K*Trace(Sym(Grad_u)))*Test_p";
   }
-  getfem::add_nonlinear_generic_assembly_brick(md1, mim, exprA);
-  getfem::add_nonlinear_generic_assembly_brick(md2, mim, exprA);
-  getfem::add_nonlinear_generic_assembly_brick(md1, mim, exprB);
-  getfem::add_nonlinear_generic_assembly_brick(md2, mim, exprB);
+  getfem::add_nonlinear_term(md1, mim, exprA);
+  getfem::add_nonlinear_term(md2, mim, exprA);
+  getfem::add_nonlinear_term(md1, mim, exprB);
+  getfem::add_nonlinear_term(md2, mim, exprB);
 
   md1.add_filtered_fem_variable("dirmult", mf, 102);
   md2.add_filtered_fem_variable("dirmult", mf, 102);
-  getfem::add_linear_generic_assembly_brick(md1, mim, 
"(u-0.001*X(1)*[1;0]).dirmult", 102);
-  getfem::add_linear_generic_assembly_brick(md2, mim, 
"(u-0.001*X(1)*[1;0]).dirmult", 102);
+  getfem::add_linear_term(md1, mim, "(u-0.001*X(1)*[1;0]).dirmult", 102);
+  getfem::add_linear_term(md2, mim, "(u-0.001*X(1)*[1;0]).dirmult", 102);
 
   gmm::iteration iter(1E-9, 1, 100);
   getfem::standard_solve(md1, iter);