[cig-commits] r6326 - in long/3D/Gale/trunk: . src/StgFEM/SLE/LinearAlgebra/src

[walter at geodynamics.org]

Author: walter
Date: 2007-03-20 14:33:41 -0700 (Tue, 20 Mar 2007)
New Revision: 6326

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/DistortedOpGenerator.c
Log:
 r1721 at earth:  boo | 2007-03-20 14:32:32 -0700
 svk mysteriously reverted my changes to DistortedOpGenerator.c, so I am applying them again



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1715
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1721

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/DistortedOpGenerator.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/DistortedOpGenerator.c	2007-03-20 21:05:24 UTC (rev 6325)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/DistortedOpGenerator.c	2007-03-20 21:33:41 UTC (rev 6326)
@@ -536,50 +536,20 @@
                         coarse_ijk[2]=0;
                       }
                     
-                    int rank;
-                    MPI_Comm	comm = CommTopology_GetComm( Mesh_GetCommTopology( fMesh, MT_VERTEX ) );
-                    MPI_Comm_rank( comm, (int*)&rank );
-                    
-                    if(!FeMesh_NodeGlobalToDomain
+                    Journal_Firewall
+                      (FeMesh_NodeGlobalToDomain
                        (cMesh,
                         RegularMeshUtils_Node_3DTo1D
-                        (cMesh,coarse_ijk),&i))
-                      printf("\n*****************************************************************\nThe coarse mesh point is not on this processor\n*****************************************************************\n");
-/*                                 Journal_Firewall */
-/*                                   (FeMesh_NodeGlobalToDomain */
-/*                                    (cMesh, */
-/*                                     RegularMeshUtils_Node_3DTo1D */
-/*                                     (cMesh,coarse_ijk),&i),errorStream, */
-/*                                    "\n*****************************************************************\nThe coarse mesh point is not on this processor\n*****************************************************************\n"); */
-                                      
-                                printf("Node number %d %d %d %d %d %lf\n",
-                                       rank,n_i,nLocalFineNodes,
-                                       level,i,factor);
+                        (cMesh,coarse_ijk),&i),errorStream,
+                       "\n*****************************************************************\nThe coarse mesh point is not on this processor\n*****************************************************************\n");
 
-/*                     printf("Node number %d %d %d %d %d %d %d %d %d %d %d %d %d\n", */
-/*                            rank,n_i,nLocalFineNodes, */
-/*                            FeMesh_NodeDomainToGlobal(fMesh,n_i), */
-/*                            level,ii, */
-/*                            fine_ijk[0],fine_ijk[1], */
-/*                            weights[ii], */
-/*                            coarse_ijk[0], */
-/*                            coarse_ijk[1], */
-/*                            RegularMeshUtils_Node_3DTo1D */
-/*                            (cMesh,coarse_ijk),i); */
-
-                                cEqNum=self->eqNums[level-1][i][dof_i];
-                                if( cEqNum != (unsigned)-1)
-                                  Matrix_InsertEntries( P, 1, &fEqNum, 1, &cEqNum, &factor );
-/*                                 printf("Inserted %d %d %d %d %d\n",rank, */
-/*                                        n_i,nLocalFineNodes,ii,cEqNum); */
-                    
+                    cEqNum=self->eqNums[level-1][i][dof_i];
+                    if( cEqNum != (unsigned)-1)
+                      Matrix_InsertEntries( P, 1, &fEqNum, 1, &cEqNum, &factor );
                   }
               }
           }
 	}
-        
-/*         sleep(1); */
-/*         exit(1); */
 
 	Matrix_AssemblyBegin( P );
 	Matrix_AssemblyEnd( P );