diff --git a/dune/microstructure/CorrectorComputer.hh b/dune/microstructure/CorrectorComputer.hh index b64f5a5e8a35dcf175be017ccc0111a37486cff9..ba76d79997c22e56454422c4275ad14580b940fd 100644 --- a/dune/microstructure/CorrectorComputer.hh +++ b/dune/microstructure/CorrectorComputer.hh @@ -68,7 +68,7 @@ protected: constexpr static MatrixRT G1_ {{1.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, {0.0, 0, 0.0}}; constexpr static MatrixRT G2_ {{0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0, 0.0, 0.0}}; constexpr static MatrixRT G3_ {{0.0, 1.0/sqrtOf2, 0.0}, {1.0/sqrtOf2, 0.0, 0.0}, {0.0, 0.0, 0.0}}; - constexpr static std::array<MatrixRT,3 > MatrixBasisContainer_ = {G1_, G2_, G3_}; + constexpr static std::array<MatrixRT,3 > matrixBasis_ = {G1_, G2_, G3_}; Func2Tensor x3G_1_ = [] (const Domain& x) { return MatrixRT{{1.0*x[2], 0.0, 0.0}, {0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}}; //TODO könnte hier sign übergeben? @@ -154,7 +154,7 @@ public: // shared_ptr<std::array<VectorRT, 3>> getBasiscontainer(){return make_shared<std::array<VectorRT, 3>>(basisContainer_);} - auto getMatrixBasiscontainer(){return make_shared<std::array<MatrixRT,3 >>(MatrixBasisContainer_);} + auto getMatrixBasiscontainer(){return make_shared<std::array<MatrixRT,3 >>(matrixBasis_);} // auto getx3MatrixBasiscontainer(){return make_shared<std::array<Func2Tensor, 3>>(x3MatrixBasisContainer_);} auto getx3MatrixBasiscontainer(){return x3MatrixBasisContainer_;} @@ -405,7 +405,7 @@ public: - double energyDensityGphi = scalarProduct(material_.applyElasticityTensor(MatrixBasisContainer_[m],phase),deformationGradient[j][l]); + double energyDensityGphi = scalarProduct(material_.applyElasticityTensor(matrixBasis_[m],phase),deformationGradient[j][l]); // double energyDensityGphi = scalarProduct(material_.ElasticityTensor(basisContainer[m],localIndicatorFunction(quadPos)),sym(defGradientV)); // double energyDensityGphi= scalarProduct(elasticityTensor(basisContainer[m],localIndicatorFunction(quadPos)),sym(defGradientV)); // std::cout << "scalarProduct(elasticityTensor(basisContainer[m],indicatorFunction(element.geometry().global(quadPos))),sym(defGradientV))" << scalarProduct(elasticityTensor(basisContainer[m],indicatorFunction(element.geometry().global(quadPos))),sym(defGradientV)) <<std::endl; @@ -454,7 +454,7 @@ public: - double energyDensityGG = scalarProduct(material_.applyElasticityTensor(MatrixBasisContainer_[m],phase),MatrixBasisContainer_[n]); + double energyDensityGG = scalarProduct(material_.applyElasticityTensor(matrixBasis_[m],phase),matrixBasis_[n]); // double energyDensityGG = scalarProduct(material_.ElasticityTensor(basisContainer[m],localIndicatorFunction(quadPos)),sym(basisContainer[n])); // double energyDensityGG= scalarProduct(elasticityTensor(basisContainer[m],localIndicatorFunction(quadPos)),sym(basisContainer[n])); // double energyDensityGG= scalarProduct(elasticityTensor(basisContainer[m],indicatorFunction(element.geometry().global(quadPos))),sym(basisContainer[n])); @@ -1101,9 +1101,9 @@ public: for(size_t i=0; i<3; i++) { - M1_ += m_1_[i]*MatrixBasisContainer_[i]; - M2_ += m_2_[i]*MatrixBasisContainer_[i]; - M3_ += m_3_[i]*MatrixBasisContainer_[i]; + M1_ += m_1_[i]*matrixBasis_[i]; + M2_ += m_2_[i]*matrixBasis_[i]; + M3_ += m_3_[i]*matrixBasis_[i]; } std::cout << "--- plot corrector-Matrices M_alpha --- " << std::endl;