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

[walter at geodynamics.org]

Author: walter
Date: 2007-03-13 11:13:16 -0700 (Tue, 13 Mar 2007)
New Revision: 6244

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:
 r1048 at earth (orig r779):  LukeHodkinson | 2007-03-09 14:53:35 -0800
 Adding an interface to the XML for a flag to keep
 BCs.
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:778
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:779
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2007-03-13 18:13:13 UTC (rev 6243)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2007-03-13 18:13:16 UTC (rev 6244)
@@ -349,6 +349,7 @@
 	else {
 		self->eqNum = FeEquationNumber_New( defaultFeVariableFeEquationNumberName, self->feMesh,
 			self->dofLayout, self->bcs, linkedDofInfo );
+		self->eqNum->removeBCs = self->removeBCs;
 	}
 
 	self->importFormatType = StG_Strdup( importFormatType );
@@ -568,6 +569,7 @@
 	ic            = Stg_ComponentFactory_ConstructByKey( cf, self->name, "IC",            VariableCondition,  False, data );
 	bc            = Stg_ComponentFactory_ConstructByKey( cf, self->name, "BC",            VariableCondition,  False, data );
 	linkedDofInfo = Stg_ComponentFactory_ConstructByKey( cf, self->name, "LinkedDofInfo", LinkedDofInfo,      False, data );
+	self->removeBCs = Stg_ComponentFactory_GetBool( cf, self->name, "removeBCs", True );
 
 	_FeVariable_Init( self, feMesh, geometryMesh, dofLayout, bc, ic, linkedDofInfo, NULL,
 		importFormatType, exportFormatType );

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2007-03-13 18:13:13 UTC (rev 6243)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2007-03-13 18:13:16 UTC (rev 6244)
@@ -106,6 +106,7 @@
 		DofLayout*                                        dofLayout; \
 		/** Boundary conditions applied to this variable - Compulsory, so the eq num table can be worked out*/ \
 		VariableCondition*                                bcs; \
+		Bool						removeBCs;	\
 		/** Boundary conditions applied to this variable - Optional, may be NULL */ \
 		VariableCondition*                                ics; \
 		/** Info on which dofs are linked together: optional, may be NULL */ \