Reading of mesh files has been made independent from geometry and

prepared to accept different formats.

src/modules/mesh/1DCart/moduleMesh1DCart.f90

@@ -308,27 +308,27 @@ MODULE moduleMesh1DCart
     END SUBROUTINE partialDerSegm
 
     !Computes local stiffness matrix
-    FUNCTION elemKSegm(self) RESULT(ke)
+    PURE FUNCTION elemKSegm(self) RESULT(localK)
       IMPLICIT NONE
 
       CLASS(meshVol1DCartSegm), INTENT(in):: self
-      REAL(8):: ke(1:2,1:2)
+      REAL(8), ALLOCATABLE:: localK(:,:)
       REAL(8):: Xii(1:3)
       REAL(8):: dPsi(1:1, 1:2)
       REAL(8):: invJ(1), detJ
       INTEGER:: l
 
-      ke      = 0.D0
+      ALLOCATE(localK(1:2,1:2))
+      localK      = 0.D0
       Xii     = 0.D0
-
       DO l = 1, 3
         xii(1) = corSeg(l)
         dPsi    = self%dPsi(Xii)
         detJ    = self%detJac(Xii, dPsi)
         invJ    = self%invJac(Xii, dPsi)
-        ke      = ke + MATMUL(RESHAPE(MATMUL(invJ,dPsi), (/ 2, 1/)), &
-                              RESHAPE(MATMUL(invJ,dPsi), (/ 1, 2/)))* &
-                       wSeg(l)/detJ
+        localK  = localK + MATMUL(RESHAPE(MATMUL(invJ,dPsi), (/ 2, 1/)), &
+                                  RESHAPE(MATMUL(invJ,dPsi), (/ 1, 2/)))* &
+                           wSeg(l)/detJ
 
       END DO
 
@@ -522,6 +522,117 @@ MODULE moduleMesh1DCart
 
     END FUNCTION invJ1DCart
 
+    SUBROUTINE connectMesh1DCart(self)
+      IMPLICIT NONE
+
+      CLASS(meshParticle), INTENT(inout):: self
+      INTEGER:: e, et
+
+      DO e = 1, self%numVols
+        !Connect Vol-Vol
+        DO et = 1, self%numVols
+          IF (e /= et) THEN
+            CALL connectVolVol(self%vols(e)%obj, self%vols(et)%obj)
+
+          END IF
+
+        END DO
+
+        !Connect Vol-Edge
+        DO et = 1, self%numEdges
+          CALL connectVolEdge(self%vols(e)%obj, self%edges(et)%obj)
+
+        END DO
+
+      END DO
+
+    END SUBROUTINE connectMesh1DCart
+
+    SUBROUTINE connectVolVol(elemA, elemB)
+      IMPLICIT NONE
+
+      CLASS(meshVol), INTENT(inout):: elemA
+      CLASS(meshVol), INTENT(inout):: elemB
+
+        SELECT TYPE(elemA)
+        TYPE IS(meshVol1DCartSegm)
+          SELECT TYPE(elemB)
+          TYPE IS(meshVol1DCartSegm)
+            CALL connectSegmSegm(elemA, elemB)
+
+          END SELECT
+
+        END SELECT
+
+    END SUBROUTINE connectVolVol
+
+    SUBROUTINE connectSegmSegm(elemA, elemB)
+      IMPLICIT NONE
+
+      CLASS(meshVol1DCartSegm), INTENT(inout), TARGET:: elemA
+      CLASS(meshVol1DCartSegm), INTENT(inout), TARGET:: elemB
+
+      IF (.NOT. ASSOCIATED(elemA%e1) .AND. &
+          elemA%n2%n == elemB%n1%n) THEN
+        elemA%e1 => elemB
+        elemB%e2 => elemA
+        
+      END IF
+
+      IF (.NOT. ASSOCIATED(elemA%e2) .AND. &
+          elemA%n1%n == elemB%n2%n) THEN
+
+        elemA%e2 => elemB
+        elemB%e1 => elemA
+
+      END IF
+
+    END SUBROUTINE connectSegmSegm
+
+    SUBROUTINE connectVolEdge(elemA, elemB)
+      IMPLICIT NONE
+
+      CLASS(meshVol),  INTENT(inout):: elemA
+      CLASS(meshEdge), INTENT(inout):: elemB
+
+      SELECT TYPE(elemA)
+      TYPE IS (meshVol1DCartSegm)
+        SELECT TYPE(elemB)
+        CLASS IS(meshEdge1DCart)
+          CALL connectSegmEdge(elemA, elemB)
+
+        END SELECT
+
+      END SELECT
+
+    END SUBROUTINE connectVolEdge
+
+    SUBROUTINE connectSegmEdge(elemA, elemB)
+      IMPLICIT NONE
+
+      CLASS(meshVol1DCartSegm), INTENT(inout), TARGET:: elemA
+      CLASS(meshEdge1DCart),    INTENT(inout), TARGET:: elemB
+
+      IF (.NOT. ASSOCIATED(elemA%e1) .AND. &
+          elemA%n2%n == elemB%n1%n) THEN
+
+        elemA%e1 => elemB
+        elemB%e2 => elemA
+ 
+        !Revers the normal to point inside the domain
+        elemB%normal = - elemB%normal
+
+      END IF
+
+      IF (.NOT. ASSOCIATED(elemA%e2) .AND. &
+          elemA%n1%n == elemB%n1%n) THEN
+
+        elemA%e2 => elemB
+        elemB%e1 => elemA
+
+      END IF
+
+    END SUBROUTINE connectSegmEdge
 
 END MODULE moduleMesh1DCart