[cig-commits] commit: Add File 0,11-19 functions

Mercurial hg at geodynamics.org
Wed Jan 11 11:55:11 PST 2012


changeset:   824:b4456b09393a
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Jan 11 11:54:14 2012 -0800
files:       plugins/StandardConditionFunctions/StandardConditionFunctions.cxx plugins/StandardConditionFunctions/StandardConditionFunctions.h
description:
Add File 0,11-19 functions


diff -r b2f12d556c84 -r b4456b09393a plugins/StandardConditionFunctions/StandardConditionFunctions.cxx
--- a/plugins/StandardConditionFunctions/StandardConditionFunctions.cxx	Sat Nov 26 20:50:43 2011 -0800
+++ b/plugins/StandardConditionFunctions/StandardConditionFunctions.cxx	Wed Jan 11 11:54:14 2012 -0800
@@ -208,6 +208,9 @@ void _StgFEM_StandardConditionFunctions_
                                    "Quadratic");
   ConditionFunction_Register_Add( condFunc_Register, condFunc );
 
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File0,
+                                   "File0");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
   condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File1,
                                    "File1");
   ConditionFunction_Register_Add( condFunc_Register, condFunc );
@@ -238,6 +241,33 @@ void _StgFEM_StandardConditionFunctions_
   condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File10,
                                    "File10");
   ConditionFunction_Register_Add(condFunc_Register,condFunc);
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File11,
+                                   "File11");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File12,
+                                   "File12");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File13,
+                                   "File13");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File14,
+                                   "File14");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File15,
+                                   "File15");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File16,
+                                   "File16");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File17,
+                                   "File17");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File18,
+                                   "File18");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
+  condFunc = ConditionFunction_New(StgFEM_StandardConditionFunctions_File19,
+                                   "File19");
+  ConditionFunction_Register_Add( condFunc_Register, condFunc );
 }
 
 void _StgFEM_StandardConditionFunctions_Destroy( void* _self, void* data ) {
@@ -1381,7 +1411,7 @@ double errorFunction( double z, int n ) 
 		for( j=1 ; j<=2*i+1 ; j+=2 ) 
 			denom *= j; 
 		
-		erf += pow( 2, i )*pow( z, 2*i+1 )/denom;
+		erf += pow( 2.0, i )*pow( z, 2*i+1 )/denom;
 	}
 
 	return erf *= a*exp( -1.0*z*z );
@@ -1616,6 +1646,13 @@ int Binary_Search(double *data, int s, i
 
 void StgFEM_StandardConditionFunctions_FileN(const double *coord, void* _context, void* _result, int file_num, double **coords, double **data);
 
+void StgFEM_StandardConditionFunctions_File0(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,0,&coords,&data);
+}
+
 void StgFEM_StandardConditionFunctions_File1(const double *coord, void* _context, void* _result ) 
 {
   static double *coords=NULL;
@@ -1684,6 +1721,69 @@ void StgFEM_StandardConditionFunctions_F
   static double *coords=NULL;
   static double *data=NULL;
   StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,10,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File11(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,11,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File12(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,12,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File13(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,13,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File14(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,14,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File15(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,15,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File16(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,16,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File17(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,17,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File18(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,18,&coords,&data);
+}
+
+void StgFEM_StandardConditionFunctions_File19(const double *coord, void* _context, void* _result ) 
+{
+  static double *coords=NULL;
+  static double *data=NULL;
+  StgFEM_StandardConditionFunctions_FileN(coord,_context,_result,19,&coords,&data);
 }
 
 void StgFEM_StandardConditionFunctions_FileN(const double *coord, void* _context, void* _result, int file_num, double **coords, double **data)
diff -r b2f12d556c84 -r b4456b09393a plugins/StandardConditionFunctions/StandardConditionFunctions.h
--- a/plugins/StandardConditionFunctions/StandardConditionFunctions.h	Sat Nov 26 20:50:43 2011 -0800
+++ b/plugins/StandardConditionFunctions/StandardConditionFunctions.h	Wed Jan 11 11:54:14 2012 -0800
@@ -116,15 +116,45 @@ void StgFEM_StandardConditionFunctions_G
 void StgFEM_StandardConditionFunctions_GaussianTube(const double *coord, void* _context, void* _result );
 void StgFEM_StandardConditionFunctions_WarsTemperature(const double *coord, void* _context, void* _result );
 void StgFEM_StandardConditionFunctions_Quadratic(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File1(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File2(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File3(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File4(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File5(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File6(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File7(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File8(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File9(const double *coord, void* _context, void* _result );
-void StgFEM_StandardConditionFunctions_File10(const double *coord, void* _context, void* _result );
+void StgFEM_StandardConditionFunctions_File0(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File1(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File2(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File3(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File4(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File5(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File6(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File7(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File8(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File9(const double *coord,
+                                             void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File10(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File11(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File12(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File13(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File14(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File15(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File16(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File17(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File18(const double *coord,
+                                              void* _context, void* _result);
+void StgFEM_StandardConditionFunctions_File19(const double *coord,
+                                              void* _context, void* _result);
 
 #endif	



More information about the CIG-COMMITS mailing list