Merge pull request #6774 from hppritcha/topic/pr_6759_for_v4.0.x

hppritcha · web-flow · commit ba2368bc0aa8 · 2019-06-26T10:48:39.000-06:00
Suggestion to fix division by zero in file view.
diff --git a/ompi/mca/common/ompio/common_ompio_aggregators.c b/ompi/mca/common/ompio/common_ompio_aggregators.c
@@ -1491,13 +1491,12 @@ static double cost_calc (int P, int P_a, size_t d_p, size_t b_c, int dim )
 	}	  
 	case DIM2:
 	{
-	    int P_x, P_y, c;
+	    int P_x, P_y;
 	    
 	    P_x = P_y = (int) sqrt(P);
-	    c = (float) P_a / (float)P_x;
+	    n_as = (float) P_a / (float)P_x;
 	    
 	    n_ar = (float) P_y;
-	    n_as = (float) c;
 	    if ( d_p > (P_a*b_c/P )) {
 		m_s = fmin(b_c / P_y, d_p);
 	    }

Original file line number	Diff line number	Diff line change
`@@ -1491,13 +1491,12 @@ static double cost_calc (int P, int P_a, size_t d_p, size_t b_c, int dim )`
`1491`	`1491`	`}`
`1492`	`1492`	`case DIM2:`
`1493`	`1493`	`{`
`1494`		`- int P_x, P_y, c;`
	`1494`	`+ int P_x, P_y;`
`1495`	`1495`
`1496`	`1496`	`P_x = P_y = (int) sqrt(P);`
`1497`		`- c = (float) P_a / (float)P_x;`
	`1497`	`+ n_as = (float) P_a / (float)P_x;`
`1498`	`1498`
`1499`	`1499`	`n_ar = (float) P_y;`
`1500`		`- n_as = (float) c;`
`1501`	`1500`	`if ( d_p > (P_a*b_c/P )) {`
`1502`	`1501`	`m_s = fmin(b_c / P_y, d_p);`
`1503`	`1502`	`}`