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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-01 01:54:51 -0700 (Tue, 01 Aug 2006)
New Revision: 4163

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
   long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
Log:
 r727 at earth:  boo | 2006-08-01 01:52:56 -0700
  r717 at earth (orig r621):  PatrickSunter | 2006-07-26 17:50:12 -0700
  Changed the FeVariable_NewFromTemplate() interface to allow the user to over-ride the import
  and export types of the templateFeVar. Updated the CompareFeVariableAgaistNReferenceSolution
  to use this new interface and pass in the importFormatType the user requested - comparing
  StgFEM_Native and ABAQUS format types now works again.
  
 



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

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-08-01 08:54:48 UTC (rev 4162)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-08-01 08:54:51 UTC (rev 4163)
@@ -141,6 +141,8 @@
 		void*                                          	_templateFeVariable,
 		DofLayout*                                      dofLayout, 
 		void*                                          	ics,
+		const char* const                               importFormatType,
+		const char* const                               exportFormatType,
 		FieldVariable_Register*                         fV_Register )
 {
 	FeVariable*	templateFeVariable = _templateFeVariable;
@@ -157,8 +159,8 @@
 		templateFeVariable,
 		templateFeVariable->fieldComponentCount,
 		templateFeVariable->dim,
-		templateFeVariable->importFormatType,
-		templateFeVariable->exportFormatType,
+		importFormatType,
+		exportFormatType,
 		templateFeVariable->communicator,
 		fV_Register );
 

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2006-08-01 08:54:48 UTC (rev 4162)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2006-08-01 08:54:51 UTC (rev 4163)
@@ -153,6 +153,8 @@
 		void*                                          	templateFeVariable,
 		DofLayout*                                      dofLayout, 
 		void*                                          	ics,
+		const char* const                               importFormatType,
+		const char* const                               exportFormatType,
 		FieldVariable_Register*                         fV_Register );
 	
 	/** Create a new FeVariable and initialises it. User chooses whether to pass a template or not. */

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c	2006-08-01 08:54:48 UTC (rev 4162)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c	2006-08-01 08:54:51 UTC (rev 4163)
@@ -400,6 +400,8 @@
 			feVarToTest,
 			referenceDofLayout, 
 			NULL, 
+			self->importFormatType,
+			self->exportFormatType,
 			feVarToTest->fieldVariable_Register );
 
 	tmpName = Stg_Object_AppendSuffix( feVarToTest, "Rounded" );
@@ -408,6 +410,8 @@
 			feVarToTest, 
 			roundedDofLayout, 
 			NULL, 
+			feVarToTest->importFormatType,
+			self->exportFormatType,
 			feVarToTest->fieldVariable_Register );
 	Memory_Free( tmpName );