diff --git a/src/Makefile.am b/src/Makefile.am index 9b0610667bdcf1f760f6e94d4481848a8fc4d0f0..78846115d0e90de97ee664ca75705541a87526e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,7 +44,7 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \ common_io.h single_io.h multipole.h map.h tools.h partition.h clocks.h parser.h \ physical_constants.h physical_constants_cgs.h potential.h version.h \ hydro_properties.h riemann.h threadpool.h cooling_io.h cooling.h cooling_struct.h \ - sourceterms.h sourceterms_struct.h statistics.h memswap.h cache.h runner_doiact_vec.h profiler.h \ + statistics.h memswap.h cache.h runner_doiact_vec.h profiler.h \ dump.h logger.h active.h timeline.h xmf.h gravity_properties.h gravity_derivatives.h \ gravity_softened_derivatives.h vector_power.h collectgroup.h hydro_space.h sort_part.h \ chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h \ @@ -57,7 +57,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c engine_maketasks.c proxy.c parallel_io.c units.c common_io.c single_io.c multipole.c version.c map.c \ kernel_hydro.c tools.c part.c partition.c clocks.c parser.c \ physical_constants.c potential.c hydro_properties.c \ - threadpool.c cooling.c sourceterms.c \ + threadpool.c cooling.c \ statistics.c runner_doiact_vec.c profiler.c dump.c logger.c \ part_type.c xmf.c gravity_properties.c gravity.c \ collectgroup.c hydro_space.c equation_of_state.c \ @@ -75,7 +75,6 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h gravity/Default/gravity_debug.h gravity/Default/gravity_part.h \ gravity/Potential/gravity.h gravity/Potential/gravity_iact.h gravity/Potential/gravity_io.h \ gravity/Potential/gravity_debug.h gravity/Potential/gravity_part.h \ - sourceterms.h \ equation_of_state.h \ equation_of_state/ideal_gas/equation_of_state.h equation_of_state/isothermal/equation_of_state.h \ hydro.h hydro_io.h \ diff --git a/src/engine.c b/src/engine.c index 0827f10c6371eaa038bce7ab1aaec973f56606e2..59fb2faf98f3cd37e0b6b6cefdb8c0f92b1c3f2e 100644 --- a/src/engine.c +++ b/src/engine.c @@ -83,7 +83,6 @@ #include "serial_io.h" #include "single_io.h" #include "sort_part.h" -#include "sourceterms.h" #include "stars_io.h" #include "statistics.h" #include "timers.h" @@ -4015,8 +4014,7 @@ void engine_init(struct engine *e, struct space *s, struct swift_params *params, struct pm_mesh *mesh, const struct external_potential *potential, const struct cooling_function_data *cooling_func, - const struct chemistry_global_data *chemistry, - struct sourceterms *sourceterms) { + const struct chemistry_global_data *chemistry) { /* Clean-up everything */ bzero(e, sizeof(struct engine)); @@ -4079,7 +4077,6 @@ void engine_init(struct engine *e, struct space *s, struct swift_params *params, e->external_potential = potential; e->cooling_func = cooling_func; e->chemistry = chemistry; - e->sourceterms = sourceterms; e->parameter_file = params; e->cell_loc = NULL; #ifdef WITH_MPI @@ -5175,7 +5172,6 @@ void engine_struct_dump(struct engine *e, FILE *stream) { potential_struct_dump(e->external_potential, stream); cooling_struct_dump(e->cooling_func, stream); chemistry_struct_dump(e->chemistry, stream); - sourceterms_struct_dump(e->sourceterms, stream); parser_struct_dump(e->parameter_file, stream); if (e->output_list_snapshots) output_list_struct_dump(e->output_list_snapshots, stream); @@ -5272,11 +5268,6 @@ void engine_struct_restore(struct engine *e, FILE *stream) { chemistry_struct_restore(chemistry, stream); e->chemistry = chemistry; - struct sourceterms *sourceterms = - (struct sourceterms *)malloc(sizeof(struct sourceterms)); - sourceterms_struct_restore(sourceterms, stream); - e->sourceterms = sourceterms; - struct swift_params *parameter_file = (struct swift_params *)malloc(sizeof(struct swift_params)); parser_struct_restore(parameter_file, stream); diff --git a/src/engine.h b/src/engine.h index 01c4aacb3a04116da5f90f60bcf355a3da93dfa5..ffcdb14e743ea06f7b70452dcbab58ebc7563e0f 100644 --- a/src/engine.h +++ b/src/engine.h @@ -46,7 +46,6 @@ #include "potential.h" #include "runner.h" #include "scheduler.h" -#include "sourceterms_struct.h" #include "space.h" #include "task.h" #include "units.h" @@ -359,9 +358,6 @@ struct engine { /* Properties of the chemistry model */ const struct chemistry_global_data *chemistry; - /* Properties of source terms */ - struct sourceterms *sourceterms; - /* The (parsed) parameter file */ struct swift_params *parameter_file; @@ -416,8 +412,7 @@ void engine_init(struct engine *e, struct space *s, struct swift_params *params, struct pm_mesh *mesh, const struct external_potential *potential, const struct cooling_function_data *cooling_func, - const struct chemistry_global_data *chemistry, - struct sourceterms *sourceterms); + const struct chemistry_global_data *chemistry); void engine_config(int restart, struct engine *e, struct swift_params *params, int nr_nodes, int nodeID, int nr_threads, int with_aff, int verbose, const char *restart_file); diff --git a/src/swift.h b/src/swift.h index 153c4ae0d4440d083f1b0c9850e1f2649c0df6fb..7279fc58b3b4ac0227c11b8a835c829df2ceb49c 100644 --- a/src/swift.h +++ b/src/swift.h @@ -65,7 +65,6 @@ #include "scheduler.h" #include "serial_io.h" #include "single_io.h" -#include "sourceterms.h" #include "space.h" #include "stars.h" #include "stars_io.h"