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

[walter at geodynamics.org]

Author: walter
Date: 2007-10-05 12:14:29 -0700 (Fri, 05 Oct 2007)
New Revision: 8084

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c
Log:
 r1953 at earth:  boo | 2007-10-05 12:06:33 -0700
 Use the correct name when reading in static friction parameters



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1952
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1953

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c	2007-10-05 19:14:26 UTC (rev 8083)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c	2007-10-05 19:14:29 UTC (rev 8084)
@@ -323,7 +323,7 @@
                 self->include_upper_boundary[I_AXIS]=Dictionary_Entry_Value_AsBool_with_Default(Dictionary_Entry_Value_GetMember(vcDictVal, "includeUpperX"),True);
                 self->include_upper_boundary[J_AXIS]=Dictionary_Entry_Value_AsBool_with_Default(Dictionary_Entry_Value_GetMember(vcDictVal, "includeUpperY"),True);
                 self->include_upper_boundary[K_AXIS]=Dictionary_Entry_Value_AsBool_with_Default(Dictionary_Entry_Value_GetMember(vcDictVal, "includeUpperZ"),True);
-		self->friction = Dictionary_Entry_Value_AsDouble(Dictionary_Entry_Value_GetMember(vcDictVal, "StaticStaticFriction"));
+		self->friction = Dictionary_Entry_Value_AsDouble(Dictionary_Entry_Value_GetMember(vcDictVal, "StaticFriction"));
 
 		for (entry_I = 0; entry_I < self->_entryCount; entry_I++)
 		{
@@ -349,7 +349,7 @@
 					Stream*	errorStr = Journal_Register( Error_Type, self->type );
 
 					Journal_Printf( errorStr, "Error- in %s: While parsing "
-							"definition of frictionVC \"%s\" (applies to wall \"%s\"), the cond. func. applied to "
+							"definition of StaticFrictionVC \"%s\" (applies to wall \"%s\"), the cond. func. applied to "
 							"variable \"%s\" - \"%s\" - wasn't found in the c.f. register.\n",
 							__func__, self->_dictionaryEntryName, WallEnumToStr[self->_wall],
 							self->_entryTbl[entry_I].varName, funcName );