[cig-commits] r3896 - in long/3D/Gale/trunk/src/Gale: . src

[walter at geodynamics.org]

Author: walter
Date: 2006-06-28 02:54:00 -0700 (Wed, 28 Jun 2006)
New Revision: 3896

Modified:
   long/3D/Gale/trunk/src/Gale/
   long/3D/Gale/trunk/src/Gale/src/main.c
Log:
Update to latest from VPAC


Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
   - 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:49
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:21
   + 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:52
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:27

Modified: long/3D/Gale/trunk/src/Gale/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/src/main.c	2006-06-27 20:46:08 UTC (rev 3895)
+++ long/3D/Gale/trunk/src/Gale/src/main.c	2006-06-28 09:54:00 UTC (rev 3896)
@@ -102,21 +102,24 @@
 		Journal_PrintConcise();	
 	}	
 	
+	/*check components dictionary for double entries */
+	char* errMessage = "Component dictionary must have unique names\n";
+	CheckDictionaryKeys(componentDict, errMessage);
+	
 	/* Building phase ---------------------------------------------------------------------------------------------------*/
-	
-	Context_Build( context );
+	Stg_Component_Build( context, 0 /* dummy */, False );
 	if( rank == 0 ) 
 		Context_PrintConcise( context, context->verbose );
 	
 	/* Initialisaton phase ----------------------------------------------------------------------------------------------*/
-	Context_Initialise( context );
+	Stg_Component_Initialise( context, 0 /* dummy */, False );
 	
 	/* Run (Solve) phase ------------------------------------------------------------------------------------------------*/
 	AbstractContext_Dump( context );
-	Context_Run( context );	
+	Stg_Component_Execute( context, 0 /* dummy */, False );
 	
 	/* Destruct phase ---------------------------------------------------------------------------------------------------*/
-	
+	Stg_Component_Destroy( context, 0 /* dummy */, False );
 	Stg_Class_Delete( context );
 	Stg_Class_Delete( dictionary );