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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
Log:
 r793 at earth:  boo | 2006-10-11 13:49:38 -0700
  r767 at earth (orig r646):  JulianGiordani | 2006-09-27 00:44:20 -0700
  
  Just adding error checking to the input.
  
  
 



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

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:34 UTC (rev 4906)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-11 20:50:37 UTC (rev 4907)
@@ -553,8 +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 = wavenumberX * M_PI / Lx;
+	kx = (double)wavenumberX * M_PI / Lx;
 	ky = wavenumberY * M_PI;
 
 	*result = sigma * sin( ky * y ) * cos( kx * x );