[cig-commits] r5162 - in long/3D/Gale/trunk/src/Underworld: . Utils/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-31 13:33:39 -0800 (Tue, 31 Oct 2006)
New Revision: 5162

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.c
   long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.h
Log:
 r700 at earth:  boo | 2006-10-31 13:32:09 -0800
  r690 at earth (orig r367):  KathleenHumble | 2006-10-30 16:32:37 -0800
  Changing DVCWeights so that it matches the newer interface:
  this involved:
  -changing the header file
  #include <StG_FEM/StG_FEM.h>
  to #include <StgFEM/StgFEM.h>
  
  changing the construct function:
  _DVCWeights_Construct by adding in a third input,
  void* data:
  void _DVCWeights_Construct( void* dvcWeights, Stg_ComponentFactory* cf, void* data ) ;
  
  changing a few references to other construct functions:
  	_WeightsCalculator_Construct( self, cf, data );
  to add in the new third input, data.	
  
  This should fix the interface problem.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:699
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:366
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:700
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:367

Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.c	2006-10-31 21:33:29 UTC (rev 5161)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.c	2006-10-31 21:33:39 UTC (rev 5162)
@@ -62,12 +62,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
-
-//#include <PICellerator/PICellerator.h>
-//#include <PICellerator/Weights/Weights.h>
+#include <StgFEM/StgFEM.h>
+#include <PICellerator/PICellerator.h>
 #include "types.h"
-#include <PICellerator/Weights/WeightsCalculator.h>
 #include "DVCWeights.h"
 
 
@@ -191,6 +188,7 @@
 
 
 void _DVCWeights_Construct( void* dvcWeights, Stg_ComponentFactory* cf, void *data ) {
+
 	DVCWeights*	     self          = (DVCWeights*) dvcWeights;
 
 	int defaultResolution;
@@ -203,6 +201,7 @@
 	resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
 	
 	_WeightsCalculator_Construct( self, cf, data );
+
        
 	_DVCWeights_Init( self, resolution );
 }
@@ -925,5 +924,3 @@
 /*-------------------------------------------------------------------------------------------------------------------------
 ** Public Functions
 */
-
-

Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.h
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.h	2006-10-31 21:33:29 UTC (rev 5161)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.h	2006-10-31 21:33:39 UTC (rev 5162)
@@ -198,7 +198,9 @@
 	void* _DVCWeights_Copy( void* dvcWeights, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
 	
 	void* _DVCWeights_DefaultNew( Name name ) ;
-void _DVCWeights_Construct( void* dvcWeights, Stg_ComponentFactory* cf, void* data ) ;
+
+	void _DVCWeights_Construct( void* dvcWeights, Stg_ComponentFactory* cf, void* data ) ;
+
 	void _DVCWeights_Build( void* dvcWeights, void* data ) ;
 	void _DVCWeights_Initialise( void* dvcWeights, void* data ) ;
 	void _DVCWeights_Execute( void* dvcWeights, void* data );
@@ -207,5 +209,4 @@
 		
 	void _DVCWeights_Calculate( void* dvcWeights, void* _swarm, Cell_LocalIndex lCell_I ) ;
 
-//	void _DVCWeights_Init( void* dvcWeights,  int *res  );
-#endif 
+#endif