Merge branch 'improvement.filter.fix' into 'master'

Filter and overintegration always disabled in postiMode

See merge request flexi/flexi!710

Author: kopperp

regressioncheck/checks/tgv/split/parameter.ini

@@ -1,5 +1,5 @@
 ! =============================================================================== !
-! OUTPUT 
+! OUTPUT
 ! =============================================================================== !
 ProjectName   = TGV_Re1600_Split
 Logging       = F
@@ -20,39 +20,38 @@ NVisu         = 12
 ! =============================================================================== !
 OverintegrationType=0  ! 0:off 1:cut-off filter 2: conservative cut-off 3: advective
                        ! flux only
-NOver         = 11      ! overintegration for volume fluxes (NOver>N) for type 3
 NUnder        = 7      ! specifies effective polydeg (modes > NUnder are thrown away)
                        ! for types 1 and 2
 NOut          =-1      ! Change output poly deg to save memory:
                        ! -1: MIN(N,NUnder), 0: N, >=1: NOut
 !=========================================================================================
 ! Riemann
 !=========================================================================================
-Riemann               =  RoeEntropyFix ! Riemann solver to be used: LF, HLLC, Roe,  
-                                       ! RoeEntropyFix, HLL, HLLE, HLLEM  
+Riemann               =  RoeEntropyFix ! Riemann solver to be used: LF, HLLC, Roe,
+                                       ! RoeEntropyFix, HLL, HLLE, HLLEM
 !=========================================================================================
 ! SplitDG
 !=========================================================================================
 SplitDG               = PI
 ! =============================================================================== !
-! LES MODEL 
+! LES MODEL
 ! =============================================================================== !
 eddyViscType = 0       ! Choose LES model, 1:Smagorinsky
 CS = 0.1              ! Smagorinsky constant
 PrSGS = 0.6            ! turbulent Prandtl number
 ! =============================================================================== !
 ! MESH
 ! =============================================================================== !
-MeshFile      = CART_HEX_PERIODIC_008_mesh.h5 
+MeshFile      = CART_HEX_PERIODIC_008_mesh.h5
 useCurveds    = F
 ! if boundaries have to be changed (else they are used from Mesh directly):
 
 ! =============================================================================== !
 ! EQUATION
 ! =============================================================================== !
-IniExactFunc  = 0 
+IniExactFunc  = 0
 IniRefState   = 1
-RefState      = (/1.,1.,0.,0.,17194.8345650329/)          
+RefState      = (/1.,1.,0.,0.,17194.8345650329/)
 Mu0           = 6.25E-04    ! viscosity set to 1/Re
 R             = 71.42857
 ! =============================================================================== !
@@ -67,10 +66,10 @@ DFLscale   = 0.8  ! Scaling of theoretical DFL number
 ! =============================================================================== !
 Analyze_dt    = 13.0 ! Timestep of analyze outputs
 CalcErrorNorms=   F ! Calculate error norms
-CalcBodyForces=   F ! Calculate body forces (BC 4/9) 
-CalcWallVelocity= F ! Calculate velocities at the walls (BC 4/9) 
+CalcBodyForces=   F ! Calculate body forces (BC 4/9)
+CalcWallVelocity= F ! Calculate velocities at the walls (BC 4/9)
 
 ! =============================================================================== !
-! Boundary specification 
+! Boundary specification
 ! =============================================================================== !
   !All boundaries are set in mesh file, could be changed here

src/dg/dg.f90

@@ -140,7 +140,6 @@ SUBROUTINE InitDG()
 END SUBROUTINE InitDG
 
 
-
 !==================================================================================================================================
 !> Allocate and initialize the building blocks for the DG operator: Differentiation matrices and prolongation operators
 !==================================================================================================================================
@@ -560,17 +559,18 @@ SUBROUTINE DGTimeDerivative_weakForm(t)
 
 ! 14. Perform overintegration and apply Jacobian
 ! Perform overintegration (projection filtering type overintegration)
-IF(OverintegrationType.GT.0) THEN
-  CALL Overintegration(Ut)
-END IF
-! Apply Jacobian (for OverintegrationType==CUTOFFCONS this is already done within the Overintegration, but for DG only)
-IF (OverintegrationType.EQ.CUTOFFCONS) THEN
+SELECT CASE (OverintegrationType)
+  CASE (OVERINTEGRATIONTYPE_CONSCUTOFF )
+    CALL Overintegration(Ut)
 #if FV_ENABLED
