simplification

Author: raback

fem/src/MortarUtils.F90

@@ -1179,7 +1179,7 @@ SUBROUTINE TemporalTriangleMortarAssembly(ElementT, NodesT, Element, Nodes, Elem
     TYPE(Element_t), POINTER :: ElementP, ElementLin
     TYPE(GaussIntegrationPoints_t) :: IPT
     REAL(KIND=dp) :: area, xt, yt, zt = 0.0_dp, u, v, w, um, vm, wm, uq, vq, &
-        detJ, val, val_dual, weight, Lvals(20)
+        detJ, val, val_dual, weight, Lvals(20), LVals2(20)
     REAL(KIND=dp), ALLOCATABLE :: BasisT(:),Basis(:), BasisM(:), MASS(:,:), CoeffBasis(:)
     INTEGER :: i,j,k,jj,n,m,ne,nM,neM,nd,ndM,ElemCode,LinCode,ElemCodeM,LinCodeM,nip,nrow,AllocStat
     INTEGER, POINTER :: Indexes(:),IndexesM(:)
@@ -1324,46 +1324,38 @@ SUBROUTINE TemporalTriangleMortarAssembly(ElementT, NodesT, Element, Nodes, Elem
         k = 0
         DO i=1,nd
           IF( ABS( val * Basis(i) ) < 1.0d-10 ) CYCLE
-
+          !Nslave = Nslave + 1
           k = k+1
           Linds(k) = InvPerm(Indexes(i))
-          Lvals(k) = Basis(i)*val
-          
-          !Nslave = Nslave + 1
-          !CALL List_AddToMatrixElement(Projector % ListMatrix, nrow, &
-          !    InvPerm(Indexes(i)), Basis(i) * val ) 
-
-          IF(BiOrthogonal) THEN
-            CALL List_AddToMatrixElement(Projector % Child % ListMatrix, nrow, &
-                InvPerm(Indexes(i)), Basis(i) * val_dual ) 
-          END IF
+          Lvals(k) = Basis(i) * val
+          LVals2(k) = Basis(i) * val_dual
         END DO
-        CALL List_AddMatrixRow(Projector % ListMatrix, nrow,k,Linds,Lvals)
+
+        CALL List_AddMatrixRow(Projector % ListMatrix, nrow,k,Linds,Lvals,KeepOrder=Biorthogonal)
+        IF(BiOrthogonal) THEN
+          CALL List_AddMatrixRow(Projector % Child % ListMatrix,nrow,k,Linds,Lvals2)
+        END IF
 
         k = 0
         DO i=1,ndM
           IF( ABS( val * BasisM(i) ) < 1.0d-12 ) CYCLE
-
           !Nmaster = Nmaster + 1
           k = k+1
           Linds(k) = InvPermM(IndexesM(i))
           Lvals(k) = -NodeScale * BasisM(i) * val
 
-
-          !CALL List_AddToMatrixElement(Projector % ListMatrix, nrow, &
-          !    InvPermM(IndexesM(i)), -NodeScale * BasisM(i) * val )                   
-
           IF(BiOrthogonal) THEN
             IF(DualMaster .OR. DualLCoeff) THEN
-              CALL List_AddToMatrixElement(Projector % Child % ListMatrix, nrow, &
-                  InvPermM(IndexesM(i)), -NodeScale * BasisM(i) * val_dual ) 
+              Lvals2(k) = -NodeScale * BasisM(i) * val_dual
             ELSE
-              CALL List_AddToMatrixElement(Projector % Child % ListMatrix, nrow, &
-                  InvPermM(IndexesM(i)), -NodeScale * BasisM(i) * val ) 
+              Lvals2(k) = -NodeScale * BasisM(i) * val
             END IF
           END IF
         END DO
-        CALL List_AddMatrixRow(Projector % ListMatrix, nrow,k,Linds,Lvals)
+        CALL List_AddMatrixRow(Projector % ListMatrix, nrow,k,Linds,Lvals,KeepOrder=Biorthogonal)
+        IF(BiOrthogonal) THEN
+          CALL List_AddMatrixRow(Projector % Child % ListMatrix,nrow,k,Linds,Lvals2)
+        END IF
 
       END DO
     END DO
@@ -1563,20 +1555,10 @@ SUBROUTINE TemporalSegmentMortarAssembly(ElementT, NodesT, Element, Nodes, Eleme
           Linds(1:nM) = InvPermM(IndexesM(1:nM))
           Lvals(1:nM) = sgn0 * BasisM(1:nM) * val
           CALL List_AddMatrixRow(DualProjector % ListMatrix,nrow,nM,Linds,Lvals)
-                             
-          !DO i=1,nM
-          !  CALL List_AddToMatrixElement(DualProjector % ListMatrix, nrow, &
-          !      InvPermM(IndexesM(i)), sgn0 * BasisM(i) * val ) 
-          !END DO
 
           Linds(1:n) = InvPerm(IndexesM(1:nM))
           Lvals(1:n) = -NodeScale * Basis(1:n) * val
           CALL List_AddMatrixRow(DualProjector % ListMatrix,nrow,n,Linds,Lvals)
-
-          !DO i=1,n
-          !  CALL List_AddToMatrixElement(DualProjector % ListMatrix, nrow, &
-          !      InvPerm(Indexes(i)), -NodeScale * Basis(i) * val )                   
-          !END DO
         END DO
       END IF
     END DO