Changeset 823 for soft/giet_vm/applications/rosenfeld/src-par/mca.c

Timestamp:

Jun 14, 2016, 5:23:56 PM (8 years ago)

Author:

meunier

Message:

• Improved scripts for simulations and graphes
• Continued to clean up the lib nrc2 (from nrio2x.x to nrmem1.c)
• Added a version (Fast - Parmerge - No stats)

File:

• soft/giet_vm/applications/rosenfeld/src-par/mca.c (modified) (10 diffs)

soft/giet_vm/applications/rosenfeld/src-par/mca.c

@@ -98 +98 @@
 
 
-// -----------------------------------------------
+// ------------------------------------------------
 void MCA_Set_Size(MCA * mca, int width, int height)
-// -----------------------------------------------
+// ------------------------------------------------
 {
     MCA_Set_Width(mca, width);
@@ -107 +107 @@
 
 
-// ----------------------------------------------------
+// -----------------------------------------------------
 void MCA_Set_Dimension(MCA * mca, int width, int height)
-// ----------------------------------------------------
+// -----------------------------------------------------
 {
     MCA_Set_Width(mca, width);
@@ -116 +116 @@
 
 
-// ------------------------------
+// -------------------------------
 void MCA_Set_NP(MCA * mca, int np)
-// ------------------------------
+// -------------------------------
 {
     mca->np = np;
 }
+
+
+// -------------------------------
+void MCA_Set_NR(MCA * mca, int nr)
+// -------------------------------
+{
+    mca->nr = nr;
+}
+
 
 
@@ -146 +155 @@
     // input
     int np     = mca->np;
+    int nr     = mca->nr;
     int width  = mca->width;
     int height = mca->height;
@@ -292 +302 @@
         mca_par->e0 = e0_par;
         mca_par->e1 = e1_par;
+        // à la premiÚre itération, on remet à 0 toute la table T
+        mca_par->ne_prev = e1_par;
         mca_par->alpha = pw2;
         mca_par->np = np;
+        mca_par->nr = nr;
         // Pour les barriÚres pyramidales
         mca_par->nb_level = nb_level;
@@ -311 +324 @@
         mca_par->E = remote_dist_ui32matrix(i0_par, i1_par, 0, width - 1, x, y); // distributed matrix with border
         
-        if (p == 0) {
-            mca_par->T = remote_ui32vector(e0_par - 1, e1_par, x, y); // car e0 = 1, on a besoin que T[0] = 0 pour FindRoot
-            mca_par->stats = remote_RegionStatsVector(e0_par - 1, e1_par, x, y);
-        }
-        else {
-            mca_par->T = remote_ui32vector(e0_par, e1_par, x, y);
-            mca_par->stats = remote_RegionStatsVector(e0_par, e1_par, x, y);
-        }
+        mca_par->T = remote_ui32vector(e0_par, e1_par, x, y);
+        mca_par->stats = remote_RegionStatsVector(e0_par, e1_par, x, y);
         
         mca_par->D = (uint32 **) remote_vvector(0, np - 1, x, y);
@@ -326 +333 @@
         mca_par->E = dist_ui32matrix(i0_par, i1_par, 0, width - 1); // distributed matrix with border
         
-        if (p == 0) {
-            mca_par->T = ui32vector(e0_par - 1, e1_par); // car e0 = 1, on a besoin que T[0] = 0 pour FindRoot
-            mca_par->stats = RegionStatsVector(e0_par - 1, e1_par);
-        }
-        else {
-            mca_par->T = ui32vector(e0_par, e1_par);
-            mca_par->stats = RegionStatsVector(e0_par, e1_par);
-        }
+        mca_par->T = ui32vector(e0_par, e1_par);
+        mca_par->stats = RegionStatsVector(e0_par, e1_par);
         
         mca_par->D = (uint32 **) vvector(0, np - 1);
@@ -353 +354 @@
     
         MCA_VERBOSE3(printf("p = %d T[%d..%d]\n", p, e0, e1));
-        if (p == 0) {
-            set_ui32vector_j(T, e0 - 1, e1); // car e0 = 1, on a besoin que T[0] = 0 pour FindRoot
-        }
-        else {
-            set_ui32vector_j(T, e0, e1);
-        }
-        MCA_VERBOSE3(printf("\n"));
+        set_ui32vector_j(T, e0, e1);
     }
     
@@ -371 +366 @@
         
         MCA_VERBOSE3(printf("p = %d T[%d..%d]\n", p, e0, e1));
-        if (p == 0) {
-            MCA_VERBOSE3(display_ui32vector_number(T, e0 - 1, e0 + 10, "%5d", "T"));
-        }
-        else {
-            MCA_VERBOSE3(display_ui32vector_number(T, e0, e0 + 10, "%5d", "T"));
-        }
+        MCA_VERBOSE3(display_ui32vector_number(T, e0, e0 + 10, "%5d", "T"));
         MCA_VERBOSE3(printf("\n"));
     }
@@ -506 +496 @@
         free_dist_ui32matrix(mca_par->E, i0, i1, j0, j1);
         
-        if (p == 0) {
-            free_ui32vector(mca_par->T, e0 - 1, e1); // car e0 = 1, on a besoin que T[0] = 0 pour FindRoot
-            free_RegionStatsVector(mca_par->stats, e0 - 1, e1);
-        }
-        else {
-            free_ui32vector(mca_par->T, e0, e1);
-            free_RegionStatsVector(mca_par->stats, e0, e1);
-        }
+        free_ui32vector(mca_par->T, e0, e1);
+        free_RegionStatsVector(mca_par->stats, e0, e1);
         
         free_vvector((void **) mca_par->D, 0, np - 1);