[cig-commits] [commit] rajesh-petsc-schur: cleaned up assemble_grad_p; results dont match master (c771d1c)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit c771d1c047db9da62fb8b2bed754a5e4e82b9d3d
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 10 10:25:01 2014 -0700

    cleaned up assemble_grad_p; results dont match master


>---------------------------------------------------------------

c771d1c047db9da62fb8b2bed754a5e4e82b9d3d
 lib/Element_calculations.c | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 9737875..fc28212 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -757,31 +757,27 @@ void assemble_grad_p(E,P,gradP,lev)
     for(i=0;i<neq;i++)
       gradP[m][i] = 0.0;
 
-    for(e=1;e<=nel;e++) {
-
-	if(0.0==P[m][e])
-	    continue;
-
-	for(a=1;a<=ends;a++)       {
-	     p = (a-1)*dims;
-	     b = E->IEN[lev][m][e].node[a];
-	     j1= E->ID[lev][m][b].doff[1];
-	     j2= E->ID[lev][m][b].doff[2];
-	     j3= E->ID[lev][m][b].doff[3];
-		        /*for(b=0;b<ploc_mat_size[E->mesh.nsd];b++)  */
-             gradP[m][j1] += E->elt_del[lev][m][e].g[p  ][0] * P[m][e];
-             gradP[m][j2] += E->elt_del[lev][m][e].g[p+1][0] * P[m][e];
-             gradP[m][j3] += E->elt_del[lev][m][e].g[p+2][0] * P[m][e];
-	     }
-        }       /* end for el */
-     }       /* end for m */
+    for(e=0;e<nel;e++) {
+      if(0.0==P[m][e])
+        continue;
 
-  (E->solver.exchange_id_d)(E, gradP,  lev); /*  correct gradP   */
+      for(a=1;a<=ends;a++) {
+         p = (a-1)*dims;
+         b = E->IEN[lev][m][e+1].node[a];
+         j1= E->ID[lev][m][b].doff[1];
+         j2= E->ID[lev][m][b].doff[2];
+         j3= E->ID[lev][m][b].doff[3];
+              /*for(b=0;b<ploc_mat_size[E->mesh.nsd];b++)  */
+         gradP[m][j1] += E->elt_del[lev][m][e+1].g[p  ][0] * P[m][e];
+         gradP[m][j2] += E->elt_del[lev][m][e+1].g[p+1][0] * P[m][e];
+         gradP[m][j3] += E->elt_del[lev][m][e+1].g[p+2][0] * P[m][e];
+      }
+    }       /* end for el */
+  }       /* end for m */
 
+  (E->solver.exchange_id_d)(E, gradP,  lev); /*  correct gradP   */
 
   strip_bcs_from_residual(E,gradP,lev);
-
-return;
 }