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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:50:32 -0700 (Wed, 11 Oct 2006)
New Revision: 4905

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
Log:
 r791 at earth:  boo | 2006-10-11 13:49:38 -0700
  r765 at earth (orig r644):  JulianGiordani | 2006-09-26 23:52:46 -0700
  
  Making the VelicAnalyticIC function a bit more general so it can handle the range of parameters one can specify in the VelicAnalyticSols
  
  
 



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

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-11 20:50:29 UTC (rev 4904)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-11 20:50:32 UTC (rev 4905)
@@ -536,26 +536,28 @@
 	double                  kx;
 	double                  ky;
 	int                     wavenumberX;
-	int                     wavenumberY;
-	double                  L;
+	double                  wavenumberY;
+	double                  sigma;
+	double                  Lx;
 	
 	/* Find coordinate of node */
 	coord = Mesh_CoordAt( mesh, node_lI );
 
 	/* Make sure that the box has right dimensions */
 	assert( ( geometry->max[ J_AXIS ] - geometry->min[ J_AXIS ] - 1.0 ) < SMALL );
-	L = geometry->max[ I_AXIS ] - geometry->min[ I_AXIS ];
+	Lx = geometry->max[ I_AXIS ] - geometry->min[ I_AXIS ];
 
 	x = coord[ I_AXIS ] - geometry->min[ I_AXIS ];
 	y = coord[ J_AXIS ] - geometry->min[ J_AXIS ];
 
 	wavenumberX = Dictionary_GetInt_WithDefault( dictionary, "wavenumberX", 1 );
-	wavenumberY = Dictionary_GetInt_WithDefault( dictionary, "wavenumberY", 1 );
+	wavenumberY = Dictionary_GetDouble_WithDefault( dictionary, "wavenumberY", 1.0 );
+	sigma = Dictionary_GetDouble_WithDefault( dictionary, "sigma", 1.0 );
 
-	kx = wavenumberX * M_PI/ L;
+	kx = wavenumberX * M_PI / Lx;
 	ky = wavenumberY * M_PI;
 
-	*result = sin( ky * y ) * cos( kx * x );
+	*result = sigma * sin( ky * y ) * cos( kx * x );
 }
 
 /* IC from Mirko Velic. This is the IC temperature for his solB, from his Analytic Suite. Added 22-May-2006 */