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.

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

Move filter base type under src/ and complete the documentation of filters #1670

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
26 changes: 13 additions & 13 deletions src/.depends
Original file line number Diff line number Diff line change
Expand Up @@ -302,16 +302,16 @@ source_terms/boussinesq_source_term.lo : source_terms/boussinesq_source_term.f90
source_terms/bcknd/cpu/boussinesq_source_term_cpu.lo : source_terms/bcknd/cpu/boussinesq_source_term_cpu.f90 math/math.lo field/field.lo field/field_list.lo config/num_types.lo
source_terms/bcknd/device/boussinesq_source_term_device.lo : source_terms/bcknd/device/boussinesq_source_term_device.f90 math/bcknd/device/device_math.lo field/field.lo field/field_list.lo config/num_types.lo
source_terms/source_term_fctry.lo : source_terms/source_term_fctry.f90 common/utils.lo common/json_utils.lo source_terms/coriolis_source_term.lo source_terms/brinkman_source_term.lo source_terms/boussinesq_source_term.lo source_terms/const_source_term.lo source_terms/source_term.lo
source_terms/brinkman_source_term.lo : source_terms/brinkman_source_term.f90 io/fld_file_output.lo source_terms/brinkman/PDE_filter.lo source_terms/brinkman/filter.lo common/utils.lo source_terms/source_term.lo math/signed_distance.lo common/profiler.lo mesh/point_zone_registry.lo mesh/point_zone.lo config/num_types.lo config/neko_config.lo mesh/tri_mesh.lo math/math.lo common/log.lo common/json_utils.lo io/file.lo source_terms/brinkman/filters.lo field/field_registry.lo math/field_math.lo field/field_list.lo field/field.lo math/bcknd/device/device_math.lo device/device.lo sem/coef.lo mesh/search_tree/aabb.lo
source_terms/brinkman/filters.lo : source_terms/brinkman/filters.f90 source_terms/bcknd/device/filters_device.lo source_terms/bcknd/cpu/filters_cpu.lo common/utils.lo config/num_types.lo config/neko_config.lo field/field.lo
source_terms/brinkman/filter.lo : source_terms/brinkman/filter.f90 field/field.lo common/json_utils.lo sem/coef.lo config/num_types.lo
source_terms/brinkman/PDE_filter.lo : source_terms/brinkman/PDE_filter.f90 math/bcknd/device/device_math.lo common/utils.lo krylov/pc_hsmg.lo krylov/bcknd/sx/pc_jacobi_sx.lo krylov/bcknd/device/pc_jacobi_device.lo krylov/bcknd/cpu/pc_jacobi.lo sem/dofmap.lo config/neko_config.lo common/log.lo math/field_math.lo field/scratch_registry.lo source_terms/brinkman/filter.lo mesh/mesh.lo fluid/pnpn_res.lo gs/gather_scatter.lo common/profiler.lo bc/neumann.lo bc/bc_list.lo krylov/precon.lo krylov/krylov.lo math/ax.lo sem/coef.lo field/field.lo field/field_registry.lo common/json_utils.lo config/num_types.lo
source_terms/brinkman/elementwise_filter.lo : source_terms/brinkman/elementwise_filter.f90 math/bcknd/device/device_math.lo device/device.lo math/tensor.lo math/mxm_wrapper.lo math/matrix.lo sem/speclib.lo common/json_utils.lo config/neko_config.lo common/utils.lo sem/coef.lo field/field.lo math/math.lo source_terms/brinkman/filter.lo config/num_types.lo
source_terms/bcknd/cpu/filters_cpu.lo : source_terms/bcknd/cpu/filters_cpu.f90 config/num_types.lo
source_terms/bcknd/device/filters_device.lo : source_terms/bcknd/device/filters_device.F90 source_terms/bcknd/device/opencl/opencl_filters.lo source_terms/bcknd/device/hip/hip_filters.lo source_terms/bcknd/device/cuda/cuda_filters.lo common/utils.lo math/bcknd/device/device_math.lo config/num_types.lo
source_terms/bcknd/device/cuda/cuda_filters.lo : source_terms/bcknd/device/cuda/cuda_filters.f90 config/num_types.lo
source_terms/bcknd/device/hip/hip_filters.lo : source_terms/bcknd/device/hip/hip_filters.f90 config/num_types.lo
source_terms/bcknd/device/opencl/opencl_filters.lo : source_terms/bcknd/device/opencl/opencl_filters.f90 config/num_types.lo
source_terms/brinkman_source_term.lo : source_terms/brinkman_source_term.f90 io/fld_file_output.lo filter/PDE_filter.lo filter/filter.lo common/utils.lo source_terms/source_term.lo math/signed_distance.lo common/profiler.lo mesh/point_zone_registry.lo mesh/point_zone.lo config/num_types.lo config/neko_config.lo mesh/tri_mesh.lo math/math.lo common/log.lo common/json_utils.lo io/file.lo filter/filters.lo field/field_registry.lo math/field_math.lo field/field_list.lo field/field.lo math/bcknd/device/device_math.lo device/device.lo sem/coef.lo mesh/search_tree/aabb.lo
filter/filters.lo : filter/filters.f90 filter/bcknd/device/filters_device.lo filter/bcknd/cpu/filters_cpu.lo common/utils.lo config/num_types.lo config/neko_config.lo field/field.lo
filter/filter.lo : filter/filter.f90 field/field.lo common/json_utils.lo sem/coef.lo config/num_types.lo
filter/PDE_filter.lo : filter/PDE_filter.f90 math/bcknd/device/device_math.lo common/utils.lo krylov/pc_hsmg.lo krylov/bcknd/sx/pc_jacobi_sx.lo krylov/bcknd/device/pc_jacobi_device.lo krylov/bcknd/cpu/pc_jacobi.lo sem/dofmap.lo config/neko_config.lo common/log.lo math/field_math.lo field/scratch_registry.lo filter/filter.lo mesh/mesh.lo fluid/pnpn_res.lo gs/gather_scatter.lo common/profiler.lo bc/neumann.lo bc/bc_list.lo krylov/precon.lo krylov/krylov.lo math/ax.lo sem/coef.lo field/field.lo field/field_registry.lo common/json_utils.lo config/num_types.lo
filter/elementwise_filter.lo : filter/elementwise_filter.f90 math/bcknd/device/device_math.lo device/device.lo math/tensor.lo math/mxm_wrapper.lo math/matrix.lo sem/speclib.lo common/json_utils.lo config/neko_config.lo common/utils.lo sem/coef.lo field/field.lo math/math.lo filter/filter.lo config/num_types.lo
filter/bcknd/cpu/filters_cpu.lo : filter/bcknd/cpu/filters_cpu.f90 config/num_types.lo
filter/bcknd/device/filters_device.lo : filter/bcknd/device/filters_device.F90 filter/bcknd/device/opencl/opencl_filters.lo filter/bcknd/device/hip/hip_filters.lo filter/bcknd/device/cuda/cuda_filters.lo common/utils.lo math/bcknd/device/device_math.lo config/num_types.lo
filter/bcknd/device/cuda/cuda_filters.lo : filter/bcknd/device/cuda/cuda_filters.f90 config/num_types.lo
filter/bcknd/device/hip/hip_filters.lo : filter/bcknd/device/hip/hip_filters.f90 config/num_types.lo
filter/bcknd/device/opencl/opencl_filters.lo : filter/bcknd/device/opencl/opencl_filters.f90 config/num_types.lo
les/les_model.lo : les/les_model.f90 math/bcknd/device/device_math.lo math/math.lo device/device.lo config/neko_config.lo gs/gs_ops.lo sem/coef.lo sem/dofmap.lo field/field_registry.lo field/field.lo config/num_types.lo
les/les_model_fctry.lo : les/les_model_fctry.f90 common/utils.lo les/sigma.lo les/dynamic_smagorinsky.lo les/smagorinsky.lo les/vreman.lo les/les_model.lo
les/vreman.lo : les/vreman.f90 common/log.lo sem/coef.lo les/bcknd/device/vreman_device.lo les/bcknd/cpu/vreman_cpu.lo config/neko_config.lo common/json_utils.lo sem/dofmap.lo les/les_model.lo config/num_types.lo
Expand All @@ -322,9 +322,9 @@ les/smagorinsky.lo : les/smagorinsky.f90 common/log.lo sem/coef.lo les/bcknd/dev
les/bcknd/cpu/smagorinsky_cpu.lo : les/bcknd/cpu/smagorinsky_cpu.f90 math/math.lo gs/gs_ops.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo field/field_list.lo config/num_types.lo
les/bcknd/device/smagorinsky_device.lo : les/bcknd/device/smagorinsky_device.f90 les/bcknd/device/device_smagorinsky_nut.lo math/bcknd/device/device_math.lo gs/gs_ops.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo field/field_list.lo config/num_types.lo
les/bcknd/device/device_smagorinsky_nut.lo : les/bcknd/device/device_smagorinsky_nut.F90 comm/comm.lo common/utils.lo config/num_types.lo
les/dynamic_smagorinsky.lo : les/dynamic_smagorinsky.f90 les/bcknd/device/dynamic_smagorinsky_device.lo common/log.lo les/bcknd/cpu/dynamic_smagorinsky_cpu.lo source_terms/brinkman/elementwise_filter.lo sem/coef.lo config/neko_config.lo common/utils.lo common/json_utils.lo sem/dofmap.lo les/les_model.lo field/field.lo field/field_list.lo math/math.lo config/num_types.lo
les/bcknd/cpu/dynamic_smagorinsky_cpu.lo : les/bcknd/cpu/dynamic_smagorinsky_cpu.f90 gs/gs_ops.lo source_terms/brinkman/elementwise_filter.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo math/math.lo field/field_list.lo config/num_types.lo
les/bcknd/device/dynamic_smagorinsky_device.lo : les/bcknd/device/dynamic_smagorinsky_device.f90 les/bcknd/device/device_dynamic_smagorinsky_nut.lo math/bcknd/device/device_math.lo gs/gs_ops.lo source_terms/brinkman/elementwise_filter.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo field/field_list.lo config/num_types.lo
les/dynamic_smagorinsky.lo : les/dynamic_smagorinsky.f90 les/bcknd/device/dynamic_smagorinsky_device.lo common/log.lo les/bcknd/cpu/dynamic_smagorinsky_cpu.lo filter/elementwise_filter.lo sem/coef.lo config/neko_config.lo common/utils.lo common/json_utils.lo sem/dofmap.lo les/les_model.lo field/field.lo field/field_list.lo math/math.lo config/num_types.lo
les/bcknd/cpu/dynamic_smagorinsky_cpu.lo : les/bcknd/cpu/dynamic_smagorinsky_cpu.f90 gs/gs_ops.lo filter/elementwise_filter.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo math/math.lo field/field_list.lo config/num_types.lo
les/bcknd/device/dynamic_smagorinsky_device.lo : les/bcknd/device/dynamic_smagorinsky_device.f90 les/bcknd/device/device_dynamic_smagorinsky_nut.lo math/bcknd/device/device_math.lo gs/gs_ops.lo filter/elementwise_filter.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo field/field_list.lo config/num_types.lo
les/bcknd/device/device_dynamic_smagorinsky_nut.lo : les/bcknd/device/device_dynamic_smagorinsky_nut.F90 comm/comm.lo common/utils.lo config/num_types.lo
les/sigma.lo : les/sigma.f90 common/log.lo sem/coef.lo les/bcknd/device/sigma_device.lo les/bcknd/cpu/sigma_cpu.lo config/neko_config.lo common/utils.lo common/json_utils.lo sem/dofmap.lo les/les_model.lo field/field.lo config/num_types.lo
les/bcknd/cpu/sigma_cpu.lo : les/bcknd/cpu/sigma_cpu.f90 math/math.lo gs/gs_ops.lo sem/coef.lo math/operators.lo field/field.lo field/field_registry.lo field/scratch_registry.lo field/field_list.lo config/num_types.lo
Expand Down
30 changes: 15 additions & 15 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,15 @@ neko_fortran_SOURCES = \
source_terms/bcknd/device/boussinesq_source_term_device.f90\
source_terms/source_term_fctry.f90\
source_terms/brinkman_source_term.f90\
source_terms/brinkman/filters.f90\
source_terms/brinkman/filter.f90\
source_terms/brinkman/PDE_filter.f90\
source_terms/brinkman/elementwise_filter.f90\
source_terms/bcknd/cpu/filters_cpu.f90\
source_terms/bcknd/device/filters_device.F90\
source_terms/bcknd/device/cuda/cuda_filters.f90\
source_terms/bcknd/device/hip/hip_filters.f90\
source_terms/bcknd/device/opencl/opencl_filters.f90\
filter/filters.f90\
filter/filter.f90\
filter/PDE_filter.f90\
filter/elementwise_filter.f90\
filter/bcknd/cpu/filters_cpu.f90\
filter/bcknd/device/filters_device.F90\
filter/bcknd/device/cuda/cuda_filters.f90\
filter/bcknd/device/hip/hip_filters.f90\
filter/bcknd/device/opencl/opencl_filters.f90\
les/les_model.f90\
les/les_model_fctry.f90\
les/vreman.f90\
Expand Down Expand Up @@ -391,7 +391,7 @@ libneko_la_SOURCES += \
fluid/stress_formulation/bcknd/device/hip/pnpn_stress_res.hip\
scalar/bcknd/device/hip/scalar_residual.hip\
sem/bcknd/device/hip/coef.hip\
source_terms/bcknd/device/hip/filters.hip\
filter/bcknd/device/hip/filters.hip\
les/bcknd/device/hip/sigma_nut.hip\
les/bcknd/device/hip/vreman_nut.hip\
les/bcknd/device/hip/smagorinsky_nut.hip\
Expand Down Expand Up @@ -434,7 +434,7 @@ libneko_la_SOURCES += \
fluid/stress_formulation/bcknd/device/cuda/pnpn_stress_res.cu\
scalar/bcknd/device/cuda/scalar_residual.cu\
sem/bcknd/device/cuda/coef.cu\
source_terms/bcknd/device/cuda/filters.cu\
filter/bcknd/device/cuda/filters.cu\
les/bcknd/device/cuda/sigma_nut.cu\
les/bcknd/device/cuda/vreman_nut.cu\
les/bcknd/device/cuda/smagorinsky_nut.cu\
Expand Down Expand Up @@ -473,7 +473,7 @@ libneko_la_SOURCES += \
fluid/bcknd/device/opencl/pnpn_res.c\
scalar/bcknd/device/opencl/scalar_residual.c\
sem/bcknd/device/opencl/coef.c\
source_terms/bcknd/device/opencl/filters.c
filter/bcknd/device/opencl/filters.c

%.cl.h: %.cl
bash ./scripts/cltostring.sh $<
Expand Down Expand Up @@ -664,9 +664,9 @@ EXTRA_DIST = \
sem/bcknd/device/opencl/coef_kernel.cl\
math/bcknd/device/device_mpi_reduce.h\
math/bcknd/device/device_mpi_op.h\
source_terms/bcknd/device/cuda/filter_kernels.h\
source_terms/bcknd/device/hip/filter_kernels.h\
source_terms/bcknd/device/opencl/filter_kernels.cl\
filter/bcknd/device/cuda/filter_kernels.h\
filter/bcknd/device/hip/filter_kernels.h\
filter/bcknd/device/opencl/filter_kernels.cl\
device/opencl/jit.h\
device/opencl/prgm_lib.h\
device/opencl/check.h\
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading