Merge branch 'wip_swapmesh_changenodetype' into 'master'

change NodeType in Swapmesh Tool

See merge request flexi/flexi!709

Author: marblin

posti/swapmesh/interpolatesolution.f90

@@ -44,7 +44,7 @@ SUBROUTINE InterpolateSolution()
 USE MOD_Basis,             ONLY: LagrangeInterpolationPolys,BarycentricWeights
 USE MOD_Interpolation,     ONLY: GetNodesAndWeights
 USE MOD_SwapMesh_Vars,     ONLY: equalElem,Vdm_GPNState_GPNNew
-USE MOD_SwapMesh_Vars,     ONLY: NState,NInter,NNew,NodeTypeState,RefState,nVar_State
+USE MOD_SwapMesh_Vars,     ONLY: NState,NInter,NNew,NodeTypeState,RefState,nVar_State,NodeTypeOut
 USE MOD_SwapMesh_Vars,     ONLY: Vdm_CLNInter_GPNNew
 USE MOD_SwapMesh_Vars,     ONLY: UOld,xiInter,InterToElem,nElemsNew,IPDone
 USE MOD_SwapMesh_Vars,     ONLY: Elem_IJK,ExtrudeTo3D,ExtrudeK
@@ -99,7 +99,7 @@ SUBROUTINE InterpolateSolution()
   ! Equal elements
   IF(equalElem(iElemNew).GT.0) THEN
     iElemOld=equalElem(iElemNew)
-    IF(NState.EQ.NNew)THEN
+    IF((NState.EQ.Nnew).AND.(NodeTypeOut.EQ.NodetypeState))THEN
       U(:,:,:,:,iElemNew)=UOld(:,:,:,:,iElemOld)
     ELSE
       CALL ChangeBasisVolume(nVar_State,NState,NNew,Vdm_GPNState_GPNNew,UOld(:,:,:,:,iElemOld),U(:,:,:,:,iElemNew))

posti/swapmesh/posti_swapmesh.f90

@@ -70,6 +70,8 @@ PROGRAM swapMesh
                                                        "high-order data and treat curved meshes as linear meshes.", '.TRUE.')
 CALL prms%CreateLogicalOption(  "useCurvedsNew"      , "Controls usage of high-order information in new mesh. Turn off to discard "//&
                                                        "high-order data and treat curved meshes as linear meshes.", '.TRUE.')
+CALL prms%CreateStringOption(   "NodeTypeNew  "      , "Change nodetype, tested for switching betwee GAUSS and GAUSS-LOBATTO "//& 
+                                                       "on the same mesh.")
 CALL prms%CreateIntOption(      "NInter"             , "Polynomial degree used for interpolation on new mesh (should be equal or  "//&
                                                        "higher than NNew) - the state will be interpolated to this degree and then "//&
                                                        "projected down to NNew")

posti/swapmesh/swapmesh.f90

@@ -98,6 +98,8 @@ SUBROUTINE InitSwapmesh()
 ! New mesh file, the state will be interpolated to this one
 MeshFileNew = GETSTR('MeshFileNew')
 
+NodeTypeOut = GETSTR('NodeTypeNew',NodeTypeState)
+
 ! Curved meshes or not
 useCurvedsOld = GETLOGICAL("useCurvedsOld")
 useCurvedsNew = GETLOGICAL("useCurvedsNew")
@@ -307,7 +309,7 @@ END SUBROUTINE ReadMeshCoords
 SUBROUTINE prepareVandermonde()
 ! MODULES
 USE MOD_Swapmesh_Vars,       ONLY: NInter,NNew,NState,NState,NGeoOld,NGeoNew,NSuper
-USE MOD_Swapmesh_Vars,       ONLY: NodeTypeState,nElemsNew,xCLInter
+USE MOD_Swapmesh_Vars,       ONLY: NodeTypeState,nElemsNew,xCLInter,NodeTypeOut
 USE MOD_Swapmesh_Vars,       ONLY: Vdm_CLNGeo_EquiNSuper,Vdm_CLNInter_GPNNew,Vdm_GPNState_GPNNew
 USE MOD_Swapmesh_Vars,       ONLY: xCLNew
 USE MOD_Interpolation,       ONLY: GetVandermonde
