[cig-commits] commit: We had lost the ability to re-load FeVariables from a non-standard path, so modified

[Mercurial]

changeset:   34:b90825bc30db
user:        PatrickSunter
date:        Mon Jul 09 23:41:51 2007 +0000
files:       MaterialPoints/src/ParticleFeVariable.c Weights/tests/plugins/testElementIntegral.c
description:
We had lost the ability to re-load FeVariables from a non-standard path, so modified
the FeVariable class to fix this:
 * Constructor now takes parameters "customInputPath" and "customOutputPath"
  * If they are NULL, behaviour is as before, but if either is specified it over-ride's
    the context's default output path.
 * Updated the CompareFeVariableFromReferenceSolution to make use of this, so the
   "referencePath" argument works again.

(Note there seems to be a memory leak in the above plugin, but we can look at that in a
separate commit.)


diff -r fd9e856a3c5d -r b90825bc30db MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c	Fri Jul 06 04:32:07 2007 +0000
+++ b/MaterialPoints/src/ParticleFeVariable.c	Mon Jul 09 23:41:51 2007 +0000
@@ -38,7 +38,7 @@
 **  License along with this library; if not, write to the Free Software
 **  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** $Id: ParticleFeVariable.c 474 2007-06-27 00:30:24Z DavidLee $
+** $Id: ParticleFeVariable.c 492 2007-07-09 23:41:51Z PatrickSunter $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -117,6 +117,8 @@ ParticleFeVariable* _ParticleFeVariable_
 			True, /* isCheckpointedAndReloaded */
 			NULL,	/* import format type */
 			NULL,	/* export format type */
+			NULL,	/* custom input path */
+			NULL,	/* custom output path */
 			False,  /* use a reference solution from file */
 			False,  /* load the reference solution at each time step */
 			0,	/* communicator */
@@ -206,7 +208,7 @@ void _ParticleFeVariable_Construct( void
 	/* Construct Parent */
 	_FieldVariable_Construct( self, cf, data );
 	_FeVariable_Init( (FeVariable*)self, mesh, NULL, NULL, NULL, NULL, NULL, NULL,
-		StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, False, False );
+		StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, NULL, NULL, False, False );
 	_ParticleFeVariable_Init( self, swarm, context );
 }
 
diff -r fd9e856a3c5d -r b90825bc30db Weights/tests/plugins/testElementIntegral.c
--- a/Weights/tests/plugins/testElementIntegral.c	Fri Jul 06 04:32:07 2007 +0000
+++ b/Weights/tests/plugins/testElementIntegral.c	Mon Jul 09 23:41:51 2007 +0000
@@ -38,7 +38,7 @@
 **  License along with this library; if not, write to the Free Software
 **  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** $Id: testElementIntegral.c 490 2007-07-05 04:49:37Z LukeHodkinson $
+** $Id: testElementIntegral.c 492 2007-07-09 23:41:51Z PatrickSunter $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -178,7 +178,7 @@ void PICellerator_testElementIntegral( D
 	/* Create FeVariable */
 	feVariable = FeVariable_New_Full( "feVariable", mesh, NULL, NULL, NULL, NULL, NULL, NULL, 
 			1, context->dim, False, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType,
-			False, False, MPI_COMM_WORLD, context->fieldVariable_Register );
+			NULL, NULL, False, False, MPI_COMM_WORLD, context->fieldVariable_Register );
 
 	funcName = Dictionary_GetString( context->dictionary, "FunctionName" );
 	if ( strcasecmp( funcName, "ShapeFunction" ) == 0 ) {