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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-13 04:31:44 -0700 (Fri, 13 Oct 2006)
New Revision: 4983

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/Rheology/src/FaultingMoresiMuhlhaus2006.c
   long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c
Log:
 r917 at earth:  boo | 2006-10-13 04:31:32 -0700
 Change drand48 and srand48 to rand and srand)



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

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/FaultingMoresiMuhlhaus2006.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/FaultingMoresiMuhlhaus2006.c	2006-10-13 11:20:40 UTC (rev 4982)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/FaultingMoresiMuhlhaus2006.c	2006-10-13 11:31:44 UTC (rev 4983)
@@ -42,7 +42,7 @@
 ** 
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-
+#include <stdlib.h>
 #include <mpi.h>
 #include <StGermain/StGermain.h>
 #include <StG_FEM/StG_FEM.h>
@@ -340,12 +340,12 @@
 			
 			initialDamageFraction = StrainWeakening_GetInitialDamageFraction( self->strainWeakening, materialPoint );
 		
-			if (drand48() < initialDamageFraction) {
+			if (rand() < RAND_MAX*initialDamageFraction) {
 				normalLength2 = 0.0;
 				
 				for( dof_I=0; dof_I < dim ; dof_I++) {
 					
-					normal[dof_I] = 1.0 - 2.0 * drand48(); 
+					normal[dof_I] = 1.0 - (2.0 * rand())/RAND_MAX; 
 					normalLength2 += normal[dof_I] * normal[dof_I];
 				}
 				

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c	2006-10-13 11:20:40 UTC (rev 4982)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/StrainWeakening.c	2006-10-13 11:31:44 UTC (rev 4983)
@@ -43,6 +43,7 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
+#include <stdlib.h>
 #include <mpi.h>
 #include <StGermain/StGermain.h>
 #include <StG_FEM/StG_FEM.h>
@@ -275,7 +276,7 @@
 	the particle-based variables will be set correcty when we re-load the Swarm. */
 	if ( !(context && (True == context->loadFromCheckPoint)) ) {
 		/* Initialise random number generator */
-		srand48( self->randomSeed );
+		srand( self->randomSeed );
 			
 		for ( lParticle_I = 0 ; lParticle_I < particleLocalCount ; lParticle_I++ ) {
 			/* Initialise Increment to Zero */
@@ -285,7 +286,7 @@
 			 * There is a certain fraction of the number of particles which are given initial strain */
 			postFailureWeakening = 0.0;
 			
-			if ( drand48() < self->initialDamageFraction ) {
+			if ( rand() < RAND_MAX*self->initialDamageFraction ) {
 
 				coord = Variable_GetPtrDouble( positionVariable, lParticle_I );
 
@@ -294,7 +295,7 @@
 					continue;
 				}
 				
-				postFailureWeakening = self->initialDamageFactor * drand48() * self->softeningStrain;
+				postFailureWeakening = self->initialDamageFactor * rand() * self->softeningStrain/RAND_MAX;
 
 				if ( self->initialDamageWavenumber > 0.0 ) {				
 					coord = Variable_GetPtrDouble( positionVariable, lParticle_I );