@@ -330,12 +332,12 @@ SUBROUTINE prepareVandermonde()
 
 ! Vandermonde from interpolation CL to new solution G/GL
 ALLOCATE(Vdm_CLNInter_GPNNew(0:NNew,0:NInter))
-CALL GetVandermonde(NInter,NodeTypeCL,NNew,NodeType,Vdm_CLNInter_GPNNew)
+CALL GetVandermonde(NInter,NodeTypeCL,NNew,NodeTypeOut,Vdm_CLNInter_GPNNew)
 
 ! Vandermonde for direct interpolation in equal elements
-IF(NNew.NE.NState)THEN
+IF((NNew.NE.NState).OR.(NodeTypeState.NE.NodeTypeOut))THEN
   ALLOCATE(Vdm_GPNState_GPNNew(0:NNew,0:NState))
-  CALL GetVandermonde(NState,NodeTypeState,NNew,NodeType,Vdm_GPNState_GPNNew)
+  CALL GetVandermonde(NState,NodeTypeState,NNew,NodeTypeOut,Vdm_GPNState_GPNNew)
 END IF
 
 IF(NGeoNew.NE.NInter)THEN
@@ -471,15 +473,32 @@ END SUBROUTINE ReadOldStateFile
 !===================================================================================================================================
 SUBROUTINE WriteNewStateFile()
 ! MODULES                                                                                                                          !
-USE MOD_HDF5_Output,        ONLY: WriteState
-USE MOD_Swapmesh_Vars,      ONLY: Time_State,MeshFileNew
+USE MOD_PreProc
+USE MOD_Globals
+USE MOD_IO_HDF5            
+USE MOD_HDF5_Output        
+USE MOD_Output_Vars,        ONLY: ProjectName
+USE MOD_Swapmesh_Vars,      ONLY: Time_State,MeshFileNew,NodeTypeOut,NodeTypeState
 !----------------------------------------------------------------------------------------------------------------------------------!
 IMPLICIT NONE
 ! INPUT / OUTPUT VARIABLES
 !-----------------------------------------------------------------------------------------------------------------------------------
 ! LOCAL VARIABLES
+CHARACTER(LEN=255)             :: FileName,FileType
+
 !===================================================================================================================================
 CALL WriteState(TRIM(MeshFileNew),Time_State,Time_State,isErrorFile=.FALSE.)
+
+! Update the nodetype attribute in the State file, delete old attri and rewrite
+IF (NodeTypeOut.NE.NodeTypeState) THEN
+  SWRITE(UNIT_stdOut,'(A)') "Updating NodeType in Statefile to new NodeType."
+  FileType=MERGE('ERROR_State','State      ',.FALSE.)
+  FileName=TRIM(TIMESTAMP(TRIM(ProjectName)//'_'//TRIM(FileType),Time_State))//'.h5'
+  CALL OpenDataFile(FileName,create=.FALSE.,single=.TRUE.,readOnly=.FALSE.)
+  CALL H5ADELETE_F(   File_ID,'NodeType',iError)
+  CALL WriteAttribute(File_ID,'NodeType',1,StrScalar=(/NodeTypeOut/))
+  CALL CloseDataFile()
+END IF
 END SUBROUTINE WriteNewStateFile
 
 !===================================================================================================================================

posti/swapmesh/swapmesh_vars.f90

@@ -48,6 +48,7 @@ MODULE MOD_SwapMesh_Vars
 INTEGER             :: NNew                      !< Polynomial degree of new state (=NState, if not specified otherwise)
 INTEGER             :: NInter                    !< Polynomial degree for interpolation on new mesh (=NState, if not specified otherwise)
 CHARACTER(LEN=255)  :: NodeTypeState             !< NodeType of the old state (Gauss/Gauss-Lobatto)
+CHARACTER(LEN=255)  :: NodeTypeOut               !< NodeType of the output state (Gauss/Gauss-Lobatto)
 LOGICAL             :: useCurvedsOld             !< Should the old mesh use a curved mesh representation?
 LOGICAL             :: useCurvedsNew             !< Should the new mesh use a curved mesh representation?
 REAL,ALLOCATABLE    :: RefState(:)               !< Optional reference state used for points that can not be fond