Commit 259a20d0 authored by DIAZ Jerome's avatar DIAZ Jerome Committed by GILLES Sebastien

#1498 Clean up old Seldon dependencies.

parent c971b217
...@@ -122,7 +122,7 @@ namespace MoReFEM ...@@ -122,7 +122,7 @@ namespace MoReFEM
if (!(NumericNS::IsZero(norm))) if (!(NumericNS::IsZero(norm)))
{ {
Mlt(1. / norm, tauxtau); tauxtau /= norm;
double new_sigma_c = 0.; double new_sigma_c = 0.;
...@@ -157,7 +157,7 @@ namespace MoReFEM ...@@ -157,7 +157,7 @@ namespace MoReFEM
else else
new_sigma_c = GetNonCstSigmaC().GetValue(quad_pt, geom_elt); new_sigma_c = GetNonCstSigmaC().GetValue(quad_pt, geom_elt);
Add(new_sigma_c, tauxtau, dW); xt::noalias(dW) += new_sigma_c * tauxtau;
} }
} }
} }
......
...@@ -205,17 +205,10 @@ namespace MoReFEM ...@@ -205,17 +205,10 @@ namespace MoReFEM
tauxtau /= norm; tauxtau /= norm;
// calculation of the squ are elongation, of the fiber elongation, of the integration weights, of weigthed stiffness // calculation of the squ are elongation, of the fiber elongation, of the integration weights, of weigthed stiffness
double elongation_squared = 0.; double elongation_squared = xt::linalg::vdot(cauchy_green_tensor_value, tauxtau);
{ for (auto i = DimensionT; i < size ; ++i)
const auto cauchy_green_size = cauchy_green_tensor_value.shape(0); elongation_squared += cauchy_green_tensor_value(i) * tauxtau(i);
for (auto i = 0ul; i < cauchy_green_size ; ++i)
elongation_squared += cauchy_green_tensor_value(i) * tauxtau(i);
for (auto i = DimensionT; i < size ; ++i)
elongation_squared += cauchy_green_tensor_value(i) * tauxtau(i);
}
const double elongation = std::sqrt(elongation_squared); const double elongation = std::sqrt(elongation_squared);
const double weight_I4 = std::exp(inplane_dispersion_I4 * std::cos(2.0 * value_quad_pt_p) const double weight_I4 = std::exp(inplane_dispersion_I4 * std::cos(2.0 * value_quad_pt_p)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment