Skip to content
Open
Show file tree
Hide file tree
Changes from 15 commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Develop

- Introduces a global subroutine `import_fields` to read and import fld data,
with interpolation capabilities.
- Added `vector_list_t` and `name` to `vector_t`.
- Rework hash table iterators, significantly faster (O(tsize) => O(entries)
- Remove redundant directory in `site-packages` when installing pyneko
Expand Down
11 changes: 6 additions & 5 deletions src/.depends
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ io/re2_file.lo : io/re2_file.f90 comm/comm.lo adt/htable.lo io/format/re2.lo com
io/rea_file.lo : io/rea_file.f90 common/utils.lo common/log.lo adt/htable.lo common/datadist.lo comm/comm.lo io/map_file.lo io/re2_file.lo io/format/rea.lo io/format/map.lo mesh/point.lo mesh/mesh.lo config/num_types.lo io/generic_file.lo
io/bp_file.lo : io/bp_file.F90 io/buffer/buffer.lo io/buffer/buffer_4d_npar.lo io/buffer/buffer_4d.lo io/buffer/buffer_1d.lo comm/comm.lo common/datadist.lo common/utils.lo io/fld_file_data.lo common/structs.lo mesh/mesh.lo sem/space.lo math/vector.lo sem/dofmap.lo field/field_list.lo io/generic_file.lo config/num_types.lo
io/fld_file.lo : io/fld_file.f90 comm/mpi_types.lo math/math.lo common/datadist.lo comm/comm.lo common/utils.lo mesh/mesh.lo common/log.lo io/fld_file_data.lo math/vector.lo common/structs.lo sem/space.lo sem/dofmap.lo field/field_list.lo field/field.lo io/generic_file.lo config/num_types.lo
io/fld_file_data.lo : io/fld_file_data.f90 mesh/mesh.lo common/utils.lo global_interpolation/global_interpolation.lo sem/space.lo sem/dofmap.lo field/field.lo math/vector.lo math/math.lo config/num_types.lo
io/import_field_utils.lo : io/import_field_utils.f90 device/device.lo common/log.lo common/utils.lo field/field_list.lo field/field.lo config/num_types.lo io/file.lo io/fld_file_data.lo
io/fld_file_data.lo : io/fld_file_data.f90 mesh/mesh.lo common/utils.lo global_interpolation/global_interpolation.lo sem/space.lo sem/dofmap.lo device/device.lo common/log.lo field/field_list.lo field/field.lo sem/interpolation.lo math/vector.lo math/math.lo config/num_types.lo
io/vtk_file.lo : io/vtk_file.f90 comm/comm.lo common/log.lo mesh/tri_mesh.lo mesh/tet_mesh.lo field/mesh_field.lo sem/dofmap.lo field/field.lo mesh/mesh.lo common/utils.lo io/generic_file.lo config/num_types.lo
io/stl_file.lo : io/stl_file.f90 io/format/stl.lo comm/comm.lo comm/mpi_types.lo mesh/point.lo common/log.lo mesh/tri_mesh.lo io/generic_file.lo config/num_types.lo
io/nmsh_file.lo : io/nmsh_file.f90 common/log.lo comm/mpi_types.lo common/datadist.lo mesh/element.lo io/format/nmsh.lo adt/tuple.lo mesh/point.lo common/utils.lo mesh/mesh.lo config/num_types.lo comm/comm.lo io/generic_file.lo
Expand Down Expand Up @@ -254,7 +255,7 @@ fluid/euler_res.lo : fluid/euler_res.f90 time_schemes/runge_kutta_scheme.lo conf
fluid/euler_res_fctry.lo : fluid/euler_res_fctry.f90 fluid/bcknd/device/euler_res_device.lo fluid/bcknd/cpu/euler_res_cpu.lo config/neko_config.lo fluid/euler_res.lo
fluid/fluid_stats.lo : fluid/fluid_stats.f90 common/utils.lo config/neko_config.lo device/device.lo common/stats_quant.lo field/field_list.lo field/field.lo sem/coef.lo math/operators.lo math/math.lo config/num_types.lo math/bcknd/device/device_math.lo field/mean_field.lo
fluid/flow_profile.lo : fluid/flow_profile.f90 config/num_types.lo
fluid/flow_ic.lo : fluid/flow_ic.f90 math/operators.lo field/field_list.lo sem/space.lo sem/interpolation.lo global_interpolation/global_interpolation.lo io/file.lo io/fld_file.lo io/fld_file_data.lo mesh/point_zone_registry.lo mesh/point_zone.lo common/json_utils.lo common/user_intf.lo math/bcknd/device/device_math.lo math/math.lo sem/coef.lo common/utils.lo field/field.lo device/device.lo fluid/flow_profile.lo config/neko_config.lo gs/gather_scatter.lo common/log.lo config/num_types.lo
fluid/flow_ic.lo : fluid/flow_ic.f90 math/operators.lo field/field_list.lo sem/space.lo sem/interpolation.lo global_interpolation/global_interpolation.lo io/file.lo io/fld_file.lo io/fld_file_data.lo mesh/point_zone_registry.lo mesh/point_zone.lo common/json_utils.lo common/user_intf.lo math/bcknd/device/device_math.lo math/math.lo sem/coef.lo common/utils.lo field/field.lo device/device.lo io/import_field_utils.lo fluid/flow_profile.lo config/neko_config.lo gs/gather_scatter.lo common/log.lo config/num_types.lo
fluid/advection.lo : fluid/advection.f90 time_schemes/time_scheme_controller.lo field/field_series.lo sem/coef.lo field/field.lo sem/space.lo config/num_types.lo
fluid/advection_fctry.lo : fluid/advection_fctry.f90 fluid/bcknd/advection/adv_dummy.lo fluid/bcknd/advection/adv_oifs.lo fluid/bcknd/advection/adv_no_dealias.lo fluid/bcknd/advection/adv_dealias.lo common/json_utils.lo fluid/advection.lo
fluid/bcknd/advection/adv_dealias.lo : fluid/bcknd/advection/adv_dealias.f90 device/device.lo sem/interpolation.lo math/operators.lo config/neko_config.lo math/bcknd/device/device_math.lo sem/coef.lo field/field.lo sem/space.lo math/math.lo config/num_types.lo fluid/advection.lo
Expand Down Expand Up @@ -321,7 +322,7 @@ scalar/scalar_pnpn_bc_fctry.lo : scalar/scalar_pnpn_bc_fctry.f90 bc/field_dirich
scalar/scalar_aux.lo : scalar/scalar_aux.f90 common/time_state.lo common/utils.lo common/log.lo krylov/krylov.lo
scalar/scalar_residual.lo : scalar/scalar_residual.f90 config/num_types.lo mesh/mesh.lo sem/space.lo bc/facet_normal.lo sem/coef.lo field/field.lo math/ax.lo gs/gather_scatter.lo
scalar/scalar_residual_fctry.lo : scalar/scalar_residual_fctry.f90 scalar/bcknd/sx/scalar_residual_sx.lo scalar/bcknd/cpu/scalar_residual_cpu.lo scalar/bcknd/device/scalar_residual_device.lo config/neko_config.lo scalar/scalar_residual.lo
scalar/scalar_ic.lo : scalar/scalar_ic.f90 field/field_list.lo sem/space.lo sem/interpolation.lo global_interpolation/global_interpolation.lo io/file.lo common/checkpoint.lo io/fld_file.lo io/fld_file_data.lo common/log.lo mesh/point_zone_registry.lo mesh/point_zone.lo common/json_utils.lo common/user_intf.lo math/math.lo sem/coef.lo common/utils.lo field/field.lo device/device.lo math/bcknd/device/device_math.lo config/num_types.lo config/neko_config.lo gs/gather_scatter.lo
scalar/scalar_ic.lo : scalar/scalar_ic.f90 io/import_field_utils.lo field/field_list.lo sem/space.lo sem/interpolation.lo global_interpolation/global_interpolation.lo io/file.lo common/checkpoint.lo io/fld_file.lo io/fld_file_data.lo common/log.lo mesh/point_zone_registry.lo mesh/point_zone.lo common/json_utils.lo common/user_intf.lo math/math.lo sem/coef.lo common/utils.lo field/field.lo device/device.lo math/bcknd/device/device_math.lo config/num_types.lo config/neko_config.lo gs/gather_scatter.lo
scalar/scalar_source_term.lo : scalar/scalar_source_term.f90 common/user_intf.lo sem/coef.lo field/field_list.lo field/field.lo source_terms/source_term_handler.lo source_terms/source_term.lo source_terms/user_source_term.lo
scalar/scalar_stats.lo : scalar/scalar_stats.f90 config/neko_config.lo common/stats_quant.lo field/field_list.lo field/field.lo sem/coef.lo math/operators.lo math/math.lo config/num_types.lo math/bcknd/device/device_math.lo field/mean_field.lo
scalar/bcknd/cpu/scalar_residual_cpu.lo : scalar/bcknd/cpu/scalar_residual_cpu.f90 math/math.lo config/num_types.lo mesh/mesh.lo sem/space.lo sem/coef.lo field/field.lo math/ax.lo scalar/scalar_residual.lo
Expand Down Expand Up @@ -354,7 +355,7 @@ 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/field_source_term.lo source_terms/sponge_source_term.lo source_terms/gradient_jump_penalty.lo source_terms/centrifugal_source_term.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/sponge_source_term.lo : source_terms/sponge_source_term.f90 io/fld_file_output.lo comm/comm.lo registries/scratch_registry.lo io/file.lo sem/coef.lo field/field_list.lo fluid/flow_ic.lo simulation_components/simcomp_executor.lo case.lo source_terms/source_term.lo config/neko_config.lo common/log.lo math/math.lo common/time_state.lo math/bcknd/device/device_math.lo device/device.lo common/utils.lo common/json_utils.lo field/field.lo registries/registry.lo config/num_types.lo
source_terms/sponge_source_term.lo : source_terms/sponge_source_term.f90 io/fld_file_output.lo comm/comm.lo registries/scratch_registry.lo io/file.lo sem/coef.lo field/field_list.lo io/import_field_utils.lo simulation_components/simcomp_executor.lo case.lo source_terms/source_term.lo config/neko_config.lo common/log.lo math/math.lo common/time_state.lo math/bcknd/device/device_math.lo device/device.lo common/utils.lo common/json_utils.lo field/field.lo registries/registry.lo config/num_types.lo
source_terms/brinkman_source_term.lo : source_terms/brinkman_source_term.f90 sem/space.lo sem/interpolation.lo global_interpolation/global_interpolation.lo common/time_state.lo io/fld_file_data.lo 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 common/log.lo common/json_utils.lo io/file.lo filter/mappings.lo registries/registry.lo math/field_math.lo math/bcknd/device/device_math.lo math/math.lo field/field_list.lo field/field.lo device/device.lo sem/coef.lo mesh/search_tree/aabb.lo
filter/mappings.lo : filter/mappings.f90 filter/bcknd/device/mappings_device.lo filter/bcknd/cpu/mappings_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
Expand Down Expand Up @@ -399,4 +400,4 @@ wall_models/spalding.lo : wall_models/spalding.f90 registries/scratch_registry.l
wall_models/bcknd/cpu/spalding_cpu.lo : wall_models/bcknd/cpu/spalding_cpu.f90 common/log.lo config/num_types.lo
wall_models/bcknd/device/spalding_device.lo : wall_models/bcknd/device/spalding_device.F90 common/utils.lo config/num_types.lo
wall_models/wall_model_fctry.lo : wall_models/wall_model_fctry.f90 common/utils.lo wall_models/rough_log_law.lo wall_models/spalding.lo les/vreman.lo wall_models/wall_model.lo
neko.lo : neko.f90 common/user_access_singleton.lo source_terms/source_term.lo common/time_step_controller.lo common/time_based_controller.lo simulation_components/lambda2.lo simulation_components/force_torque.lo simulation_components/weak_gradient_simcomp.lo simulation_components/gradient_simcomp.lo simulation_components/curl_simcomp.lo simulation_components/divergence_simcomp.lo simulation_components/derivative_simcomp.lo simulation_components/field_writer.lo les/les_model.lo common/json_utils.lo common/runtime_statistics.lo bc/field_dirichlet_vector.lo bc/field_dirichlet.lo mesh/point_zone_registry.lo mesh/point_zones/sphere_point_zone.lo mesh/point_zones/box_point_zone.lo mesh/point_zone.lo sem/point_interpolator.lo common/time_interpolator.lo io/data_streamer.lo simulation_components/simcomp_executor.lo registries/scratch_registry.lo registries/registry.lo qoi/drag_torque.lo common/system.lo common/profiler.lo simulation_components/spectral_error.lo simulation_components/probes.lo simulation_components/simulation_component.lo math/tensor.lo math/matrix.lo math/vector_list.lo math/vector.lo source_terms/user_source_term.lo field/field_list.lo fluid/fluid_stats.lo sem/cpr.lo sem/map_2d.lo sem/map_1d.lo math/bcknd/device/device_math.lo device/device.lo common/jobctrl.lo common/time_state.lo common/signal.lo common/user_intf.lo common/projection.lo math/mathops.lo math/operators.lo simulation.lo io/output.lo io/output_controller.lo case.lo config/neko_config.lo comm/parmetis.lo math/ax.lo bc/dirichlet.lo bc/bc_list.lo bc/zero_dirichlet.lo bc/bc.lo sem/coef.lo krylov/krylov.lo gs/gather_scatter.lo comm/mpi_types.lo math/field_math.lo field/field.lo io/file.lo global_interpolation/global_interpolation.lo math/mxm_wrapper.lo io/format/map.lo field/mesh_field.lo mesh/point.lo mesh/mesh.lo adt/tuple.lo adt/stack.lo adt/uset.lo adt/htable.lo sem/space.lo sem/dofmap.lo sem/speclib.lo math/math.lo common/log.lo common/utils.lo comm/comm.lo config/num_types.lo
neko.lo : neko.f90 common/user_access_singleton.lo source_terms/source_term.lo common/time_step_controller.lo common/time_based_controller.lo simulation_components/lambda2.lo simulation_components/force_torque.lo simulation_components/weak_gradient_simcomp.lo simulation_components/gradient_simcomp.lo simulation_components/curl_simcomp.lo simulation_components/divergence_simcomp.lo simulation_components/derivative_simcomp.lo simulation_components/field_writer.lo les/les_model.lo common/json_utils.lo common/runtime_statistics.lo bc/field_dirichlet_vector.lo bc/field_dirichlet.lo mesh/point_zone_registry.lo mesh/point_zones/sphere_point_zone.lo mesh/point_zones/box_point_zone.lo mesh/point_zone.lo sem/point_interpolator.lo common/time_interpolator.lo io/data_streamer.lo simulation_components/simcomp_executor.lo registries/scratch_registry.lo registries/registry.lo qoi/drag_torque.lo common/system.lo common/profiler.lo simulation_components/spectral_error.lo simulation_components/probes.lo simulation_components/simulation_component.lo math/tensor.lo math/matrix.lo math/vector_list.lo math/vector.lo source_terms/user_source_term.lo field/field_list.lo fluid/fluid_stats.lo sem/cpr.lo sem/map_2d.lo sem/map_1d.lo math/bcknd/device/device_math.lo device/device.lo common/jobctrl.lo common/time_state.lo common/signal.lo common/user_intf.lo common/projection.lo math/mathops.lo math/operators.lo simulation.lo io/output.lo io/output_controller.lo case.lo config/neko_config.lo comm/parmetis.lo math/ax.lo bc/dirichlet.lo bc/bc_list.lo bc/zero_dirichlet.lo bc/bc.lo sem/coef.lo krylov/krylov.lo gs/gather_scatter.lo comm/mpi_types.lo math/field_math.lo field/field.lo io/file.lo global_interpolation/global_interpolation.lo math/mxm_wrapper.lo io/import_field_utils.lo io/format/map.lo field/mesh_field.lo mesh/point.lo mesh/mesh.lo adt/tuple.lo adt/stack.lo adt/uset.lo adt/htable.lo sem/space.lo sem/dofmap.lo sem/speclib.lo math/math.lo common/log.lo common/utils.lo comm/comm.lo config/num_types.lo
1 change: 1 addition & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ neko_fortran_SOURCES = \
io/rea_file.f90\
io/bp_file.F90\
io/fld_file.f90\
io/import_field_utils.f90\
io/fld_file_data.f90\
io/vtk_file.f90\
io/stl_file.f90\
Expand Down
Loading
Loading