[cig-commits] r5147 - in long/3D/Gale/trunk/src/StgFEM: . plugins/StandardConditionFunctions

[walter at geodynamics.org]

Author: walter
Date: 2006-10-31 13:31:39 -0800 (Tue, 31 Oct 2006)
New Revision: 5147

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
Log:
 r852 at earth:  boo | 2006-10-31 13:30:37 -0800
  r842 at earth (orig r658):  JulianGiordani | 2006-10-24 07:32:16 -0700
  
  Small changes to the IC functions the analytic solutions call into action.
  
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:851
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:657
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:852
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:658

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-31 21:31:37 UTC (rev 5146)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-31 21:31:39 UTC (rev 5147)
@@ -553,10 +553,11 @@
 	wavenumberX = Dictionary_GetInt_WithDefault( dictionary, "wavenumberX", 1 );
 	wavenumberY = Dictionary_GetDouble_WithDefault( dictionary, "wavenumberY", 1.0 );
 	sigma = Dictionary_GetDouble_WithDefault( dictionary, "sigma", 1.0 );
+	
 	assert( sigma > 0.0 );
 	assert( wavenumberY > 0.0 );
 	assert( wavenumberX > 0.0 );
-
+	
 	kx = (double)wavenumberX * M_PI / Lx;
 	ky = wavenumberY * M_PI;
 
@@ -591,17 +592,16 @@
 	x = coord[ I_AXIS ] - geometry->min[ I_AXIS ];
 	y = coord[ J_AXIS ] - geometry->min[ J_AXIS ];
 
-	wavenumberX = 1.0; //Dictionary_GetInt_WithDefault( dictionary, "wavenumberX", 2 );
-	wavenumberY = 2.0; //Dictionary_GetInt_WithDefault( dictionary, "wavenumberY", 1 );
+	wavenumberX = Dictionary_GetInt_WithDefault( dictionary, "wavenumberX", 1 );
+	wavenumberY = Dictionary_GetDouble_WithDefault( dictionary, "wavenumberY", 2.0 );
 	assert( wavenumberX != wavenumberY );
 	sigma = Dictionary_GetDouble_WithDefault( dictionary, "sigma", 1.0 );
 
 	kn = wavenumberX * M_PI / L;
-	km = wavenumberY * M_PI / L;
+	// TODO: Re-write Mirko's code and/or Documentation so the input parameters for these ICs are less confusing
+	km = wavenumberY / L;
 
-	*result = 1 * sigma * sinh( km * y ) * cos( kn * x );
-//	printf("%0.7f %0.7f %0.7f\twaveX = %g waveY = %g M_PIi = %f L = %f \nsigma = %f kn = %g km = %g \n",x,y,*result,wavenumberX,wavenumberY, M_PI, L, sigma, kn, km);
-//	printf("%0.7f %0.7f %0.7f\n",x,y,*result);
+	*result = sigma * sinh( km * y ) * cos( kn * x );
 }