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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-20 20:12:24 -0700 (Thu, 20 Jul 2006)
New Revision: 4083

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.meta
Log:
 r377 at earth:  boo | 2006-07-20 20:05:20 -0700
  r362 at earth (orig r264):  JulianGiordani | 2006-07-17 23:04:02 -0700
  
  Just concatenating several equations into a single equation. The documentation scripts can't handle more than one equation tag specified in the .meta file. It is better to concatenate... Why? the whole content within the equation tag is converted into a png and then inserted into the html doc.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:376
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:263
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:377
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:264

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.meta
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.meta	2006-07-21 03:12:02 UTC (rev 4082)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.meta	2006-07-21 03:12:24 UTC (rev 4083)
@@ -11,9 +11,7 @@
 <param name="License">http://www.opensource.org/licenses/bsd-license.php</param>
 <param name="Parent">VonMises</param>
 <param name="Description">Implements a Drucker-Prager yield Rheology. The parameters of this criterion are calibrated so that the yield surface coincides with the Mohr Coulomb one for the condition of a compression test. </param>
-<param name="Equation">Yield Surface: $f = \sqrt{3} \bar{\tau} - \alpha p - k \le 0$</param>
-<param name="Equation">$\alpha = \frac{6 \sin\varphi}{3 - \sin\varphi}$</param>
-<param name="Equation">$k = \frac{6 c \cos\varphi}{3 - \sin\varphi}$</param>
+<param name="Equation">Yield Surface: $f = \sqrt{3} \bar{\tau} - \alpha p - k \le 0, \alpha = \frac{6 \sin\varphi}{3 - \sin\varphi}, k = \frac{6 c \cos\varphi}{3 - \sin\varphi}$</param>
 
 <!--Now the interesting stuff-->