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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:47:06 -0700 (Wed, 11 Oct 2006)
New Revision: 4850

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/types.h
Log:
 r2907 at earth:  boo | 2006-10-11 13:42:38 -0700
  r2823 at earth (orig r3811):  LukeHodkinson | 2006-09-26 20:29:53 -0700
  * Build system modifications.
  * Types for new classes.
  * Registering of new components.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2906
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3810
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2907
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3811

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c	2006-10-11 20:47:04 UTC (rev 4849)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c	2006-10-11 20:47:06 UTC (rev 4850)
@@ -51,6 +51,7 @@
 #include "IrregEL.h"
 #include "ParallelPipedHexaEL.h"
 #include "MeshGeometry.h"
+#include "Mesh.h"
 #include <stdio.h>
 
 Stream* Mesh_VerboseConfig = NULL;
@@ -65,6 +66,11 @@
 	Mesh_Error = Journal_Register( Error_Type, "Mesh" );
 	
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), 
+				   MeshTopology_Type, "0", (void*)MeshTopology_New );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), 
+				   CartesianGenerator_Type, "0", (void*)CartesianGenerator_New );
 	
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), BodyNL_Type, "0", (void*)BodyNL_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CornerNL_Type, "0", (void*)CornerNL_DefaultNew );
@@ -77,6 +83,9 @@
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Mesh_Type, "0", (void*)Mesh_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), MeshLayout_Type, "0", (void*)MeshLayout_DefaultNew );
 
+	RegisterParent( MeshTopology_Type, Stg_Component_Type );
+	RegisterParent( CartesianGenerator_Type, MeshGenerator_Type );
+
 	RegisterParent( NodeLayout_Type,          Stg_Component_Type );
 	RegisterParent( BodyNL_Type,              NodeLayout_Type );
 	RegisterParent( CornerNL_Type,            NodeLayout_Type );

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h	2006-10-11 20:47:04 UTC (rev 4849)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h	2006-10-11 20:47:06 UTC (rev 4850)
@@ -44,11 +44,16 @@
 	
 	#include "types.h"
 	#include "shortcuts.h"
+	#include "Grid.h"
 	#include "CommTopology.h"
 	#include "Decomp.h"
 	#include "Decomp_Sync.h"
 	#include "Decomp_Sync_Claim.h"
 	#include "Decomp_Sync_Negotiate.h"
+	#include "MeshTopology.h"
+	#include "MeshGenerator.h"
+	#include "CartesianGenerator.h"
+
 	#include "ElementLayout.h"
 	#include "HexaEL.h"
 	#include "ParallelPipedHexaEL.h"

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/types.h	2006-10-11 20:47:04 UTC (rev 4849)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/types.h	2006-10-11 20:47:06 UTC (rev 4850)
@@ -126,11 +126,16 @@
 	typedef Neighbour_Index			Nbr_Index;
 	
 	/* Classes */
+	typedef struct Grid				Grid;
 	typedef struct CommTopology			CommTopology;
 	typedef struct Decomp				Decomp;
 	typedef struct Decomp_Sync			Decomp_Sync;
 	typedef struct Decomp_Sync_Claim		Decomp_Sync_Claim;
 	typedef struct Decomp_Sync_Negotiate		Decomp_Sync_Negotiate;
+	typedef struct MeshTopology			MeshTopology;
+	typedef struct MeshGenerator			MeshGenerator;
+	typedef struct CartesianGenerator		CartesianGenerator;
+
 	typedef struct ProcNbrInfo			ProcNbrInfo;
 	typedef struct ShadowInfo			ShadowInfo;
 	typedef struct _ElementLayout			ElementLayout;