Made Filtering case variable

blackcata · Dec 21, 2016 · 5830a64 · 5830a64
1 parent 0fd3bc8
commit 5830a64
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/LES_Filtering_main.f90 b/LES_Filtering_main.f90
@@ -13,15 +13,19 @@
 !------------------------------------------------------------------------------!
 
         PROGRAM LES_FILTERING
+          USE LES_FILTERING_module,                                           &
+              ONLY : FILTER_OX
 
           IMPLICIT NONE
           REAL(KIND=8) :: time_sta, time_end
 
           CALL SETUP
           CALL READ_DNS
+
+          IF ( FILTER_OX > 0) CALL FILTER
+          IF ( FILTER_OX > 1) CALL SECOND_FILTER
+
           CALL VORTICAL_STRUCTURE
-          CALL FILTER
-          CALL SECOND_FILTER
           CALL OUTPUT
 
         END PROGRAM LES_FILTERING
diff --git a/LES_Filtering_module.f90 b/LES_Filtering_module.f90
@@ -11,7 +11,7 @@
         MODULE LES_FILTERING_module
 
           IMPLICIT NONE
-          INTEGER :: Nx, Ny, Nz, Nx_fil, Nz_fil, VS_CASE
+          INTEGER :: Nx, Ny, Nz, Nx_fil, Nz_fil, VS_CASE, FILTER_OX
           REAL(KIND=8) :: Del,dx,dz,FW,pi,tol
           CHARACTER(LEN=65) :: file_name, dir_name, path_name
 

diff --git a/LES_Filtering_setup.f90 b/LES_Filtering_setup.f90
@@ -12,7 +12,7 @@ SUBROUTINE SETUP
 
             USE LES_FILTERING_module,                                           &
                 ONLY : Nx, Ny, Nz, dx, dz, FW, pi, tol,                         &
-                       file_name, dir_name, path_name, VS_CASE
+                       file_name, dir_name, path_name, VS_CASE, FILTER_OX
 
             USE LES_FILTERING_module,                                           &
                 ONLY : X, Y, Z, dy, U, V, W, U_Fil, V_Fil, W_Fil,               &
@@ -54,9 +54,19 @@ SUBROUTINE SETUP
             !   (a) Q-criteria         : 1                                     !
             !   (b) Lambda_2 criteria  : 2                                     !
             !   (c) Lambda_ci criteria : 3                                     !
-            !
+            !                                                                  !
+            !------------------------------------------------------------------!
+            VS_CASE = 1
+
+            !------------------------------------------------------------------!
+            !                       The number of Filter                       !
+            !                                                                  !
+            !   (a) No-Filter     : 0                                          !
+            !   (b) First Filter  : 1                                          !
+            !   (c) Second Filter : 2                                          !
+            !                                                                  !
             !------------------------------------------------------------------!
-            VS_CASE = 3
+            FILTER_OX = 1
 
             !------------------------------------------------------------------!
             !                    Constants for LES filtering                   !
@@ -65,7 +75,7 @@ SUBROUTINE SETUP
             Ny = 257
             Nz = 288
 
-            FW = 16     ! Filter width constant
+            FW = 4     ! Filter width constant
             tol = 1e-8 ! Tolerance for the number of nodes in x,z directions
 
             !------------------------------------------------------------------!