Commit cb2326f0 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Merge between two AMDiS version, no real changes.

parent 4de3124c
...@@ -120,23 +120,39 @@ namespace AMDiS { ...@@ -120,23 +120,39 @@ namespace AMDiS {
} }
if (firstOrderAssemblerGrdPsi) { if (firstOrderAssemblerGrdPsi) {
firstOrderAssemblerGrdPsi->calculateElementMatrix(smallElInfo, mat);
if (largeElInfo == colElInfo) { if (largeElInfo == colElInfo) {
ERROR_EXIT("123 Not yet implemented for first order assembler!\n"); ElementMatrix &m =
} else { smallElInfo->getSubElemGradCoordsMat(rowFESpace->getBasisFcts()->getDegree());
firstOrderAssemblerGrdPsi->calculateElementMatrix(smallElInfo, mat);
tmpMat = m * mat;
} else {
ElementMatrix &m = ElementMatrix &m =
smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree()); smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree());
tmpMat = mat * trans(m); tmpMat = mat * trans(m);
mat = tmpMat;
} }
mat = tmpMat;
} }
if (firstOrderAssemblerGrdPhi) { if (firstOrderAssemblerGrdPhi) {
ERROR_EXIT("Not yet implemented for first order assembler!\n");
firstOrderAssemblerGrdPhi->calculateElementMatrix(smallElInfo, mat); firstOrderAssemblerGrdPhi->calculateElementMatrix(smallElInfo, mat);
if (largeElInfo == rowElInfo) {
ElementMatrix &m =
smallElInfo->getSubElemGradCoordsMat(rowFESpace->getBasisFcts()->getDegree());
tmpMat = mat * trans(m);
} else {
ElementMatrix &m =
smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree());
tmpMat = m * mat;
}
mat = tmpMat;
} }
if (zeroOrderAssembler) { if (zeroOrderAssembler) {
......
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