d2q9: rename NUM_CORES to CORES

make naming consistent with CORES_{X,Y} and BLOCKS_{X,Y}

diff --git a/d2q9/esrc/main.c b/d2q9/esrc/main.c
index 2a0cfb7d1b5f3351d3b88d3909c7a6cd6331959a..cecaab5e8aed3c84e48b771e390fb0046fdda6ca 100644 (file)
--- a/d2q9/esrc/main.c
+++ b/d2q9/esrc/main.c
@@ -19,8 +19,8 @@ static uint8_t      dummy_bank3[8192] USED SECTION(".data_bank3");
 static d2q9_block_t *block = (void*)0x2000;
 
 /* barrier structures */
-volatile e_barrier_t  barriers[NUM_CORES];
-         e_barrier_t *tgt_bars[NUM_CORES];
+volatile e_barrier_t  barriers[CORES];
+         e_barrier_t *tgt_bars[CORES];
 
 /* global index variables */
 unsigned int row, col, core;

diff --git a/d2q9/shared.h b/d2q9/shared.h
index 0634f1ad8886a8255a00c192735c7a78b8e00469..790239bdc2cb36c49e6dcff34038528d1a36744f 100644 (file)
--- a/d2q9/shared.h
+++ b/d2q9/shared.h
@@ -15,7 +15,7 @@
 /* number of cores */
 #define CORES_X 4
 #define CORES_Y 4
-#define NUM_CORES (CORES_X * CORES_Y)
+#define CORES (CORES_X * CORES_Y)
 
 /* size of per-core subgrid */
 #define BLOCKS_X 26