Merge pull request #769 from ElmerCSC/ProjectorUpdate

Projector update

Author: raback

fem/src/BlockSolve.F90

@@ -42,7 +42,7 @@ MODULE BlockSolve
      BackScaleLinearSystem, AMGXMatrixVectorMultiply, AMGXSolver, DiagonalMatrixSumming, &
      StructureCouplingAssembly, FSICouplingAssembly, SaveLinearSystem, &
      MassMatrixAssembly, VectorValuesRange, LaplaceMatrixAssembly
- USE MeshUtils, ONLY : SaveProjector   
+ USE MortarUtils, ONLY : SaveProjector   
  USE DefUtils, ONLY : DefaultSolve, GetElementDOFs, GetElementNodes, GetLogical
 
  IMPLICIT NONE

fem/src/CMakeLists.txt

@@ -29,7 +29,8 @@ SET(solverlib_SOURCES AddrFunc.F90 NavierStokes.F90 NavierStokesGeneral.F90
   ElementUtils.F90 Radiation.F90 fft.c Load.c Differentials.F90
   FreeSurface.F90 
   Walls.F90 SolverUtils.F90 SolveSBand.F90 CPUTime.c Interpolation.F90
-  MainUtils.F90 Adaptive.F90 EigenSolve.F90 HashTable.F90
+  MainUtils.F90 Adaptive.F90 EigenSolve.F90 HashTable.F90 MortarUtils.F90
+  MeshAllocations.F90 GeometryFitting.F90
   MeshUtils.F90 SaveUtils.F90 SParIterGlobals.F90 SParIterComm.F90
   SParIterPrecond.F90 SParIterSolver.F90 Messages.F90 Multigrid.F90
   Smoothers.F90 ClusteringMethods.F90 ParallelUtils.F90

fem/src/ElementDescription.F90

@@ -3180,6 +3180,9 @@ RECURSIVE FUNCTION ElementInfo( Element, Nodes, u, v, w, detJ, &
              ApplyPiolaTransform = PerformPiolaTransform, &
              SimplicialMesh = SimplicialElements)
        ELSE
+         IF(Element % Type % ElementCode == 504 .AND. ANY([u,v,w] < 0.0) ) THEN
+           PRINT *,'Negative local coordinates for tet:',u,v,w
+         END IF
          stat = ElementInfo( Element, Nodes, u, v, w, detJ, Basis, dBasisdx )
          CALL GetEdgeBasis(Element,EdgeBasis,RotBasis,Basis,dBasisdx)         
        END IF

fem/src/ElementUtils.F90

@@ -4138,6 +4138,56 @@ SUBROUTINE mGetBoundaryIndexesFromParent( Mesh, Element, Indexes, indSize )
    END SUBROUTINE mGetBoundaryIndexesFromParent
 !------------------------------------------------------------------------------
 
+!------------------------------------------------------------------------------
+  FUNCTION Find_Edge(Mesh,Parent,Element) RESULT(ptr)
+!------------------------------------------------------------------------------
+    TYPE(Element_t), POINTER :: Ptr
+    TYPE(Mesh_t) :: Mesh
+    TYPE(Element_t) :: Parent, Element
+
+    INTEGER :: i,j,k,n
+
+    Ptr => NULL()
+    DO i=1,Parent % TYPE % NumberOfEdges
+      Ptr => Mesh % Edges(Parent % EdgeIndexes(i))
+      n=0
+      DO j=1,Ptr % TYPE % NumberOfNodes
+        DO k=1,Element % TYPE % NumberOfNodes
+          IF (Ptr % NodeIndexes(j) == Element % NodeIndexes(k)) n=n+1
+        END DO
+      END DO
+      IF (n==Ptr % TYPE % NumberOfNodes) EXIT
+    END DO
+!------------------------------------------------------------------------------
+  END FUNCTION Find_Edge
+!------------------------------------------------------------------------------
+
+!------------------------------------------------------------------------------
+  FUNCTION Find_Face(Mesh,Parent,Element) RESULT(ptr)
+!------------------------------------------------------------------------------
+    TYPE(Element_t), POINTER :: Ptr
+    TYPE(Mesh_t) :: Mesh
+    TYPE(Element_t) :: Parent, Element
+
+    INTEGER :: i,j,k,n
+
+    Ptr => NULL()
+    DO i=1,Parent % TYPE % NumberOfFaces
+      Ptr => Mesh % Faces(Parent % FaceIndexes(i))
+      n=0
+      DO j=1,Ptr % TYPE % NumberOfNodes
+        DO k=1,Element % TYPE % NumberOfNodes
+          IF (Ptr % NodeIndexes(j) == Element % NodeIndexes(k)) n=n+1
+        END DO
+      END DO
+      IF (n==Ptr % TYPE % NumberOfNodes) EXIT
+    END DO
+!------------------------------------------------------------------------------
+  END FUNCTION Find_Face
+!------------------------------------------------------------------------------
+
+
+   
 END MODULE ElementUtils
 
 !> \} ElmerLib

fem/src/ElmerSolver.F90

@@ -78,10 +78,11 @@ SUBROUTINE ElmerSolver(initialize, args, NoArgs)
 #endif
      USE SolverUtils, ONLY: GetControlValue, FinalizeLumpedMatrix, UpdateExportedVariables, &
          UpdateIpPerm, VectorValuesRange
-     USE MeshUtils, ONLY : MeshExtrude, MeshExtrudeSlices, PeriodicProjector, &
+     USE MeshUtils, ONLY : MeshExtrude, MeshExtrudeSlices, &
          CoordinateTransformation, InitializeElementDescriptions, ReleaseMesh, &
          CalculateMeshPieces, SetActiveElementsTable, SetCurrentMesh, &
          MarkSharpEdges, TagBodiesUsingCondition
+     USE MortarUtils, ONLY : PeriodicProjector
      USE MainUtils, ONLY : AddEquationBasics, AddEquationSolution, AddExecWhenFlag, &
          PredictorCorrectorControl, SingleSolver, SolveEquations, SolverActivate, &
          SwapMesh