Update 2D Taylor Green Vortex

Author: haochey

src/pre_process/m_check_patches.fpp

@@ -314,7 +314,7 @@ contains
             .or. &
             patch_icpp(patch_id)%length_y <= 0d0 &
             .or. &
-            patch_icpp(patch_id)%vortex_l <= 0d0) then
+            patch_icpp(patch_id)%vel(2)<= 0d0) then
 
             call s_mpi_abort('Inconsistency(ies) detected in '// &
             'geometric parameters of Taylor Green '// &

src/pre_process/m_global_parameters.fpp

@@ -279,8 +279,6 @@ contains
             patch_icpp(i)%alpha_rho = dflt_real
             patch_icpp(i)%rho = dflt_real
             patch_icpp(i)%vel = dflt_real
-            patch_icpp(i)%vortex_l = dflt_real
-            patch_icpp(i)%vortex_vel = dflt_real
             patch_icpp(i)%pres = dflt_real
             patch_icpp(i)%alpha = dflt_real
             patch_icpp(i)%gamma = dflt_real

src/pre_process/m_mpi_proxy.fpp

@@ -89,8 +89,6 @@ contains
             call MPI_BCAST(patch_icpp(i)%tau_e(1), 6, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
             call MPI_BCAST(patch_icpp(i)%alpha_rho(1), num_fluids_max, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
             call MPI_BCAST(patch_icpp(i)%alpha(1), num_fluids_max - 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
-            call MPI_BCAST(patch_icpp(i)%vortex_l, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
-            call MPI_BCAST(patch_icpp(i)%vortex_vel, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
         end do
 
         ! Fluids physical parameters

src/pre_process/m_patches.f90

@@ -711,8 +711,10 @@ subroutine s_2D_TaylorGreen_Vortex(patch_id, patch_id_fp, q_prim_vf) ! ---------
         ! ensure that only the current patch contributes to the fluid
         ! state in the cells that this patch covers.
         eta = 1d0
-        U0 = patch_icpp(patch_id)%vortex_vel
-        L0 = patch_icpp(patch_id)%vortex_l
+        ! U0 is the characteristic velocity of the vortex
+        U0 = patch_icpp(patch_id)%vel(1) 
+        ! L0 is the characteristic length of the vortex
+        L0 = patch_icpp(patch_id)%vel(2)
         ! Checking whether the patch covers a particular cell in the
         ! domain and verifying whether the current patch has the
         ! permission to write to that cell. If both queries check out,
@@ -732,7 +734,7 @@ subroutine s_2D_TaylorGreen_Vortex(patch_id, patch_id_fp, q_prim_vf) ! ---------
                     ! Assign Parameters =========================================================
                     q_prim_vf(mom_idx%beg  )%sf(i,j,0) = U0*SIN(x_cc(i)/L0)*COS(y_cc(j)/L0)
                     q_prim_vf(mom_idx%end  )%sf(i,j,0) = -U0*COS(x_cc(i)/L0)*SIN(y_cc(j)/L0)
-                    q_prim_vf(E_idx        )%sf(i,j,0) = 100000d0 + (COS(2*x_cc(i))/L0 + &
+                    q_prim_vf(E_idx        )%sf(i,j,0) = patch_icpp(patch_id)%pres + (COS(2*x_cc(i))/L0 + &
                                                             COS(2*y_cc(j))/L0)* &
                                                             (q_prim_vf(1)%sf(i,j,0)*U0*U0)/16
                     ! ================================================================================
@@ -1014,10 +1016,10 @@ subroutine s_2D_analytical(patch_id, patch_id_fp, q_prim_vf) ! -----------------
                     ! ================================================================================
 
                     ! Taylor Green Vortex===============================================
-                    q_prim_vf(mom_idx%beg  )%sf(i,j,0) = U0*SIN(x_cc(i)/l)*COS(y_cc(j)/l)
-                    q_prim_vf(mom_idx%end  )%sf(i,j,0) = -U0*COS(x_cc(i)/l)*SIN(y_cc(j)/l)
-                    q_prim_vf(E_idx        )%sf(i,j,0) = 100000d0 + (COS(2*x_cc(i))/l + COS(2*y_cc(j))/l)* &
-                                                            (q_prim_vf(1)%sf(i,j,0)*U0*U0)/16
+                    ! q_prim_vf(mom_idx%beg  )%sf(i,j,0) = U0*SIN(x_cc(i)/l)*COS(y_cc(j)/l)
+                    ! q_prim_vf(mom_idx%end  )%sf(i,j,0) = -U0*COS(x_cc(i)/l)*SIN(y_cc(j)/l)
+                    ! q_prim_vf(E_idx        )%sf(i,j,0) = 100000d0 + (COS(2*x_cc(i))/l + COS(2*y_cc(j))/l)* &
+                    !                                         (q_prim_vf(1)%sf(i,j,0)*U0*U0)/16
                     ! ================================================================================
 
                 end if