[cig-commits] r4059 - in long/3D/Gale/trunk/src/StgFEM: . Discretisation/src

[walter at geodynamics.org]

Author: walter
Date: 2006-07-20 20:07:24 -0700 (Thu, 20 Jul 2006)
New Revision: 4059

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
Log:
 r703 at earth:  boo | 2006-07-20 20:03:01 -0700
  r696 at earth (orig r614):  LukeHodkinson | 2006-07-19 22:35:25 -0700
  Found a routine using the slow mesh searching algorithm;
  updated. Also, removed a warning FeVariable was producing.
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:702
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:613
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:703
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:614

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-07-21 03:07:23 UTC (rev 4058)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-07-21 03:07:24 UTC (rev 4059)
@@ -344,7 +344,7 @@
 
 	self->importFormatType = StG_Strdup( importFormatType );
 	/* check the given file format is actually among the registered list. If not, print them and exit. */
-	if( NULL == Stg_ObjectList_Get( FeVariable_FileFormatImportExportList, importFormatType ) ) {
+	if( NULL == Stg_ObjectList_Get( FeVariable_FileFormatImportExportList, (char*)importFormatType ) ) {
 		Stream*    errorStream = Journal_Register( Error_Type, self->type );
 		
 		Journal_Printf( errorStream, "Error - in %s() - for FeVariable \"%s\": you specified this "
@@ -360,7 +360,7 @@
 
 	self->exportFormatType = StG_Strdup( exportFormatType );
 	/* check the given file format is actually among the registered list. If not, print them and exit. */
-	if( NULL == Stg_ObjectList_Get( FeVariable_FileFormatImportExportList, exportFormatType ) ) {
+	if( NULL == Stg_ObjectList_Get( FeVariable_FileFormatImportExportList, (char*)exportFormatType ) ) {
 		Stream*    errorStream = Journal_Register( Error_Type, self->type );
 		
 		Journal_Printf( errorStream, "Error - in %s() - for FeVariable \"%s\": you specified this "
@@ -1116,8 +1116,7 @@
 	
 	/* locate which mesh element given coord is in : use inclusive upper boundaries to save
 		the need to use shadow space if possible */
-	elementCoordIn = eLayout->elementWithPoint( eLayout, mLayout->decomp, globalCoord,
-						    INCLUSIVE_UPPER_BOUNDARY, 0, NULL );
+	elementCoordIn = Mesh_ElementWithPoint( self->feMesh, globalCoord, INCLUSIVE_UPPER_BOUNDARY );
 
 	if ( elementCoordIn >= self->feMesh->elementDomainCount ) {
 		/* If coord isn't inside domain elements list, bail out */
@@ -1644,8 +1643,8 @@
 	}
 }
 
-// TODO: can't assume all swarms have particles of type integrationPoint anymore.
-//        should check that the given swarm does have I.P for the rest of these functions.
+/* TODO: can't assume all swarms have particles of type integrationPoint anymore.
+   should check that the given swarm does have I.P for the rest of these functions.*/
 double FeVariable_IntegrateElement_AxisIndependent( 
 		void* feVariable, void* _swarm, 
 		Element_DomainIndex dElement_I, Dimension_Index dim, 
@@ -1945,7 +1944,7 @@
 		Bool					deep,
 		Name					nameExt, 
 		struct PtrMap*				ptrMap ) {
-	// TODO
+	/* TODO */
 	assert( 0 );	
 }		
 
@@ -2118,7 +2117,7 @@
 	anyway - but for now, we'll just check that its a CornerNL type eg velocity, since BodyNL node points
 	are at the centroids, and would hence stuff the Geometry object */
 	if ( self->feMesh->layout->nodeLayout->type == CornerNL_Type ) {
-		// TODO: separate into re-usable function
+		/* TODO: separate into re-usable function */
 		/* Since we could be loading in parallel, need to find global min and max of geometry */
 		for ( dim_I = 0; dim_I < 3; dim_I++ ) {
 			MPI_Allreduce( localGeometryMin, geometry->min, 3, MPI_DOUBLE, MPI_MIN, 

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2006-07-21 03:07:23 UTC (rev 4058)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2006-07-21 03:07:24 UTC (rev 4059)
@@ -81,7 +81,7 @@
 
 	/* A global list of import/export info objects - can be added to later by plugins. Needs to be initialised in
 	 * FeDiscretisation_Init() */
-	 // TODO: maybe should move this to the StgFEM_Context later??? 
+	/* TODO: maybe should move this to the StgFEM_Context later???  */
 	extern Stg_ObjectList*   FeVariable_FileFormatImportExportList;
 
 	extern const char*       StgFEM_Native_ImportExportType;