[cig-commits] r5036 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Mesh/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-14 14:33:20 -0700 (Sat, 14 Oct 2006)
New Revision: 5036

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c
Log:
 r3085 at earth:  boo | 2006-10-14 14:33:02 -0700
  r3084 at earth (orig r3863):  LukeHodkinson | 2006-10-14 14:55:55 -0700
  Fixed a bug causing particles to be incorrectly
  identified as belonging to topological elements
  owned by other processors.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3082
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3862
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3085
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3863

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c	2006-10-14 20:15:15 UTC (rev 5035)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c	2006-10-14 21:33:20 UTC (rev 5036)
@@ -968,7 +968,7 @@
 							}
 							else if( tet_i == 3 ) {
 								decomp = topo->domains[MT_EDGE]->decomp;
-								telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][3];
+								telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][5];
 							}
 							else if( tet_i == 4 ) {
 								decomp = topo->domains[MT_FACE]->decomp;
@@ -988,7 +988,7 @@
 							}
 							else if( tet_i == 8 ) {
 								decomp = topo->domains[MT_EDGE]->decomp;
-								telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][3];
+								telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][5];
 							}
 							else {
 								decomp = topo->domains[MT_FACE]->decomp;
@@ -1055,7 +1055,7 @@
 						}
 						else if( tet_i == 2 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
-							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][2];
+							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][4];
 						}
 						else if( tet_i == 3 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
@@ -1067,11 +1067,11 @@
 						}
 						else if( tet_i == 5 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
-							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][5];
+							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][3];
 						}
 						else if( tet_i == 6 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
-							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][2];
+							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][4];
 						}
 						else if( tet_i == 7 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
@@ -1177,11 +1177,11 @@
 					else if( bcs[3] == 0.0 || bcs[3] == -0.0 ) {
 						if( tet_i == 0 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
-							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][4];
+							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][2];
 						}
 						else if( tet_i == 1 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
-							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][5];
+							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][3];
 						}
 						else if( tet_i == 2 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
@@ -1283,7 +1283,7 @@
 						}
 						else if( tet_i == 7 ) {
 							decomp = topo->domains[MT_EDGE]->decomp;
-							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][4];
+							telInd = topo->incEls[MT_VOLUME][MT_EDGE][dElInd][2];
 						}
 						else if( tet_i == 8 ) {
 							decomp = topo->domains[MT_FACE]->decomp;