diff --git a/src/fft/projection_finite_strain.cc b/src/fft/projection_finite_strain.cc
index 0594623..edef674 100644
--- a/src/fft/projection_finite_strain.cc
+++ b/src/fft/projection_finite_strain.cc
@@ -1,83 +1,85 @@
/**
* @file projection_finite_strain.cc
*
* @author Till Junge <till.junge@altermail.ch>
*
* @date 05 Dec 2017
*
* @brief implementation of standard finite strain projection operator
*
* Copyright © 2017 Till Junge
*
* µSpectre is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3, or (at
* your option) any later version.
*
* µSpectre is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Emacs; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "fft/projection_finite_strain.hh"
#include "fft/fftw_engine.hh"
#include "fft/fft_utils.hh"
#include "common/field_map.hh"
#include "common/tensor_algebra.hh"
#include "common/iterators.hh"
#include "Eigen/Dense"
namespace muSpectre {
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
ProjectionFiniteStrain<DimS, DimM>::
ProjectionFiniteStrain(FFTEngine_ptr engine)
:Parent{std::move(engine), Formulation::finite_strain}
{}
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
void ProjectionFiniteStrain<DimS, DimM>::
initialise(FFT_PlanFlags flags) {
Parent::initialise(flags);
FFT_freqs<DimS> fft_freqs(this->fft_engine->get_domain_resolutions(),
this->fft_engine->get_lengths());
for (auto && tup: akantu::zip(*this->fft_engine, this->Ghat)) {
const auto & ccoord = std::get<0> (tup);
auto & G = std::get<1>(tup);
auto xi = fft_freqs.get_unit_xi(ccoord);
//! this is simplifiable using Curnier's Méthodes numériques, 6.69(c)
G = Matrices::outer_under(Matrices::I2<DimM>(), xi*xi.transpose());
// The commented block below corresponds to the original
// definition of the operator in de Geus et
// al. (https://doi.org/10.1016/j.cma.2016.12.032). However,
// they use a bizarre definition of the double contraction
// between fourth-order and second-order tensors that has a
// built-in transpose operation (i.e., C = A:B <-> AᵢⱼₖₗBₗₖ =
// Cᵢⱼ , note the inverted ₗₖ instead of ₖₗ), here, we define
// the double contraction without the transposition. As a
// result, the Projection operator produces the transpose of de
// Geus's
// for (Dim_t im = 0; im < DimS; ++im) {
// for (Dim_t j = 0; j < DimS; ++j) {
// for (Dim_t l = 0; l < DimS; ++l) {
// get(G, im, j, l, im) = xi(j)*xi(l);
// }
// }
// }
}
- this->Ghat[0].setZero();
+ if (this->get_locations() == Ccoord{}) {
+ this->Ghat[0].setZero();
+ }
}
template class ProjectionFiniteStrain<twoD, twoD>;
template class ProjectionFiniteStrain<threeD, threeD>;
} // muSpectre
diff --git a/src/fft/projection_finite_strain_fast.cc b/src/fft/projection_finite_strain_fast.cc
index f89760b..f1ef432 100644
--- a/src/fft/projection_finite_strain_fast.cc
+++ b/src/fft/projection_finite_strain_fast.cc
@@ -1,83 +1,85 @@
/**
* @file projection_finite_strain_fast.cc
*
* @author Till Junge <till.junge@epfl.ch>
*
* @date 12 Dec 2017
*
* @brief implementation for fast projection in finite strain
*
* Copyright © 2017 Till Junge
*
* µSpectre is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3, or (at
* your option) any later version.
*
* µSpectre is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Emacs; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "fft/projection_finite_strain_fast.hh"
#include "fft/fft_utils.hh"
#include "common/tensor_algebra.hh"
#include "common/iterators.hh"
namespace muSpectre {
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
ProjectionFiniteStrainFast<DimS, DimM>::
ProjectionFiniteStrainFast(FFTEngine_ptr engine)
:Parent{std::move(engine), Formulation::finite_strain},
xiField{make_field<Proj_t>("Projection Operator",
this->projection_container)},
xis(xiField)
{}
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
void ProjectionFiniteStrainFast<DimS, DimM>::
initialise(FFT_PlanFlags flags) {
Parent::initialise(flags);
FFT_freqs<DimS> fft_freqs(this->fft_engine->get_domain_resolutions(),
this->fft_engine->get_lengths());
for (auto && tup: akantu::zip(*this->fft_engine, this->xis)) {
const auto & ccoord = std::get<0> (tup);
auto & xi = std::get<1>(tup);
xi = fft_freqs.get_unit_xi(ccoord);
}
- this->xis[0].setZero();
+ if (this->get_locations() == Ccoord{}) {
+ this->xis[0].setZero();
+ }
}
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
void ProjectionFiniteStrainFast<DimS, DimM>::apply_projection(Field_t & field) {
Grad_map field_map{this->fft_engine->fft(field)};
Real factor = this->fft_engine->normalisation();
for (auto && tup: akantu::zip(this->xis, field_map)) {
auto & xi{std::get<0>(tup)};
auto & f{std::get<1>(tup)};
f = factor * ((f*xi).eval()*xi.transpose());
}
this->fft_engine->ifft(field);
}
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
Eigen::Map<Eigen::ArrayXXd> ProjectionFiniteStrainFast<DimS, DimM>::
get_operator() {
return this->xiField.dyn_eigen();
}
template class ProjectionFiniteStrainFast<twoD, twoD>;
template class ProjectionFiniteStrainFast<threeD, threeD>;
} // muSpectre
diff --git a/src/fft/projection_small_strain.cc b/src/fft/projection_small_strain.cc
index c77f80f..91303fd 100644
--- a/src/fft/projection_small_strain.cc
+++ b/src/fft/projection_small_strain.cc
@@ -1,74 +1,76 @@
/**
* @file projection_small_strain.cc
*
* @author Till Junge <till.junge@altermail.ch>
*
* @date 14 Jan 2018
*
* @brief Implementation for ProjectionSmallStrain
*
* Copyright © 2018 Till Junge
*
* µSpectre is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3, or (at
* your option) any later version.
*
* µSpectre is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Emacs; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "fft/projection_small_strain.hh"
#include "fft/fft_utils.hh"
namespace muSpectre {
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
ProjectionSmallStrain<DimS, DimM>::
ProjectionSmallStrain(FFTEngine_ptr engine)
: Parent{std::move(engine), Formulation::small_strain}
{}
/* ---------------------------------------------------------------------- */
template <Dim_t DimS, Dim_t DimM>
void ProjectionSmallStrain<DimS, DimM>::initialise(FFT_PlanFlags flags) {
Parent::initialise(flags);
FFT_freqs<DimS> fft_freqs(this->fft_engine->get_domain_resolutions(),
this->fft_engine->get_lengths());
for (auto && tup: akantu::zip(*this->fft_engine, this->Ghat)) {
const auto & ccoord = std::get<0> (tup);
auto & G = std::get<1>(tup);
auto xi = fft_freqs.get_unit_xi(ccoord);
auto kron = [](const Dim_t i, const Dim_t j) -> Real{
return (i==j) ? 1. : 0.;
};
for (Dim_t i{0}; i < DimS; ++i) {
for (Dim_t j{0}; j < DimS; ++j) {
for (Dim_t l{0}; l < DimS; ++l) {
for (Dim_t m{0}; m < DimS; ++m ) {
Real & g = get(G, i, j, l, m);
g = 0.5* (xi(i) * kron(j, l) * xi(m) +
xi(i) * kron(j, m) * xi(l) +
xi(j) * kron(i, l) * xi(m) +
xi(j) * kron(i, m) * xi(l)) -
xi(i)*xi(j)*xi(l)*xi(m);
}
}
}
}
}
- this->Ghat[0].setZero();
+ if (this->get_locations() == Ccoord{}) {
+ this->Ghat[0].setZero();
+ }
}
template class ProjectionSmallStrain<twoD, twoD>;
template class ProjectionSmallStrain<threeD, threeD>;
} // muSpectre