diff --git a/dune/microstructure/matrix_operations.hh b/dune/microstructure/matrix_operations.hh index 0a0e01124c5d3f0b6218e3480724497fa0c994a9..868e254dcfcc2a59d2f36aa9665a602da468dfb2 100644 --- a/dune/microstructure/matrix_operations.hh +++ b/dune/microstructure/matrix_operations.hh @@ -26,10 +26,6 @@ namespace MatrixOperations { } - static VectorRT crossProduct (VectorRT v, VectorRT w) { // v otimes w - return {v[1]*w[2] - v[2]*w[1], -1*(v[0]*w[2] - v[2]*w[0]), v[0]*w[1] - v[1]*w[0]}; - } - static MatrixRT rankoneTensorproduct (VectorRT v, VectorRT w) { // v otimes w return {{v[0]*w[0], v[1]*w[0], v[2]*w[0]}, @@ -37,24 +33,6 @@ namespace MatrixOperations { {v[0]*w[2], v[1]*w[2], v[2]*w[2]}}; } - static MatrixRT nematicLiquidCrystal (double p, VectorRT n){ //B = 1/6*p*Id + 1/2*p*(n otimes n) - MatrixRT B(0); - for (int i=0; i<3; i++) - B[i][i]=p/6.0; - MatrixRT n_ot_n = rankoneTensorproduct(n,n); - n_ot_n*=p/2.0; - B += n_ot_n; - return B; - } - - static MatrixRT biotStrainApprox (VectorRT U, VectorRT k, VectorRT e_cs){ //E_h = (U + k x e_cs, 0, 0) - VectorRT k_x_ecs = crossProduct(k, e_cs); - VectorRT U_plus_k_x_ecs = U + k_x_ecs; - VectorRT e_1 = {1, 0, 0}; - return rankoneTensorproduct(U_plus_k_x_ecs, e_1); - } - - static MatrixRT crossSectionDirectionScaling(double w, MatrixRT M){ return {{M[0][0], M[0][1], w*M[0][2]}, {M[1][0], M[1][1], w*M[1][2]}, @@ -178,34 +156,6 @@ namespace MatrixOperations { return (1.0/2.0)*(QuadraticForm(mu,lambda,F+G) - QuadraticForm(mu,lambda,F) - QuadraticForm(mu,lambda,G) ); } - static MatrixRT matrixSqrt(MatrixRT M){ - std::cout << "matrixSqrt not implemented!!!" << std::endl; //implement this - return M; - } - - static double lameMu(double E, double nu){ - return 0.5 * 1.0/(1.0 + nu) * E; - } - - static double lameLambda(double E, double nu){ - return nu/(1.0-2.0*nu) * 1.0/(1.0+nu) * E; - } - - static bool isInRotatedPlane(double phi, double x1, double x2){ - return cos(phi)*x1 + sin(phi)*x2 > 0; - } - - - extern "C" - { - - MatrixRT new_sym(MatrixRT M) - { - return sym(M); - } - - } - /** * @brief This is used to convert FieldMatrices to 'adouble'