Merge between two AMDiS version, no real changes.

AMDiS/src/Assembler.cc

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