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

[walter at geodynamics.org]

Author: walter
Date: 2007-02-23 10:02:03 -0800 (Fri, 23 Feb 2007)
New Revision: 6081

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.c
Log:
 r3332 at earth (orig r4000):  LukeHodkinson | 2007-02-07 21:31:03 -0800
 Making reduced incidence the default for the cartesian
 generator; completely connected incidence graphs aren't
 widely capitalised on yet.
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3999
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:4000
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.c	2007-02-23 18:02:00 UTC (rev 6080)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.c	2007-02-23 18:02:03 UTC (rev 6081)
@@ -98,7 +98,7 @@
 void _CartesianGenerator_Init( CartesianGenerator* self ) {
 	assert( self && Stg_CheckType( self, CartesianGenerator ) );
 
-	self->regular = False;
+	self->regular = True;
 	self->maxDecompDims = 0;
 	self->minDecomp = NULL;
 	self->maxDecomp = NULL;

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.c	2007-02-23 18:02:00 UTC (rev 6080)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.c	2007-02-23 18:02:03 UTC (rev 6081)
@@ -205,9 +205,20 @@
 	self->enabledDims = ReallocArray( self->enabledDims, Bool, nDims + 1 );
 	self->enabledInc = ReallocArray2D( self->enabledInc, Bool, nDims + 1, nDims + 1 );
 	for( d_i = 0; d_i <= nDims; d_i++ ) {
-		self->enabledDims[d_i] = True;
-		for( d_j = 0; d_j <= nDims; d_j++ )
-			self->enabledInc[d_i][d_j] = True;
+		if( d_i == 0 || d_i == nDims )
+			self->enabledDims[d_i] = True;
+		else
+			self->enabledDims[d_i] = False;
+		for( d_j = 0; d_j <= nDims; d_j++ ) {
+			if( (d_i == 0 || d_i == nDims) && (d_j == 0 || d_j == nDims) ) {
+				if( d_i == d_j && d_j == nDims )
+					self->enabledInc[d_i][d_j] = False;
+				else
+					self->enabledInc[d_i][d_j] = True;
+			}
+			else
+				self->enabledInc[d_i][d_j] = False;
+		}
 	}
 }