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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:17:45 -0700 (Thu, 17 Aug 2006)
New Revision: 4342

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.meta
Log:
 r486 at earth:  boo | 2006-08-17 17:15:24 -0700
  r460 at earth (orig r291):  JulianGiordani | 2006-08-01 16:58:06 -0700
  
  Found with the .meta files that putting carriage returns in the .meta file is dangerous. It causes the output, at the other end of documentation scripts, to come out incorrect.
  So could everyone try and not put carriage returns in the .meta files they write. Thanks
   
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:485
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:290
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:486
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:291

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.meta
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.meta	2006-08-18 00:17:45 UTC (rev 4341)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.meta	2006-08-18 00:17:45 UTC (rev 4342)
@@ -10,12 +10,7 @@
 <param name="Copyright">Copyright (c) 2005, Monash Cluster Computing</param>
 <param name="License">http://www.opensource.org/licenses/bsd-license.php</param>
 <param name="Parent">TimeIntegratee</param>
-<param name="Description">This component is used in problems where the material parameters can soften (usually used with a yield
-rheology component). The name StrainWeakening is probably not appropriate. This component is mainly used in the following cases:
-to define an initial distribution of strain in a material
-to calculate the accumulated strain on each particles
-Since the material parameters are not softened inside that component, 'Strain' or 'AccumulatedStrain' or 'EquivalentAccumulatedPlasticStrain'
-may be more appropriate names.</param>
+<param name="Description">This component is used in problems where the material parameters can soften (usually used with a yield rheology component). The name StrainWeakening is probably not appropriate. This component is mainly used in the following cases: to define an initial distribution of strain in a material; to calculate the accumulated strain on each particles. Since the material parameters are not softened inside that component, 'Strain' or 'AccumulatedStrain' or 'EquivalentAccumulatedPlasticStrain' may be more appropriate names.</param>
 
 <!--Now the interesting stuff-->