[cig-commits] r3988 - in long/3D/Gale/trunk/src/PICellerator: . MaterialPoints/src Weights/tests/plugins

[walter at geodynamics.org]

Author: walter
Date: 2006-07-09 00:16:58 -0700 (Sun, 09 Jul 2006)
New Revision: 3988

Modified:
   long/3D/Gale/trunk/src/PICellerator/
   long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/ParticleFeVariable.c
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/plugins/testElementIntegral.c
Log:
 r442 at earth:  boo | 2006-07-09 00:13:35 -0700
  r440 at earth (orig r355):  PatrickSunter | 2006-07-07 04:22:04 -0700
  Updating a couple of FeVariable references due to
  the FeVariable interface change
  
 



Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
   - 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:354
aee11096-cf10-0410-a191-eea5772ba81f:/cig:426
   + 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:355
aee11096-cf10-0410-a191-eea5772ba81f:/cig:442

Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/ParticleFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/ParticleFeVariable.c	2006-07-07 23:54:37 UTC (rev 3987)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/ParticleFeVariable.c	2006-07-09 07:16:58 UTC (rev 3988)
@@ -112,9 +112,12 @@
 			NULL,   /* linkedDofInfo */
 			NULL,   /* templateFeVariable */
 			0,      /* fieldComponentCount */
-			0,
-			0,
-			NULL );
+			0,	/* dim */
+			NULL,	/* import format type */
+			NULL,	/* export format type */
+			0,	/* communicator */
+			NULL	/* fv_Register */
+			);
 
 	self->_valueAtParticle = _valueAtParticle;
 	
@@ -198,7 +201,8 @@
 
 	/* Construct Parent */
 	_FieldVariable_Construct( self, cf );
-	_FeVariable_Init( (FeVariable*)self, mesh, NULL, NULL, NULL, NULL, NULL, NULL );
+	_FeVariable_Init( (FeVariable*)self, mesh, NULL, NULL, NULL, NULL, NULL, NULL,
+		StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType );
 	_ParticleFeVariable_Init( self, swarm, context );
 }
 

Modified: long/3D/Gale/trunk/src/PICellerator/Weights/tests/plugins/testElementIntegral.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/plugins/testElementIntegral.c	2006-07-07 23:54:37 UTC (rev 3987)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/plugins/testElementIntegral.c	2006-07-09 07:16:58 UTC (rev 3988)
@@ -132,7 +132,8 @@
 
 	/* Create FeVariable */
 	feVariable = FeVariable_New_Full( "feVariable", mesh, NULL, NULL, NULL, NULL, NULL, NULL, 
-			1, context->dim, MPI_COMM_WORLD, context->fieldVariable_Register );
+			1, context->dim, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType,
+			MPI_COMM_WORLD, context->fieldVariable_Register );
 
 	funcName = Dictionary_GetString( context->dictionary, "FunctionName" );
 	if ( strcasecmp( funcName, "ShapeFunction" ) == 0 ) {