diff --git a/examples/Makefile.am b/examples/Makefile.am index 06cefb624f8e8b3e398941823780a32a725a0bee..54fab6edb5d1dc26def643cee04dccd8fd8f6429 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -45,7 +45,7 @@ endif # Sources for swift swift_SOURCES = main.c -swift_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) -DENGINE_POLICY="engine_policy_multistep | engine_policy_keep $(ENGINE_POLICY_SETAFFINITY)" +swift_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) -DENGINE_POLICY="engine_policy_keep $(ENGINE_POLICY_SETAFFINITY)" swift_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) swift_fixdt_SOURCES = main.c @@ -54,7 +54,7 @@ swift_fixdt_LDADD = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) # Sources for swift_mpi, do we need an affinity policy for MPI? swift_mpi_SOURCES = main.c -swift_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_multistep | engine_policy_keep" +swift_mpi_CFLAGS = $(MYFLAGS) $(AM_CFLAGS) $(MPI_FLAGS) -DENGINE_POLICY="engine_policy_keep" swift_mpi_LDADD = ../src/.libs/libswiftsim_mpi.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(MPI_LIBS) swift_fixdt_mpi_SOURCES = main.c diff --git a/src/engine.c b/src/engine.c index 12fa647a6aabcae8aa5961f073c366b7d378aa16..515b17d1d0bfe535556cc96d3de4bf09c1c7fdca 100644 --- a/src/engine.c +++ b/src/engine.c @@ -57,7 +57,7 @@ const char *engine_policy_names[10] = { "none", "rand", "steal", "keep", "block", - "fix_dt", "multi_dt", "cpu_tight", "mpi", "numa_affinity"}; + "fix_dt", "cpu_tight", "mpi", "numa_affinity"}; /** The rank of the engine as a global variable (for messages). */ int engine_rank; diff --git a/src/engine.h b/src/engine.h index 5525f612b4dc066e84a528086cbacbca8ea5fe06..b6dcd673b1afca8235eb2067fdd671540a9699d9 100644 --- a/src/engine.h +++ b/src/engine.h @@ -46,10 +46,9 @@ enum engine_policy { engine_policy_keep = 4, engine_policy_block = 8, engine_policy_fixdt = 16, - engine_policy_multistep = 32, - engine_policy_cputight = 64, - engine_policy_mpi = 128, - engine_policy_setaffinity = 256 + engine_policy_cputight = 32, + engine_policy_mpi = 64, + engine_policy_setaffinity = 128 }; extern const char *engine_policy_names[];