[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Yves Renard |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Fri, 2 Mar 2018 07:51:58 -0500 (EST) |
branch: master
commit 0224f9b87cff88590a280536fb4e3cb1a5e43bc7
Author: Yves Renard <address@hidden>
Date: Fri Mar 2 13:51:13 2018 +0100
minor fixes
---
src/getfem/getfem_interpolation.h | 11 ++++++-----
src/getfem_contact_and_friction_integral.cc | 6 +++---
src/getfem_generic_assembly.cc | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/getfem/getfem_interpolation.h
b/src/getfem/getfem_interpolation.h
index b23d132..0b98094 100644
--- a/src/getfem/getfem_interpolation.h
+++ b/src/getfem/getfem_interpolation.h
@@ -593,20 +593,21 @@ namespace getfem {
}
else mti.add_point(mf_target.point_of_basic_dof(i * qdim_t));
}
- interpolation(mf_source, mti, U, V, M, version, extrapolation);
}
else {
- for (dal::bv_visitor_c dof(mf_target.basic_dof_on_region(rg_target));
!dof.finished(); ++dof)
+ for (dal::bv_visitor_c dof(mf_target.basic_dof_on_region(rg_target));
+ !dof.finished(); ++dof)
if (dof % qdim_t == 0){
if (is_target_torus){
auto p = mf_target.point_of_basic_dof(dof);
p.resize(msh.dim());
mti.add_point_with_id(p, dof/qdim_t);
}
- else mti.add_point_with_id(mf_target.point_of_basic_dof(dof),
dof/qdim_t);
- }
- interpolation(mf_source, mti, U, V, M, version, extrapolation, 0,
rg_source);
+ else
+ mti.add_point_with_id(mf_target.point_of_basic_dof(dof),dof/qdim_t);
+ }
}
+ interpolation(mf_source, mti, U, V, M, version, extrapolation,
0,rg_source);
if (version == 0)
mf_target.reduce_vector(V, VV);
diff --git a/src/getfem_contact_and_friction_integral.cc
b/src/getfem_contact_and_friction_integral.cc
index d96486d..04b4341 100644
--- a/src/getfem_contact_and_friction_integral.cc
+++ b/src/getfem_contact_and_friction_integral.cc
@@ -2557,8 +2557,8 @@ namespace getfem {
// model::varnamelist vl, vl_test1, vl_test2, dl;
// bool is_lin = workspace.used_variables(vl, vl_test1, vl_test2, dl, 1);
- std::string gamma = "((1/("+dataname_gamma0+"))*element_size)";
- std::string thetagamma = "("+theta+"*"+gamma+")";
+ std::string gamma = "(("+dataname_gamma0+")/element_size)";
+ std::string thetagamma = "("+theta+"/"+gamma+")";
std::string contact_normal = "(-Normalized(Grad_"+obs+"))";
std::string gap = "("+obs+"-"+varname_u+"."+contact_normal+")";
std::string Vs = "("+varname_u +
@@ -2569,7 +2569,7 @@ namespace getfem {
std::string expr = "Coulomb_friction_coupled_projection("+Neumannterm
+", "+contact_normal+", "+Vs+", "+gap+", "+dataname_friction_coeff
- +",1/"+gamma+").(";
+ +","+gamma+").(";
if (theta_ != scalar_type(0)) {
std::string derivative_Neumann=workspace.extract_order1_term(varname_u);
diff --git a/src/getfem_generic_assembly.cc b/src/getfem_generic_assembly.cc
index 081e3e4..a1a25f0 100644
--- a/src/getfem_generic_assembly.cc
+++ b/src/getfem_generic_assembly.cc
@@ -11619,7 +11619,7 @@ namespace getfem {
GMM_ASSERT1(&(mf->linked_mesh()) == &(m),
"The finite element of variable " << pnode->name <<
" has to be defined on the same mesh than the "
- "integration method used");
+ "integration method or interpolation used");
// An instruction for extracting local dofs of the variable.
if (rmi.local_dofs.count(pnode->name) == 0) {