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

[walter at geodynamics.org]

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

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
   long/3D/Gale/trunk/src/Underworld/Utils/src/Init.c
   long/3D/Gale/trunk/src/Underworld/Utils/src/types.h
Log:
 r699 at earth:  boo | 2006-10-31 13:32:08 -0800
  r689 at earth (orig r366):  MirkoVelic | 2006-10-30 16:04:02 -0800
  I had this code working under a slightly older version of Underworld etc.
  Turns out some changes have been made recently and I needed to update this code 
  to fit. However, I am having some header file weirdness so it won't compile
  right now. I think some vpac person would be better suited to track down that
  little bug.
  
 



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

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:22 UTC (rev 5160)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.c	2006-10-31 21:33:29 UTC (rev 5161)
@@ -64,10 +64,13 @@
 #include <StGermain/StGermain.h>
 #include <StG_FEM/StG_FEM.h>
 
+//#include <PICellerator/PICellerator.h>
+//#include <PICellerator/Weights/Weights.h>
 #include "types.h"
-#include <PICellerator/PICellerator.h>
+#include <PICellerator/Weights/WeightsCalculator.h>
 #include "DVCWeights.h"
 
+
 #include <assert.h>
 #include <string.h>
 #include <math.h>
@@ -187,7 +190,7 @@
 }
 
 
-void _DVCWeights_Construct( void* dvcWeights, Stg_ComponentFactory* cf ) {
+void _DVCWeights_Construct( void* dvcWeights, Stg_ComponentFactory* cf, void *data ) {
 	DVCWeights*	     self          = (DVCWeights*) dvcWeights;
 
 	int defaultResolution;
@@ -199,7 +202,7 @@
 	resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
 	resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
 	
-	_WeightsCalculator_Construct( self, cf );
+	_WeightsCalculator_Construct( self, cf, data );
        
 	_DVCWeights_Init( self, resolution );
 }

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:22 UTC (rev 5160)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/DVCWeights.h	2006-10-31 21:33:29 UTC (rev 5161)
@@ -184,8 +184,8 @@
 		WeightsCalculator_CalculateFunction*  _calculate,
 		Name                                  name );
 
-	void _DVCWeights_Init( void* dvcWeights,  int *res  ) ;
-        void DVCWeights_InitAll( void* dvcWeights, Dimension_Index dim ) ;
+	void _DVCWeights_Init( void* dvcWeights, int *res ) ;
+	void DVCWeights_InitAll( void* dvcWeights, Dimension_Index dim ) ;
 
 
 	/* Stg_Class_Delete DVCWeights implementation */
@@ -198,13 +198,14 @@
 	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 _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 );
 	void _DVCWeights_Destroy( void* dvcWeights, void* data ) ;
+	
 		
 	void _DVCWeights_Calculate( void* dvcWeights, void* _swarm, Cell_LocalIndex lCell_I ) ;
 
-	
+//	void _DVCWeights_Init( void* dvcWeights,  int *res  );
 #endif 

Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/Init.c	2006-10-31 21:33:22 UTC (rev 5160)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/Init.c	2006-10-31 21:33:29 UTC (rev 5161)
@@ -67,7 +67,7 @@
 	Stg_ComponentRegister_Add( componentRegister, RadiogenicHeatingTerm_Type,     "0", _RadiogenicHeatingTerm_DefaultNew );
 	Stg_ComponentRegister_Add( componentRegister, StressField_Type ,              "0", _StressField_DefaultNew );
 	Stg_ComponentRegister_Add( componentRegister, ViscosityField_Type ,           "0", _ViscosityField_DefaultNew );
-		Stg_ComponentRegister_Add( componentRegister, DVCWeights_Type,          "0", _DVCWeights_DefaultNew );
+       	Stg_ComponentRegister_Add( componentRegister, DVCWeights_Type,          "0", _DVCWeights_DefaultNew );
 
 	RegisterParent( UnderworldContext_Type,             PICelleratorContext_Type );
 	RegisterParent( PressureTemperatureOutput_Type,     SwarmOutput_Type );

Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/types.h	2006-10-31 21:33:22 UTC (rev 5160)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/types.h	2006-10-31 21:33:29 UTC (rev 5161)
@@ -51,6 +51,6 @@
 	typedef struct RadiogenicHeatingTerm         RadiogenicHeatingTerm;
 	typedef struct StressField                   StressField;
 	typedef struct ViscosityField                ViscosityField;
-	typedef struct DVCWeights              DVCWeights;
+	typedef struct DVCWeights                    DVCWeights;
 
 #endif