-  CALL ApplyJacobianCons(Ut,toPhysical=.TRUE.,FVE=1)
-#endif
-ELSE
-  CALL ApplyJacobianCons(Ut,toPhysical=.TRUE.)
-END IF
+    CALL ApplyJacobianCons(Ut,toPhysical=.TRUE.,FVE=1)
+#endif /*FV_ENABLED*/
+  CASE (OVERINTEGRATIONTYPE_CUTOFF)
+    CALL Overintegration(Ut)
+    CALL ApplyJacobianCons(Ut,toPhysical=.TRUE.)
+  CASE DEFAULT
+    CALL ApplyJacobianCons(Ut,toPhysical=.TRUE.)
+END SELECT
 
 END SUBROUTINE DGTimeDerivative_weakForm
 

src/dg/overintegration.f90

@@ -22,10 +22,6 @@ MODULE MOD_Overintegration
 IMPLICIT NONE
 PRIVATE
 
-INTEGER,PARAMETER :: OVERINTEGRATIONTYPE_NONE       = 0
-INTEGER,PARAMETER :: OVERINTEGRATIONTYPE_CUTOFF     = 1
-INTEGER,PARAMETER :: OVERINTEGRATIONTYPE_CONSCUTOFF = 2
-
 !----------------------------------------------------------------------------------------------------------------------------------
 INTERFACE InitOverintegration
   MODULE PROCEDURE InitOverintegration
@@ -101,6 +97,13 @@ SUBROUTINE InitOverintegration()
   CALL CollectiveStop(__STAMP__,&
     'InitOverintegration not ready to be called or already called.')
 END IF
+
+! OverIntegration always disabled in postiMode
+IF (postiMode) THEN
+  OverintegrationType = OVERINTEGRATIONTYPE_NONE
+  RETURN
+END IF
+
 SWRITE(UNIT_stdOut,'(132("-"))')
 SWRITE(UNIT_stdOut,'(A)') ' INIT OVERINTEGRATION...'
 

src/filter/filter.f90

@@ -34,11 +34,6 @@ SUBROUTINE FilterInt(U_in,FilterMat)
 
 !----------------------------------------------------------------------------------------------------------------------------------
 
-INTEGER,PARAMETER      :: FILTERTYPE_NONE   = 0
-INTEGER,PARAMETER      :: FILTERTYPE_CUTOFF = 1
-INTEGER,PARAMETER      :: FILTERTYPE_MODAL  = 2
-INTEGER,PARAMETER      :: FILTERTYPE_LAF    = 3
-
 INTERFACE InitFilter
   MODULE PROCEDURE InitFilter
 END INTERFACE
@@ -126,9 +121,17 @@ SUBROUTINE InitFilter()
    CALL CollectiveStop(__STAMP__,'InitFilter not ready to be called or already called.')
    RETURN
 END IF
+
+! Filter always disabled in postiMode
+IF (postiMode) THEN
+  FilterType = FILTERTYPE_NONE
+  RETURN
+END IF
+
 SWRITE(UNIT_stdOut,'(132("-"))')
 SWRITE(UNIT_stdOut,'(A)') ' INIT FILTER...'
 
+
 FilterType = GETINTFROMSTR('FilterType')
 
 ! set the filterfunction pointer to the cut-off filter, even if the filter itself is not active
@@ -181,9 +184,9 @@ SUBROUTINE InitFilter()
         END DO ! j
       END DO ! k
       IntegrationWeight(:,:,:,iElem,0) = IntegrationWeight(:,:,:,iElem,0) / Vol
-    END DO !iElem
+    END DO ! iElem
 
-  ! Compute normalization for LAF
+    ! Compute normalization for LAF
     normMod=((REAL(NFilter)+1)**(-2./3.)-2.**(-2./3.))/(REAL(PP_N+1)**(-2./3.)-REAL(NFilter+1)**(-2./3.))
     lim=1E-8
     eRatio=0.
@@ -518,6 +521,7 @@ SUBROUTINE Filter_Selective(NVar,FilterMat,U_in,filter_ind)
 END IF
 END SUBROUTINE Filter_Selective
 
+
 !==================================================================================================================================
 !> Deallocate filter arrays
 !==================================================================================================================================

src/flexi.h

@@ -144,8 +144,15 @@
 #define KILL(x) SWRITE(*,*) __FILE__,__LINE__,x; stop
 
 ! overintegration
-#define CUTOFF 1
-#define CUTOFFCONS 2
+#define OVERINTEGRATIONTYPE_NONE       0
+#define OVERINTEGRATIONTYPE_CUTOFF     1
+#define OVERINTEGRATIONTYPE_CONSCUTOFF 2
+
+! filter
+#define FILTERTYPE_NONE   0
+#define FILTERTYPE_CUTOFF 1
+#define FILTERTYPE_MODAL  2
+#define FILTERTYPE_LAF    3
 
 ! PURE debug switch
 #if DEBUG

src/implicit/implicit.f90

