[cig-commits] r5012 - in long/3D/Gale/trunk/src/Gale: .
CollocationIntegration/tests/plugins EulerDeform/src
Isostasy/tests/plugins SurfaceProcess/tests/plugins
walter at geodynamics.org
walter at geodynamics.org
Sat Oct 14 11:02:14 PDT 2006
Author: walter
Date: 2006-10-14 11:02:14 -0700 (Sat, 14 Oct 2006)
New Revision: 5012
Modified:
long/3D/Gale/trunk/src/Gale/
long/3D/Gale/trunk/src/Gale/CollocationIntegration/tests/plugins/testCollocationIntegration.c
long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c
long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h
long/3D/Gale/trunk/src/Gale/Isostasy/tests/plugins/testIsostasy.c
long/3D/Gale/trunk/src/Gale/SurfaceProcess/tests/plugins/testSurfaceProcess.c
Log:
r37 at earth: boo | 2006-10-14 11:00:00 -0700
r34 at earth (orig r55): SteveQuenette | 2006-10-12 02:03:07 -0700
STGERMAIN INTERFACE CHANGE
* *_Construct now takes a third argument "void* data"
* This code re-affirms a "Context" as a "Component" with its interfaces (the phases) implemented as entry points.
* Entry point "IC" renamed to "Initialise"
* Entry point "Run" renamed to "Execute"
* All the code in main.c to construct a context is taken out and moved into the context itself: i.e. a context now constructs itself!
Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
- 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:54
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:36
+ 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:55
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:37
Modified: long/3D/Gale/trunk/src/Gale/CollocationIntegration/tests/plugins/testCollocationIntegration.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/CollocationIntegration/tests/plugins/testCollocationIntegration.c 2006-10-14 18:02:10 UTC (rev 5011)
+++ long/3D/Gale/trunk/src/Gale/CollocationIntegration/tests/plugins/testCollocationIntegration.c 2006-10-14 18:02:14 UTC (rev 5012)
@@ -14,10 +14,10 @@
}
/* Register the hook into the appropriate entry point */
-void _Gale_testCollocationIntegration_Construct( void* component, Stg_ComponentFactory* data ) {
+void _Gale_testCollocationIntegration_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
FiniteElementContext* context;
- context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( data, "context", FiniteElementContext, True );
+ context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Dump, Gale_testDeformEuler );
}
Modified: long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c 2006-10-14 18:02:10 UTC (rev 5011)
+++ long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c 2006-10-14 18:02:14 UTC (rev 5012)
@@ -192,9 +192,9 @@
}
-void _EulerDeform_Construct( void* eulerDeform, Stg_ComponentFactory* cf ) {
+void _EulerDeform_Construct( void* eulerDeform, Stg_ComponentFactory* cf, void* data ) {
EulerDeform* self = (EulerDeform*)eulerDeform;
- UnderworldContext* ctx = Stg_ComponentFactory_ConstructByName( cf, "context", UnderworldContext, True );
+ UnderworldContext* ctx = Stg_ComponentFactory_ConstructByName( cf, "context", UnderworldContext, True, data );
Dictionary* dict;
char* name;
Dictionary_Entry_Value* dimLst;
@@ -215,10 +215,11 @@
** Read the dictionary.
*/
- self->mesh = Stg_ComponentFactory_ConstructByName( cf,
- Dictionary_Entry_Value_AsString( Dictionary_Get( dict, "mesh" ) ),
- Mesh,
- True );
+ self->mesh = Stg_ComponentFactory_ConstructByName( cf,
+ Dictionary_Entry_Value_AsString( Dictionary_Get( dict, "mesh" ) ),
+ Mesh,
+ True,
+ data );
dimLst = Dictionary_Entry_Value_GetMember( Dictionary_Get( cf->componentDict, self->name ), "dims" );
if( dimLst ) {
unsigned dim_i;
@@ -245,13 +246,18 @@
self->vars = Memory_Alloc_Array_Unnamed( FeVariable*, self->nVars );
for( var_i = 0; var_i < self->nDims; var_i++ ) {
name = Dictionary_Entry_Value_AsString( Dictionary_Entry_Value_GetElement( varLst, var_i ) );
- self->vars[var_i] = Stg_ComponentFactory_ConstructByName( cf, (char*)name, FeVariable, False );
+ self->vars[var_i] = Stg_ComponentFactory_ConstructByName(
+ cf,
+ (char*)name,
+ FeVariable,
+ False,
+ data );
}
}
/* Read the velocity variable to use for advection. */
name = Dictionary_GetString( dict, "velocityVariable" );
- self->velVar = Stg_ComponentFactory_ConstructByName( cf, (char*)name, FeVariable, True );
+ self->velVar = Stg_ComponentFactory_ConstructByName( cf, (char*)name, FeVariable, True, data );
/* Create a time integratee. */
crdVar = FiniteElement_Mesh_RegisterNodeCoordsAsVariables(
Modified: long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h
===================================================================
--- long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h 2006-10-14 18:02:10 UTC (rev 5011)
+++ long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h 2006-10-14 18:02:14 UTC (rev 5012)
@@ -111,7 +111,7 @@
/* Print implementation */
void _EulerDeform_Print( void* eulerDeform, Stream* stream );
- void _EulerDeform_Construct( void* eulerDeform, Stg_ComponentFactory* cf ) ;
+void _EulerDeform_Construct( void* eulerDeform, Stg_ComponentFactory* cf, void* data ) ;
void _EulerDeform_Build( void* eulerDeform, void* data ) ;
void _EulerDeform_Execute( void* eulerDeform, void* data ) ;
void _EulerDeform_Destroy( void* eulerDeform, void* data ) ;
Modified: long/3D/Gale/trunk/src/Gale/Isostasy/tests/plugins/testIsostasy.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Isostasy/tests/plugins/testIsostasy.c 2006-10-14 18:02:10 UTC (rev 5011)
+++ long/3D/Gale/trunk/src/Gale/Isostasy/tests/plugins/testIsostasy.c 2006-10-14 18:02:14 UTC (rev 5012)
@@ -14,10 +14,10 @@
}
/* Register the hook into the appropriate entry point */
-void _Gale_testIsostasy_Construct( void* component, Stg_ComponentFactory* data ) {
+void _Gale_testIsostasy_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
FiniteElementContext* context;
- context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( data, "context", FiniteElementContext, True );
+ context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Dump, Gale_testIsostasy );
}
Modified: long/3D/Gale/trunk/src/Gale/SurfaceProcess/tests/plugins/testSurfaceProcess.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/SurfaceProcess/tests/plugins/testSurfaceProcess.c 2006-10-14 18:02:10 UTC (rev 5011)
+++ long/3D/Gale/trunk/src/Gale/SurfaceProcess/tests/plugins/testSurfaceProcess.c 2006-10-14 18:02:14 UTC (rev 5012)
@@ -14,10 +14,10 @@
}
/* Register the hook into the appropriate entry point */
-void _Gale_testSurfaceProcess_Construct( void* component, Stg_ComponentFactory* data ) {
+void _Gale_testSurfaceProcess_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
FiniteElementContext* context;
- context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( data, "context", FiniteElementContext, True );
+ context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Dump, Gale_testSurfaceProcess );
}
More information about the cig-commits
mailing list