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

[walter at geodynamics.org]

Author: walter
Date: 2007-07-20 23:07:51 -0700 (Fri, 20 Jul 2007)
New Revision: 7730

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c
Log:
 r1885 at earth:  boo | 2007-07-18 13:57:48 -0700
 Make StrainWeakening use previous numbers by default (start at 0, finish at softeningStrain)



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

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c	2007-07-21 06:07:45 UTC (rev 7729)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c	2007-07-21 06:07:51 UTC (rev 7730)
@@ -227,8 +227,11 @@
 		data );
 
 	healingRate             = Stg_ComponentFactory_GetDouble( cf, self->name, "healingRate",              0.0 );
-	initialSofteningStrain  = Stg_ComponentFactory_GetDouble( cf, self->name, "initialSofteningStrain", HUGE_VAL );
-	finalSofteningStrain    = Stg_ComponentFactory_GetDouble( cf, self->name, "finalSofteningStrain",   HUGE_VAL );
+	initialSofteningStrain  = Stg_ComponentFactory_GetDouble( cf, self->name, "initialSofteningStrain", 0 );
+        /* Backwards compatibility.  Look at softeningStrain and
+           finalSofteningStrain. */
+	finalSofteningStrain    = Stg_ComponentFactory_GetDouble( cf, self->name, "softeningStrain",   HUGE_VAL );
+	finalSofteningStrain    = Stg_ComponentFactory_GetDouble( cf, self->name, "finalSofteningStrain",   finalSofteningStrain );
 	initialDamageFraction   = Stg_ComponentFactory_GetDouble( cf, self->name, "initialDamageFraction",    0.0 );
 	initialDamageWavenumber = Stg_ComponentFactory_GetDouble( cf, self->name, "initialDamageWavenumber", -1.0 );
 	initialDamageFactor     = Stg_ComponentFactory_GetDouble( cf, self->name, "initialDamageFactor",      1.0 );