@@ -58,6 +58,7 @@ MODULE MOD_Implicit
 SUBROUTINE DefineParametersImplicit()
 ! MODULES
 USE MOD_ReadInTools ,ONLY: prms
+! IMPLICIT VARIABLE HANDLING
 IMPLICIT NONE
 !==================================================================================================================================
 CALL prms%SetSection("Implicit")
@@ -81,37 +82,45 @@ SUBROUTINE DefineParametersImplicit()
 
 END SUBROUTINE DefineParametersImplicit
 
+
 !===================================================================================================================================
 !> Initialize implicit time integration. Mainly read in parameters for the Newton and GMRES solvers and call preconditioner init.
 !===================================================================================================================================
 SUBROUTINE InitImplicit()
 ! MODULES
 USE MOD_Globals
 USE MOD_PreProc
+USE MOD_DG_Vars,           ONLY: nDOFElem
+USE MOD_Filter_Vars,       ONLY: FilterType
 USE MOD_Implicit_Vars
-USE MOD_Mesh_Vars,         ONLY:MeshInitIsDone,nElems,nGlobalElems
-USE MOD_Interpolation_Vars,ONLY:InterpolationInitIsDone
-USE MOD_ReadInTools,       ONLY:GETINT,GETREAL,GETLOGICAL
-USE MOD_DG_Vars,           ONLY:nDOFElem
-USE MOD_TimeDisc_Vars,     ONLY:TimeDiscType,RKb_embedded
-USE MOD_Precond,           ONLY:InitPrecond
+USE MOD_Interpolation_Vars,ONLY: InterpolationInitIsDone
+USE MOD_Mesh_Vars,         ONLY: MeshInitIsDone,nElems,nGlobalElems
+USE MOD_Precond,           ONLY: InitPrecond
+USE MOD_ReadInTools,       ONLY: GETINT,GETREAL,GETLOGICAL
+USE MOD_TimeDisc_Vars,     ONLY: TimeDiscType,RKb_embedded
 ! IMPLICIT VARIABLE HANDLING
 IMPLICIT NONE
 !-----------------------------------------------------------------------------------------------------------------------------------
 ! INPUT VARIABLES
-
 !-----------------------------------------------------------------------------------------------------------------------------------
 ! OUTPUT VARIABLES
 !-----------------------------------------------------------------------------------------------------------------------------------
 ! LOCAL VARIABLES
 !===================================================================================================================================
-IF((.NOT.InterpolationInitIsDone).OR.(.NOT.MeshInitIsDone).OR.ImplicitInitIsDone)THEN
+IF (.NOT.InterpolationInitIsDone .OR. .NOT.MeshInitIsDone .OR.ImplicitInitIsDone) &
    CALL Abort(__STAMP__,'InitImplicit not ready to be called or already called.')
-END IF
+
 IF(TimeDiscType.EQ.'ESDIRK') THEN
   SWRITE(UNIT_stdOut,'(132("-"))')
   SWRITE(UNIT_stdOut,'(A)') ' INIT Implicit...'
 
+  SELECT CASE(FilterType)
+    CASE(FILTERTYPE_NONE,FILTERTYPE_CUTOFF)
+      ! Do nothing
+    CASE DEFAULT
+      CALL Abort(__STAMP__,'Only no or spectral cutoff filtering support with implicit time stepping!')
+  END SELECT
+
   nDOFVar1D     = PP_nVar*(PP_N+1)
   nDOFVarElem   = PP_nVar*nDOFElem
   nDOFVarProc   = nDOFVarElem*nElems
@@ -198,6 +207,7 @@ SUBROUTINE InitImplicit()
 END IF
 END SUBROUTINE InitImplicit
 
+
 !===================================================================================================================================
 !> Solves the non-linear system with Newton
 !> Root function: F_Xk = Xk - Q- alpha * dt* R_Xk(t+beta*dt,Xk) = 0!
@@ -348,6 +358,7 @@ SUBROUTINE Newton(t,Alpha)
 
 END SUBROUTINE Newton
 
+
 !===================================================================================================================================
 !> Matrix free Linear Krylov subspace solver
 !> A * y = b

tutorials/taylorgreenvortex/parameter_flexi.ini

@@ -20,7 +20,6 @@ NVisu               = 12
 ! =============================================================================== !
 OverintegrationType = 0             ! 0:off 1:cut-off filter 2: conservative cut-off 3: advective
                                     ! flux only
-NOver               = 11            ! overintegration for volume fluxes (NOver>N) for type 3
 NUnder              = 7             ! specifies effective polydeg (modes > NUnder are thrown away)
                                     ! for types 1 and 2
 NOut                = -1            ! Change output poly deg to save memory: