[cig-commits] commit: Remove geometryMesh from DivergenceForce since it is not used

[Mercurial]

changeset:   920:9f0179721dab
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Nov 22 12:55:21 2011 -0800
files:       Utils/src/DivergenceForce.cxx Utils/src/DivergenceForce.h
description:
Remove geometryMesh from DivergenceForce since it is not used


diff -r 90531f948ed3 -r 9f0179721dab Utils/src/DivergenceForce.cxx
--- a/Utils/src/DivergenceForce.cxx	Mon Nov 21 01:16:07 2011 -0800
+++ b/Utils/src/DivergenceForce.cxx	Tue Nov 22 12:55:21 2011 -0800
@@ -66,7 +66,6 @@ DivergenceForce* DivergenceForce_New(Nam
                                      ForceVector* forceVector,
                                      Swarm* integrationSwarm,
                                      Stg_Shape* domainShape,
-                                     FeMesh* geometryMesh,
                                      StressBC_Entry force)
 {
 	DivergenceForce* self = (DivergenceForce*) _DivergenceForce_DefaultNew( name );
@@ -77,7 +76,6 @@ DivergenceForce* DivergenceForce_New(Nam
 			forceVector,
 			integrationSwarm,
                         domainShape,
-                        geometryMesh,
                         force);
 
 	return self;
@@ -96,13 +94,12 @@ DivergenceForce* _DivergenceForce_New( D
 }
 
 void _DivergenceForce_Init(DivergenceForce* self,
-                           Stg_Shape* domainShape, FeMesh *geometryMesh,
+                           Stg_Shape* domainShape,
                            StressBC_Entry force)
 {
   self->isConstructed    = True;
 
   self->domainShape=domainShape;
-  self->geometryMesh=geometryMesh;
   self->force=force;
 }
 
@@ -112,13 +109,12 @@ void DivergenceForce_InitAll(
 		ForceVector*                                        forceVector,
 		Swarm*                                              integrationSwarm,
                 Stg_Shape* domainShape,
-                FeMesh* geometryMesh,
                 StressBC_Entry force)
 {
 	DivergenceForce* self = (DivergenceForce*) forceTerm;
 
 	_ForceTerm_Init( self, context, forceVector, integrationSwarm, NULL );
-	_DivergenceForce_Init( self, domainShape, geometryMesh, force);
+	_DivergenceForce_Init( self, domainShape, force);
 }
 
 void _DivergenceForce_Delete( void* forceTerm ) {
@@ -159,7 +155,6 @@ void _DivergenceForce_AssignFromXML( voi
 void _DivergenceForce_AssignFromXML( void* forceTerm, Stg_ComponentFactory* cf, void* data ) {
 	DivergenceForce*          self             = (DivergenceForce*)forceTerm;
         Stg_Shape* domainShape=NULL;
-        FeMesh* geometryMesh=NULL;
         StressBC_Entry force;
         char *type;
 
@@ -217,9 +212,7 @@ void _DivergenceForce_AssignFromXML( voi
             assert(0);
           }
         
-        geometryMesh=Stg_ComponentFactory_ConstructByKey(  cf,  self->name,  "GeometryMesh", FeMesh,  True, data  ) ;
-        
-	_DivergenceForce_Init( self, domainShape, geometryMesh, force);
+	_DivergenceForce_Init( self, domainShape, force);
 }
 
 void _DivergenceForce_Build( void* forceTerm, void* data ) {
diff -r 90531f948ed3 -r 9f0179721dab Utils/src/DivergenceForce.h
--- a/Utils/src/DivergenceForce.h	Mon Nov 21 01:16:07 2011 -0800
+++ b/Utils/src/DivergenceForce.h	Tue Nov 22 12:55:21 2011 -0800
@@ -55,7 +55,6 @@
 		/* General info */ \
 		__ForceTerm \
 		Stg_Shape*                                 domainShape;    \
-                FeMesh*                                    geometryMesh; \
                 StressBC_Entry                             force;
 
 	struct DivergenceForce { __DivergenceForce };
@@ -78,7 +77,6 @@
 		ForceVector*                                        forceVector,
 		Swarm*                                              integrationSwarm,
                 Stg_Shape* domainShape,
-                FeMesh* geometryMesh,
                 StressBC_Entry force);
 
 	void _DivergenceForce_Delete( void* forceTerm );