[cig-commits] r4131 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Swarm/src

[walter at geodynamics.org]

Author: walter
Date: 2006-08-01 01:52:46 -0700 (Tue, 01 Aug 2006)
New Revision: 4131

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.h
Log:
 r2597 at earth:  boo | 2006-08-01 01:50:28 -0700
  r2576 at earth (orig r3699):  PatrickSunter | 2006-07-23 17:47:59 -0700
  Fixed the OperatorSwarmVariable's C-Code construction interface
  OperatorSwarmVariable_New() so it actually works. Following 
  Rob's take on inheritance since he created this baby and there's
  no point trying to make it consistent with the StG approach given
  Al's new stuff isn't far away.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2553
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3698
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2597
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3699

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.c	2006-08-01 05:57:23 UTC (rev 4130)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.c	2006-08-01 08:52:46 UTC (rev 4131)
@@ -53,14 +53,17 @@
 		void*                                              _swarmVariable,
 		Name                                               operatorName )
 {
-	SwarmVariable* swarmVariable = (SwarmVariable*) _swarmVariable;
+	SwarmVariable*          swarmVariable = (SwarmVariable*) _swarmVariable;
+	OperatorSwarmVariable*  operatorSwarmVariable;
        	
-	return OperatorSwarmVariable_New( 
+	operatorSwarmVariable = OperatorSwarmVariable_New( 
 			name,
 			_OperatorSwarmVariable_UnaryValueAt, 
 			operatorName,
 			1,
 			&swarmVariable );
+
+	return operatorSwarmVariable;
 }
 
 OperatorSwarmVariable* OperatorSwarmVariable_NewBinary( 
@@ -109,8 +112,9 @@
 		Index                                              swarmVariableCount,
 		SwarmVariable**                                    swarmVariableList )
 {
+	OperatorSwarmVariable*  operatorSwarmVariable;
 
-		return _OperatorSwarmVariable_New( 
+	operatorSwarmVariable = _OperatorSwarmVariable_New( 
 			sizeof(OperatorSwarmVariable), 
 			OperatorSwarmVariable_Type, 
 			_SwarmVariable_Delete, 
@@ -126,6 +130,13 @@
 			_OperatorSwarmVariable_GetMinGlobalMagnitude,
 			_OperatorSwarmVariable_GetMaxGlobalMagnitude, 
 			name );
+
+	/* Following Rob's inheritance approach for this file, until we do the big fix-up */
+	/* Can pass in 0 for the dofs since this will be updated in the next func */
+	SwarmVariable_InitAll( operatorSwarmVariable, swarmVariableList[0]->swarm, NULL, 0 );
+	_OperatorSwarmVariable_Init( operatorSwarmVariable, operatorName, swarmVariableCount, swarmVariableList );
+
+	return operatorSwarmVariable;
 }
 
 OperatorSwarmVariable* _OperatorSwarmVariable_New(

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.h	2006-08-01 05:57:23 UTC (rev 4130)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.h	2006-08-01 08:52:46 UTC (rev 4131)
@@ -80,8 +80,8 @@
 	SwarmVariable* _SwarmVariable_New(
 		SizeT                                              _sizeOfSelf, 
 		Type                                               type,
-		Stg_Class_DeleteFunction*	                       _delete,
-		Stg_Class_PrintFunction*	                       _print, 
+		Stg_Class_DeleteFunction*	                   _delete,
+		Stg_Class_PrintFunction*	                   _print, 
 		Stg_Class_CopyFunction*	                           _copy, 
 		Stg_Component_DefaultConstructorFunction*          _defaultConstructor,
 		Stg_Component_ConstructFunction                    _construct,