Merge branch 'development' into feature/0DGrid

Conflicts:
	src/modules/mesh/moduleMesh.f90

src/modules/mesh/inout/gmsh2/moduleMeshInputGmsh2.f90

@@ -15,6 +15,7 @@ MODULE moduleMeshInputGmsh2
       TYPE IS(meshParticles)
         self%printOutput => printOutputGmsh2
         self%printEM     => printEMGmsh2
+        self%readInitial => readInitialGmsh2
 
       END SELECT
       self%readMesh    => readGmsh2
@@ -289,4 +290,76 @@ MODULE moduleMeshInputGmsh2
 
     END SUBROUTINE readGmsh2
 
+    !Reads the initial information from an output file for an species
+    SUBROUTINE readInitialGmsh2(sp, filename, density, velocity, temperature)
+      USE moduleRefParam
+      IMPLICIT NONE
+
+      INTEGER, INTENT(in):: sp
+      CHARACTER(:), ALLOCATABLE, INTENT(in):: filename
+      REAL(8), ALLOCATABLE, INTENT(out), DIMENSION(:):: density
+      REAL(8), ALLOCATABLE, INTENT(out), DIMENSION(:,:):: velocity
+      REAL(8), ALLOCATABLE, INTENT(out), DIMENSION(:):: temperature
+      INTEGER:: i, e
+      INTEGER:: numNodes
+
+      OPEN(10, file = TRIM(filename))
+
+      !Skip first lines
+      DO i = 1, 11
+        READ(10, *)
+
+      END DO
+
+      !Reads number of nodes in file
+      READ(10, *) numNodes
+      ALLOCATE(density(1:numNodes))
+      ALLOCATE(velocity(1:numNodes, 1:3))
+      ALLOCATE(temperature(1:numNodes))
+
+      DO i = 1, numNodes
+        !Reads the density
+        READ(10, *), e, density(i)
+
+      END DO
+
+      DO i = 1, 10
+        READ(10, *)
+
+      END DO
+
+      DO i = 1, numNodes
+        !Reads the velocity
+        READ(10, *), e, velocity(i, 1:3)
+
+      END DO
+
+      !Skip uneccessary lines
+      DO i = 1, 10
+        READ(10, *)
+
+      END DO
+
+      !Assign density to nodes
+      DO i = 1, numNodes
+        !Skips pressure
+        READ(10, *)
+
+      END DO
+
+      !Skip uneccessary lines
+      DO i = 1, 10
+        READ(10, *)
+
+      END DO
+
+      !Assign density to nodes
+      DO i = 1, numNodes
+        !Skips pressure
+        READ(10, *) e, temperature(i)
+
+      END DO
+
+    END SUBROUTINE readInitialGmsh2
+
 END MODULE moduleMeshInputGmsh2