[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
arsha shiri |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Fri, 25 Jan 2019 02:36:24 -0500 (EST) |
branch: devel-arsha-remove-projection-in-invert-lin
commit b3583f9f4ff35f5862dbcc2968283d4c236cfd2a
Author: arsha.shiri <address@hidden>
Date: Fri Jan 25 08:36:11 2019 +0100
remove the projection for invert_lin
---
src/bgeot_geotrans_inv.cc | 7 ++-----
src/getfem/bgeot_geotrans_inv.h | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/bgeot_geotrans_inv.cc b/src/bgeot_geotrans_inv.cc
index 3567e3a..35e9969 100644
--- a/src/bgeot_geotrans_inv.cc
+++ b/src/bgeot_geotrans_inv.cc
@@ -82,7 +82,7 @@ namespace bgeot
n_ref.resize(pgt->structure()->dim());
converged = true;
if (pgt->is_linear())
- return invert_lin(n, n_ref, IN_EPS, project_into_element);
+ return invert_lin(n, n_ref, IN_EPS);
else
return invert_nonlin(n, n_ref, IN_EPS, converged, false,
project_into_element);
@@ -90,15 +90,12 @@ namespace bgeot
/* inversion for linear geometric transformations */
bool geotrans_inv_convex::invert_lin(const base_node& n, base_node& n_ref,
- scalar_type IN_EPS,
- bool project_into_element) {
+ scalar_type IN_EPS) {
base_node y(n); for (size_type i=0; i < N; ++i) y[i] -= G(i,0);
mult(transposed(B), y, n_ref);
y = pgt->transform(n_ref, G);
add(gmm::scaled(n, -1.0), y);
- if (project_into_element) project_into_convex(n_ref, pgt);
-
return point_in_convex(*pgt, n_ref, gmm::vect_norm2(y), IN_EPS);
}
diff --git a/src/getfem/bgeot_geotrans_inv.h b/src/getfem/bgeot_geotrans_inv.h
index 9a9df3c..2e8508a 100644
--- a/src/getfem/bgeot_geotrans_inv.h
+++ b/src/getfem/bgeot_geotrans_inv.h
@@ -134,8 +134,7 @@ namespace bgeot {
bool invert(const base_node& n, base_node& n_ref, bool &converged,
scalar_type IN_EPS=1e-12, bool project_into_element=false);
private:
- bool invert_lin(const base_node& n, base_node& n_ref, scalar_type IN_EPS,
- bool project_into_element);
+ bool invert_lin(const base_node& n, base_node& n_ref, scalar_type IN_EPS);
bool invert_nonlin(const base_node& n, base_node& n_ref,
scalar_type IN_EPS, bool &converged, bool throw_except,
bool project_into_element);