[cig-commits] r5129 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Shape/src
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 13:27:53 PST 2006
Author: walter
Date: 2006-10-31 13:27:52 -0800 (Tue, 31 Oct 2006)
New Revision: 5129
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c
Log:
r3114 at earth: boo | 2006-10-31 13:26:11 -0800
r3092 at earth (orig r3869): SteveQuenette | 2006-10-16 06:42:59 -0700
* found more old constructs
* updatting root dir's ignores
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3113
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3868
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3114
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3869
Name: svn:ignore
+ Makefile.system
build*
make*.error
make*.out
make*.log
Config.log
error
out
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -199,7 +199,7 @@
XYZ maxValue;
XYZ width;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
offset = Stg_ComponentFactory_GetDouble( cf, self->name, "offset", 0.5 );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -201,7 +201,7 @@
char axisLetters[] = {'X','Y','Z'};
Dimension_Index dim_I;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
for ( dim_I = 0 ; dim_I < 3 ; dim_I++ ) {
*startCharPtr = axisLetters[ dim_I ];
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -269,7 +269,7 @@
Stream* stream = cf->infoStream;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
optionsList = Dictionary_Get( dictionary, "verticies" );
Journal_Firewall( optionsList != NULL,
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -209,7 +209,7 @@
Axis perpendicularAxis = I_AXIS;
char* perpendicularAxisName = NULL;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
radius = Stg_ComponentFactory_GetDouble( cf, self->name, "radius", 0.0 );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -176,7 +176,7 @@
void _Everywhere_Construct( void* everywhere, Stg_ComponentFactory* cf, void* data ) {
Everywhere* self = (Everywhere*) everywhere;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
_Everywhere_Init( self );
}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -222,7 +222,7 @@
char* nameShape;
Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
optionsList = Dictionary_Get( dictionary, "shapes" );
/* Journal_Firewall( vertexList != NULL,
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -223,7 +223,7 @@
Stream* stream = cf->infoStream;
Stream* errorStream = Journal_Register( Error_Type, self->type );
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
startZ = Stg_ComponentFactory_GetDouble( cf, self->name, "startZ", 0.0 );
endZ = Stg_ComponentFactory_GetDouble( cf, self->name, "endZ", 0.0 );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -197,11 +197,11 @@
}
-void _PythonShape_Construct( void* pythonShape, Stg_ComponentFactory* cf ) {
+void _PythonShape_Construct( void* pythonShape, Stg_ComponentFactory* cf, void* data ) {
PythonShape* self = (PythonShape*) pythonShape;
char* conditionFunction;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
conditionFunction = Stg_ComponentFactory_GetString( cf, self->name, "Function", "0" );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.h 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.h 2006-10-31 21:27:52 UTC (rev 5129)
@@ -103,7 +103,7 @@
void* _PythonShape_Copy( void* pythonShape, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
void* _PythonShape_DefaultNew( Name name ) ;
- void _PythonShape_Construct( void* shape, Stg_ComponentFactory* cf ) ;
+ void _PythonShape_Construct( void* shape, Stg_ComponentFactory* cf, void* data ) ;
void _PythonShape_Build( void* pythonShape, void* data ) ;
void _PythonShape_Initialise( void* pythonShape, void* data ) ;
void _PythonShape_Execute( void* pythonShape, void* data );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -162,7 +162,7 @@
return (void*)newStg_Shape;
}
-void _Stg_Shape_Construct( void* shape, Stg_ComponentFactory* cf ) {
+void _Stg_Shape_Construct( void* shape, Stg_ComponentFactory* cf, void* data ) {
Stg_Shape* self = (Stg_Shape*) shape;
Dimension_Index dim;
Coord centre;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.h 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.h 2006-10-31 21:27:52 UTC (rev 5129)
@@ -94,7 +94,7 @@
void* _Stg_Shape_Copy( void* shape, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
/* 'Stg_Component' Virtual Function Implementations */
- void _Stg_Shape_Construct( void* shape, Stg_ComponentFactory* cf ) ;
+ void _Stg_Shape_Construct( void* shape, Stg_ComponentFactory* cf, void* data ) ;
void _Stg_Shape_Build( void* shape, void* data ) ;
void _Stg_Shape_Initialise( void* shape, void* data ) ;
void _Stg_Shape_Execute( void* shape, void* data ) ;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -192,7 +192,7 @@
Sphere* self = (Sphere*) sphere;
double radius;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
radius = Stg_ComponentFactory_GetDouble( cf, self->name, "radius", 0.0 );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -206,7 +206,7 @@
double epsilon1;
double epsilon2;
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
radius[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "radiusX", 1.0 );
radius[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "radiusY", 1.0 );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c 2006-10-31 21:27:22 UTC (rev 5128)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c 2006-10-31 21:27:52 UTC (rev 5129)
@@ -222,7 +222,7 @@
char* nameShape;
Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
- _Stg_Shape_Construct( self, cf );
+ _Stg_Shape_Construct( self, cf, data );
optionsList = Dictionary_Get( dictionary, "shapes" );
// Journal_Firewall( vertexList != NULL,
More information about the cig-commits
mailing list