Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/identify relaxation options #14

Merged
merged 9 commits into from
May 7, 2024
Merged

Feature/identify relaxation options #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e727423
Introduced mus_relaxation_header_type to store additional options fro…
KannanMasilamani May 3, 2024
471da0e
Renamed compute routines of bgk, mrt and trt relaxation of fluid and …
KannanMasilamani May 3, 2024
088f7c7
Updated compute routine names in utests
KannanMasilamani May 4, 2024
8fe61f6
Updated musubi.lua in examples which uses bgk_improved, bgk_generic, …
KannanMasilamani May 4, 2024
920f04d
Added naming guideline for compute kernels in mus_scheme_type_module
KannanMasilamani May 6, 2024
12b04a9
Corrected abort messages in mus_initFluid_module and mus_initFluidInc…
KannanMasilamani May 7, 2024
346b69e
Removed additional indentation in mus_mrtRelaxation_module
KannanMasilamani May 7, 2024
39b214b
Formatted files which are touch in this pull request according to cod…
KannanMasilamani May 7, 2024
1fd4e21
Fixed minor formatting in mus_relaxationParam_module. Improved code d…
KannanMasilamani May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion examples/fluid/benchmark/Channel2D/C2D_BoundaryConditions/C2D_BC_MfrEq_PressEq/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,10 @@ physics = {
identify = {
label = '2D',
layout = 'd2q9', -- Stencil
relaxation = 'mrt_generic', -- Collision
relaxation = {
name = 'mrt', -- Collision
variant = 'standard_no_opt', -- a variant of collision
},
kind = 'fluid' -- Physics
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion .../fluid/benchmark/Channel2D/C2D_BoundaryConditions/C2D_BC_PressExpol_PressExpol/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ physics = {
identify = {
label = '2D',
layout = 'd2q9', -- Stencil
relaxation = 'bgk_improved', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'improved', -- a variant of collision
},
kind = 'fluid' -- Physics
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion examples/fluid/benchmark/Channel2D/C2D_BoundaryConditions/C2D_BC_VelBB_PressExpol/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ physics = {
identify = {
label = '2D',
layout = 'd2q9', -- Stencil
relaxation = 'bgk_improved', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'improved', -- a variant of collision
},
kind = 'fluid' -- Physics
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion ...ples/fluid/benchmark/Channel2D/C2D_BoundaryConditions/C2D_BC_VelBFL_PressExpol/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ physics = {
identify = {
label = '2D',
layout = 'd2q9', -- Stencil
relaxation = 'bgk_improved', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'improved', -- a variant of collision
},
kind = 'fluid' -- Physics
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion examples/fluid/benchmark/Channel2D/C2D_BoundaryConditions/C2D_BC_VelEq_PressEq/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ physics = {
identify = {
label = '2D',
layout = 'd2q9', -- Stencil
relaxation = 'bgk_improved', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'improved', -- a variant of collision
},
kind = 'fluid' -- Physics
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion ...enchmark/Channel2D/C2D_BoundaryConditions/C2D_BC_VelNonEqExpol_PressNonEqExpol/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ physics = {
identify = {
label = '2D',
layout = 'd2q9', -- Stencil
relaxation = 'bgk_improved', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'improved', -- a variant of collision
},
kind = 'fluid' -- Physics
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion examples/fluid/benchmark/viscousSpongeLayer/VSL_Box3D/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ physics = {
--! [Scheme identifier]
identify = {
kind = 'fluid', -- Physics
relaxation = 'bgk_improved', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'improved', -- a variant of collision
},
layout = 'd3q27' -- Stencil
}
--! [Scheme identifier]
Expand Down
5 changes: 4 additions & 1 deletion examples/fluid_incompressible/benchmark/Channel3D/C3D_Simple/musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@ physics = {
identify = {
label = '3D',
layout = 'd3q19', -- Stencil
relaxation = 'bgk_generic', -- Collision
relaxation = {
name = 'bgk', -- Collision
variant = 'standard_no_opt', -- a variant of collision
},
kind = 'fluid_incompressible' -- Physics
}
--! [Scheme identifier]
Expand Down
12 changes: 6 additions & 6 deletions musubi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ debug = {

-- scheme model for single fluid simulation
identify = {
kind = 'fluid', -- simulation type of this scheme
-- ( fluid, fluid_incomp, passive_scalar, ...)
relaxation = 'bgk', -- relaxation type (bgk, mrt, ...)
-- Scheme layout
-- This describes the stencil to use in the simulation.
layout = 'd3q19'
kind = 'fluid', -- simulation type of this scheme
-- ( fluid, fluid_incomp, passive_scalar, ...)
relaxation = 'bgk', -- relaxation type (bgk, mrt, ...)
-- Scheme layout
-- This describes the stencil to use in the simulation.
layout = 'd3q19'
}

-- field which defines fluid or species
Expand Down
11 changes: 6 additions & 5 deletions source/compute/mus_compute_bgk_module.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module mus_bgk_module

private

public :: bgk_advRel_generic
public :: mus_advRel_kCFD_rBGK_vStdNoOpt_l
public :: bgk_advRel_flekkoy
public :: bgk_advRel_flekkoy_noFluid

Expand Down Expand Up @@ -256,9 +256,10 @@ contains
!! This subroutine interface must match the abstract interface definition
!! [[kernel]] in scheme/[[mus_scheme_type_module]].f90 in order to be callable
!! via [[mus_scheme_type:compute]] function pointer.
subroutine bgk_advRel_generic( fieldProp, inState, outState, auxField, &
& neigh, nElems, nSolve, level, layout, &
& params, varSys, derVarPos )
subroutine mus_advRel_kCFD_rBGK_vStdNoOpt_l( fieldProp, inState, outState, &
& auxField, neigh, nElems, nSolve,&
& level, layout, params, varSys, &
& derVarPos )
! -------------------------------------------------------------------- !
!> Array of field properties (fluid or species)
type(mus_field_prop_type), intent(in) :: fieldProp(:)
Expand Down Expand Up @@ -337,7 +338,7 @@ contains

end do nodeloop

end subroutine bgk_advRel_generic
end subroutine mus_advRel_kCFD_rBGK_vStdNoOpt_l
! ****************************************************************************** !

end module mus_bgk_module
Expand Down
58 changes: 33 additions & 25 deletions source/compute/mus_compute_d2q9_module.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ module mus_d2q9_module

private

public :: bgk_improved_advRel_d2q9
public :: bgk_advRel_d2q9
public :: mrt_advRel_d2q9
public :: mrt_advRel_d2q9_incomp
public :: bgk_advRel_d2q9_incomp
public :: mus_advRel_kFluid_rBGK_vImproved_lD2Q9
public :: mus_advRel_kFluid_rBGK_vStd_lD2Q9
public :: mus_advRel_kFluid_rMRT_vStd_lD2Q9
public :: mus_advRel_kFluidIncomp_rMRT_vStd_lD2Q9
public :: mus_advRel_kFluidIncomp_rBGK_vStd_lD2Q9
public :: bgk_Regularized_d2q9
public :: bgk_RecursiveRegularized_d2q9
public :: bgk_HybridRecursiveRegularized_d2q9
Expand Down Expand Up @@ -103,9 +103,11 @@ contains
!! This subroutine interface must match the abstract interface definition
!! [[kernel]] in scheme/[[mus_scheme_type_module]].f90 in order to be callable
!! via [[mus_scheme_type;compute]] function pointer.
subroutine bgk_improved_advRel_d2q9( fieldProp, inState, outState, auxField, &
& neigh, nElems, nSolve, level, layout, &
& params, varSys, derVarPos )
subroutine mus_advRel_kFluid_rBGK_vImproved_lD2Q9( fieldProp, inState, &
& outState, auxField, neigh,&
& nElems, nSolve, level, &
& layout, params, varSys, &
& derVarPos )
! -------------------------------------------------------------------- !
!> Array of field properties (fluid or species)
type(mus_field_prop_type), intent(in) :: fieldProp(:)
Expand Down Expand Up @@ -231,7 +233,7 @@ contains
end do nodeloop
!$omp end do nowait

end subroutine bgk_improved_advRel_d2q9
end subroutine mus_advRel_kFluid_rBGK_vImproved_lD2Q9
! **************************************************************************** !

! **************************************************************************** !
Expand All @@ -242,9 +244,10 @@ contains
!! This subroutine interface must match the abstract interface definition
!! [[kernel]] in scheme/[[mus_scheme_type_module]].f90 in order to be callable
!! via [[mus_scheme_type:compute]] function pointer.
subroutine bgk_advRel_d2q9( fieldProp, inState, outState, auxField, &
& neigh, nElems, nSolve, level, layout, &
& params, varSys, derVarPos )
subroutine mus_advRel_kFluid_rBGK_vStd_lD2Q9( fieldProp, inState, outState, &
& auxField, neigh, nElems, &
& nSolve, level, layout, params,&
& varSys, derVarPos )
! -------------------------------------------------------------------- !
!> Array of field properties (fluid or species)
type(mus_field_prop_type), intent(in) :: fieldProp(:)
Expand Down Expand Up @@ -390,7 +393,7 @@ contains
end do nodeloop
!$omp end do nowait

end subroutine bgk_advRel_d2q9
end subroutine mus_advRel_kFluid_rBGK_vStd_lD2Q9
! **************************************************************************** !

! **************************************************************************** !
Expand All @@ -400,9 +403,10 @@ contains
!! This subroutine interface must match the abstract interface definition
!! [[kernel]] in scheme/[[mus_scheme_type_module]].f90 in order to be callable
!! via [[mus_scheme_type:compute]] function pointer.
subroutine mrt_advRel_d2q9( fieldProp, inState, outState, auxField, &
& neigh, nElems, nSolve, level, layout, &
& params, varSys, derVarPos )
subroutine mus_advRel_kFluid_rMRT_vStd_lD2Q9( fieldProp, inState, outState, &
& auxField, neigh, nElems, &
& nSolve, level, layout, params,&
& varSys, derVarPos )
! -------------------------------------------------------------------- !
!> Array of field properties (fluid or species)
type(mus_field_prop_type), intent(in) :: fieldProp(:)
Expand Down Expand Up @@ -546,7 +550,7 @@ contains
enddo nodeloop
!$omp end do nowait

end subroutine mrt_advRel_d2q9
end subroutine mus_advRel_kFluid_rMRT_vStd_lD2Q9
! **************************************************************************** !

! **************************************************************************** !
Expand All @@ -556,9 +560,11 @@ contains
!! This subroutine interface must match the abstract interface definition
!! [[kernel]] in scheme/[[mus_scheme_type_module]].f90 in order to be callable
!! via [[mus_scheme_type:compute]] function pointer.
subroutine mrt_advRel_d2q9_incomp( fieldProp, inState, outState, auxField, &
& neigh, nElems, nSolve, level, layout, &
& params, varSys, derVarPos )
subroutine mus_advRel_kFluidIncomp_rMRT_vStd_lD2Q9( fieldProp, inState, &
& outState, auxField, &
& neigh, nElems, nSolve, &
& level, layout, params, &
& varSys, derVarPos )
! -------------------------------------------------------------------- !
!> Array of field properties (fluid or species)
type(mus_field_prop_type), intent(in) :: fieldProp(:)
Expand Down Expand Up @@ -701,7 +707,7 @@ contains
enddo nodeloop
!$omp end do nowait

end subroutine mrt_advRel_d2q9_incomp
end subroutine mus_advRel_kFluidIncomp_rMRT_vStd_lD2Q9
! **************************************************************************** !

! **************************************************************************** !
Expand All @@ -712,9 +718,11 @@ contains
!! This subroutine interface must match the abstract interface definition
!! [[kernel]] in scheme/[[mus_scheme_type_module]].f90 in order to be callable
!! via [[mus_scheme_type:compute]] function pointer.
subroutine bgk_advRel_d2q9_incomp( fieldProp, inState, outState, auxField, &
& neigh, nElems, nSolve, level, layout, &
& params, varSys, derVarPos )
subroutine mus_advRel_kFluidIncomp_rBGK_vStd_lD2Q9( fieldProp, inState, &
& outState, auxField, &
& neigh, nElems, nSolve, &
& level, layout, params, &
& varSys, derVarPos )
! -------------------------------------------------------------------- !
!> Array of field properties (fluid or species)
type(mus_field_prop_type), intent(in) :: fieldProp(:)
Expand Down Expand Up @@ -827,7 +835,7 @@ contains
end do nodeloop
!$omp end do nowait

end subroutine bgk_advRel_d2q9_incomp
end subroutine mus_advRel_kFluidIncomp_rBGK_vStd_lD2Q9
! **************************************************************************** !

! ****************************************************************************** !
Expand Down
Loading