Merge branch 'update.version' into 'master.dev'

Updated version number to 1.5.2, removed redundant array in posti tool See merge request piclas/piclas!297
piclas-framework · Feb 17, 2020 · a22b4f2 · a22b4f2
2 parents 6ed38e9 + d7d209b
commit a22b4f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/globals/globals_vars.f90 b/src/globals/globals_vars.f90
@@ -22,7 +22,7 @@ MODULE MOD_Globals_Vars
 ! GLOBAL VARIABLES
 !-----------------------------------------------------------------------------------------------------------------------------------
 CHARACTER(LEN=6),PARAMETER   :: ProgramName    = 'PICLas'             !> name of this program
-REAL,PARAMETER               :: FileVersion    = 1.51                 !> FileVersion number saved in each hdf5 file with hdf5 header
+REAL,PARAMETER               :: FileVersion    = 1.52                 !> FileVersion number saved in each hdf5 file with hdf5 header
 REAL                         :: FileVersionHDF5                       !> FileVersion number read from hdf5 restart file
 REAL                         :: WallTime                              !> Wall time needed by a simulation (is not reset by
                                                                       !> performing a load balance step, only by user restart)

diff --git a/src/h5piclas2vtk.f90 b/src/h5piclas2vtk.f90
@@ -840,7 +840,7 @@ SUBROUTINE ConvertPartData(InputStateFile)
 INTEGER,ALLOCATABLE             :: ConnectInfo(:,:)
 CHARACTER(LEN=255),ALLOCATABLE  :: VarNamesParticle(:), tmpArray(:)
 CHARACTER(LEN=255)              :: FileString
-REAL, ALLOCATABLE               :: PartData(:,:), tmpPartData(:,:)
+REAL, ALLOCATABLE               :: PartData(:,:)
 REAL                            :: OutputTime, FileVersionHDF5
 LOGICAL                         :: FileVersionExists
 !===================================================================================================================================
@@ -894,21 +894,19 @@ SUBROUTINE ConvertPartData(InputStateFile)
 VarNamesParticle(1:nPartsVar)=tmpArray(4:nPartsVar+3)
 
 IF(nParts.GT.0) THEN
-  ALLOCATE(PartData(1:nPartsVar+3,1:nParts),tmpPartData(1:nPartsVar+3,1:nParts))
+  ALLOCATE(PartData(1:nPartsVar+3,1:nParts))
   PartData = 0.
-  tmpPartData = 0.
   SDEALLOCATE(ConnectInfo)
   ALLOCATE(ConnectInfo(1,1:nParts))
   ConnectInfo = 0
 END IF
 
 ASSOCIATE(nParts    => INT(nParts,IK),  &
           nPartsVar => INT(nPartsVar,IK))
-CALL ReadArray('PartData',2,(/nPartsVar+3_IK,nParts/),0_IK,1,RealArray=tmpPartData)
+CALL ReadArray('PartData',2,(/nPartsVar+3_IK,nParts/),0_IK,1,RealArray=PartData)
 END ASSOCIATE
 
 DO iPart=1,nParts
-  PartData(1:nPartsVar+3,iPart) = tmpPartData(1:nPartsVar+3,iPart)
   ConnectInfo(1,iPart)=iPart-1
 END DO
 
@@ -920,7 +918,6 @@ SUBROUTINE ConvertPartData(InputStateFile)
 SDEALLOCATE(tmpArray)
 SDEALLOCATE(PartData)
 SDEALLOCATE(ConnectInfo)
-SDEALLOCATE(tmpPartData)
 
 CALL CloseDataFile()
 

diff --git a/src/piclaslib.f90 b/src/piclaslib.f90
@@ -77,7 +77,7 @@ SUBROUTINE InitializePiclas()
 SWRITE(UNIT_stdOut,'(A)')"                                       | )      ___) (___| (____/\| (____/\| )   ( |/\____) |"
 SWRITE(UNIT_stdOut,'(A)')"                                       |/       \_______/(_______/(_______/|/     \|\_______)"
 SWRITE(UNIT_stdOut,'(132(" "))')
-SWRITE(UNIT_stdOut,'(A)')"piclas version 1.5.1"
+SWRITE(UNIT_stdOut,'(A)')"piclas version 1.5.2"
 SWRITE(UNIT_stdOut,'(132("="))')
 
 CALL ParseCommandlineArguments()