From cf0b83efb0202c192fac68a8b9a0e76af9461826 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Fri, 29 Jan 2016 12:10:47 +0000
Subject: [PATCH] Removed multi-dt policy. It is now the default. fixdt has to
be explicitly switched on.
---
examples/Makefile.am | 4 ++--
src/engine.c | 2 +-
src/engine.h | 7 +++----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 06cefb624f..54fab6edb5 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 12fa647a6a..515b17d1d0 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 5525f612b4..b6dcd673b1 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[];
--
GitLab