Minor fixes for includes. Added an updated test.ini

Codes/SAM/Main/Main_datatypes.h

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <mpi.h>
-#include "../malleability/distribution_methods/block_distribution.h"
+#include "../MaM/distribution_methods/block_distribution.h"
 
 
 #define ROOT 0

Codes/SAM/Main/configuration.c

@@ -4,7 +4,7 @@
 #include <mpi.h>
 #include "../IOcodes/read_ini.h"
 #include "configuration.h"
-#include "../malleability/distribution_methods/block_distribution.h"
+#include "../MaM/distribution_methods/block_distribution.h"
 
 void malloc_config_resizes(configuration *user_config);
 void malloc_config_stages(configuration *user_config);

Codes/SAM/Main/process_stage.c

@@ -6,7 +6,7 @@
 #include "comunication_func.h"
 #include "Main_datatypes.h"
 #include "process_stage.h"
-#include "../malleability/distribution_methods/block_distribution.h"
+#include "../MaM/distribution_methods/block_distribution.h"
 
 double init_emulation_comm_time(group_data group, configuration *config_file, iter_stage_t *stage, MPI_Comm comm);
 double init_emulation_icomm_time(group_data group, configuration *config_file, iter_stage_t *stage, MPI_Comm comm);

Codes/test.ini

 [general]
-Total_Resizes=0
+Total_Resizes=1
 Total_Stages=4
-Granularity=100000
-SDR=1000.0
-ADR=0.0
-Rigid=1
-; end [general]
+Granularity=600
+SDR=500000.0
+ADR=500000.0
+Rigid=0
+Capture_Method=0
+;end [general]
 [stage0]
-Stage_Type=0
+Stage_Type=1
 Stage_Bytes=0
-Stage_Time=0.01235
+Stage_Time=0.6085314
 ;end [stage0]
 [stage1]
-Stage_Type=3
-Stage_Bytes=0
-Stage_Time=0.03
+Stage_Type=8
+Stage_Bytes=8
+Stage_Time=0
 ;end [stage1]
 [stage2]
-Stage_Type=3
-Stage_Bytes=10000000
+Stage_Type=8
+Stage_Bytes=8
 Stage_Time=0
 ;end [stage2]
 [stage3]
-Stage_Type=4
+Stage_Type=6
 Stage_Bytes=33176880
-Stage_Time=0.040449
+Stage_Time=0
 ;end [stage3]
 [resize0]
-Iters=20
-Procs=2
-FactorS=1
+Iters=5
+Procs=20
+FactorS=0.2
 Dist=compact
-Asynch_Redistribution_Type=3
+Redistribution_Method=0
+Redistribution_Strategy=1
 Spawn_Method=0
 Spawn_Strategy=1
 ;end [resize0]
 [resize1]
-Iters=30
+Iters=50
 Procs=2
-FactorS=0.1
+FactorS=1
 Dist=compact
-Asynch_Redistribution_Type=3
+Redistribution_Method=0
+Redistribution_Strategy=0
 Spawn_Method=0
-Spawn_Strategy=1
+Spawn_Strategy=0
 ;end [resize1]