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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-11 21:04:31 -0800 (Thu, 11 Jan 2007)
New Revision: 5775

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/Init.c
Log:
 r3284 at earth (orig r3958):  LukeHodkinson | 2007-01-10 15:14:31 -0800
 * Wasn't registering the element type classes in
   the class hierarchy.
 * Now need to set the mesh in the element types.
 



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:3957
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3958
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-01-12 05:04:27 UTC (rev 5774)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.c	2007-01-12 05:04:31 UTC (rev 5775)
@@ -1664,6 +1664,7 @@
 	mesh->nElTypes = 1;
 	mesh->elTypes = Memory_Alloc_Array( Mesh_ElementType*, mesh->nElTypes, "Mesh::elTypes" );
 	mesh->elTypes[0] = (Mesh_ElementType*)Mesh_HexType_New();
+	Mesh_ElementType_SetMesh( mesh->elTypes[0], mesh );
 	nDomainEls = Mesh_GetDomainSize( mesh, Mesh_GetDimSize( mesh ) );
 	mesh->elTypeMap = Memory_Alloc_Array( unsigned, nDomainEls, "Mesh::elTypeMap" );
 	for( e_i = 0; e_i < nDomainEls; e_i++ )

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c	2007-01-12 05:04:27 UTC (rev 5774)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c	2007-01-12 05:04:31 UTC (rev 5775)
@@ -70,6 +70,9 @@
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), 
 				   MeshVariable_Type, "0", (Stg_Component_DefaultConstructorFunction*)MeshVariable_New );
 
+	RegisterParent( Mesh_ElementType_Type, Stg_Class_Type );
+	RegisterParent( Mesh_HexType_Type, Mesh_ElementType_Type );
+	RegisterParent( Mesh_CentroidType_Type, Mesh_ElementType_Type );
 	RegisterParent( Mesh_Algorithms_Type, Stg_Component_Type );
 	RegisterParent( Mesh_HexAlgorithms_Type, Mesh_Algorithms_Type );
 	RegisterParent( Mesh_CentroidAlgorithms_Type, Mesh_Algorithms_Type );