aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoodale <goodale@57bc7290-fb3d-4efd-a9b1-28e84cce6043>2004-05-17 12:28:57 +0000
committergoodale <goodale@57bc7290-fb3d-4efd-a9b1-28e84cce6043>2004-05-17 12:28:57 +0000
commit200002129a78978371969bccc78501172eaf6d62 (patch)
tree4e9287f4d9b3317c04c8f267927a55e583f96534
parentf041f448473140a18c9854b28a552c331c263348 (diff)
Untabified. Please try to adhere to the Cactus coding guidelines when
modifying or adding files. git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllBase/trunk@75 57bc7290-fb3d-4efd-a9b1-28e84cce6043
-rw-r--r--src/Ell_DBstructure.c73
-rw-r--r--src/Ell_Interface.c210
-rw-r--r--src/Ell_Register.c26
-rw-r--r--src/Startup.c33
4 files changed, 166 insertions, 176 deletions
diff --git a/src/Ell_DBstructure.c b/src/Ell_DBstructure.c
index f3592ca..08624e3 100644
--- a/src/Ell_DBstructure.c
+++ b/src/Ell_DBstructure.c
@@ -98,13 +98,13 @@ int Ell_CreateKey(int vartype, const char *keychain)
{
if (!CCTK_Equals(elliptic_verbose,"no"))
{
- char *msg;
- const char *name=CCTK_VarTypeName(vartype);
- msg = (char *)malloc(
- (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
+ char *msg;
+ const char *name=CCTK_VarTypeName(vartype);
+ msg = (char *)malloc(
+ (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
sprintf(msg,"Failed to create %s (%s)",keychain,name);
- CCTK_INFO(msg);
- free(msg);
+ CCTK_INFO(msg);
+ free(msg);
}
retval = ELLCREATE_FAILED;
}
@@ -112,13 +112,13 @@ int Ell_CreateKey(int vartype, const char *keychain)
{
if (!CCTK_Equals(elliptic_verbose,"no"))
{
- char *msg;
- const char *name=CCTK_VarTypeName(vartype);
- msg = (char *)malloc(
- (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
+ char *msg;
+ const char *name=CCTK_VarTypeName(vartype);
+ msg = (char *)malloc(
+ (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
sprintf(msg,"Created %s (%s)",keychain,name);
- CCTK_INFO(msg);
- free(msg);
+ CCTK_INFO(msg);
+ free(msg);
}
retval = 0;
}
@@ -163,7 +163,7 @@ int Ell_UnsetKey(const char *keychain)
if (!(getme))
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Cannot get structure with key %s",keychain);
+ "Ell_GetRealKey: Cannot get structure with key %s",keychain);
retval = ELLGET_NOKEY;
}
else
@@ -206,8 +206,8 @@ int Ell_SetRealKey(CCTK_REAL value, const char *keychain)
{
retval = ELLSET_BADTYPE;
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_SetRealKey: Key %s not of type CCTK_REAL (type %d)",
- keychain,setme->type);
+ "Ell_SetRealKey: Key %s not of type CCTK_REAL (type %d)",
+ keychain,setme->type);
}
else
{
@@ -242,7 +242,7 @@ int Ell_SetIntKey(CCTK_INT value, const char *keychain)
{
retval = ELLSET_BADTYPE;
printf("Ell_SetIntKey: The key you try to set is not of type CCTK_INT: >%s< (type %d)\n",
- keychain,setme->type);
+ keychain,setme->type);
}
else {
setme->type = CCTK_VARIABLE_INT;
@@ -275,8 +275,8 @@ int Ell_SetStrKey(char *value, const char *keychain)
{
retval = ELLSET_BADTYPE;
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_SetStrKey: Key %s not of type STRING (type %d)",
- keychain,setme->type);
+ "Ell_SetStrKey: Key %s not of type STRING (type %d)",
+ keychain,setme->type);
}
else
{
@@ -311,22 +311,22 @@ int Ell_GetRealKey(CCTK_REAL *value, const char *keychain)
if (!(getme))
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Cannot get structure for key %s",keychain);
+ "Ell_GetRealKey: Cannot get structure for key %s",keychain);
retval = ELLGET_NOKEY;
}
else if (getme->type!=CCTK_VARIABLE_REAL)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Not getting a CCTK_REAL value off key %s "
- "type %d (need %d)\n",
- keychain,getme->type,CCTK_VARIABLE_REAL);
+ "Ell_GetRealKey: Not getting a CCTK_REAL value off key %s "
+ "type %d (need %d)\n",
+ keychain,getme->type,CCTK_VARIABLE_REAL);
retval = ELLGET_BADTYPE;
}
else if (getme->been_set==ELL_NO)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Key %s has not been set to any value",
- keychain);
+ "Ell_GetRealKey: Key %s has not been set to any value",
+ keychain);
retval = ELLGET_NOTSET;
}
else
@@ -362,16 +362,16 @@ int Ell_GetIntKey(CCTK_INT *value,const char *keychain)
else if (getme->type!=CCTK_VARIABLE_INT)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetIntKey: Not getting a CCTK_INT value from key %s "
- "(type %d)",
- keychain,getme->type);
+ "Ell_GetIntKey: Not getting a CCTK_INT value from key %s "
+ "(type %d)",
+ keychain,getme->type);
retval = ELLGET_BADTYPE;
}
else if (getme->been_set==ELL_NO)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetIntKey: Key %s has not been set to any value (type %d)",
- keychain,getme->type);
+ "Ell_GetIntKey: Key %s has not been set to any value (type %d)",
+ keychain,getme->type);
retval = ELLGET_NOTSET;
}
else
@@ -404,20 +404,20 @@ int Ell_GetStrKey(char **value, const char *keychain)
if (!(getme))
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetStrKey: Cannot get structure with key %s",keychain);
+ "Ell_GetStrKey: Cannot get structure with key %s",keychain);
retval = ELLGET_NOKEY;
}
else if (getme->type!=CCTK_VARIABLE_STRING)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetStrKey: Not getting a CCTK_STRING from this key %s "
- "type: %d", keychain,getme->type);
+ "Ell_GetStrKey: Not getting a CCTK_STRING from this key %s "
+ "type: %d", keychain,getme->type);
retval = ELLGET_BADTYPE;
}
else if (getme->been_set==ELL_NO)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetStrKey: Key %s has not been set", keychain);
+ "Ell_GetStrKey: Key %s has not been set", keychain);
retval = ELLGET_NOTSET;
}
else
@@ -440,7 +440,7 @@ void CCTK_FCALL CCTK_FNAME(Ell_GetStrKey)
char *message;
message = (char *)malloc( (200+strlen(*cstring))*sizeof(char) );
sprintf(message,"Cannot output %s to char* of length %d\n",
- *cstring,cctk_strlen1);
+ *cstring,cctk_strlen1);
CCTK_Warn (1,__LINE__,__FILE__,"Cactus",message);
free(message);
*nchar = -1;
@@ -462,8 +462,3 @@ void CCTK_FCALL CCTK_FNAME(Ell_GetStrKey)
free(fstring);
}
-
-
-
-
-
diff --git a/src/Ell_Interface.c b/src/Ell_Interface.c
index 4b87ba8..170b943 100644
--- a/src/Ell_Interface.c
+++ b/src/Ell_Interface.c
@@ -45,44 +45,44 @@ int Ell_BrBrConfMetricRegistry(void (*function), const char *sname);
int Ell_PolyConfMetricRegistry(void (*function), const char *sname);
int Ell_LinConfMetricSolver(cGH *GH,
- int *MetricPsi,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname);
+ int *MetricPsi,
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname);
int Ell_LinMetricSolver(cGH *GH,
- int *Metric,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname);
+ int *Metric,
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname);
int Ell_BrBrConfMetricSolver(cGH *GH,
- int *MetricPsi,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname);
+ int *MetricPsi,
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname);
int Ell_PolyConfMetricSolver(cGH *GH,
- int *MetricPsi,
- int FieldIndex,
- int *PIndex,
- int Pcount,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname);
+ int *MetricPsi,
+ int FieldIndex,
+ int *PIndex,
+ int Pcount,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname);
int Ell_LinFlatSolver(cGH *GH,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname);
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname);
void CCTK_FCALL CCTK_FNAME(Ell_LinConfMetricSolver)
@@ -161,20 +161,20 @@ int Ell_LinConfMetricRegistry(int (*function), const char *sname)
}
int Ell_LinConfMetricSolver(cGH *GH,
- int *MetricPsi,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname)
+ int *MetricPsi,
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname)
{
int retval=ELL_SUCCESS;
int (*fn)(cGH *,int *,int,int,int,CCTK_REAL *,CCTK_REAL *);
fn = (int(*)(cGH*,int*,int,int,int,CCTK_REAL*,CCTK_REAL*))
- (GetNamedData(LinConfMetricSolverDB,sname));
+ (GetNamedData(LinConfMetricSolverDB,sname));
if (fn)
{
@@ -205,13 +205,13 @@ void CCTK_FCALL CCTK_FNAME(Ell_LinConfMetricSolver)
ONE_FORTSTRING_CREATE(sname);
*ierr = Ell_LinConfMetricSolver(*GH,
- MetricPsi,
- *FieldIndex,
- *MIndex,
- *NIndex,
- AbsTol,
- RelTol,
- sname);
+ MetricPsi,
+ *FieldIndex,
+ *MIndex,
+ *NIndex,
+ AbsTol,
+ RelTol,
+ sname);
free(sname);
}
@@ -242,13 +242,13 @@ int Ell_LinMetricRegistry(void (*function), const char *sname)
}
int Ell_LinMetricSolver(cGH *GH,
- int *Metric,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname)
+ int *Metric,
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname)
{
int retval=ELL_SUCCESS;
@@ -285,13 +285,13 @@ void CCTK_FCALL CCTK_FNAME(Ell_LinMetricSolver)
ONE_FORTSTRING_CREATE(sname);
*ierr = Ell_LinMetricSolver(*GH,
- Metric,
- *FieldIndex,
- *MIndex,
- *NIndex,
- AbsTol,
- RelTol,
- sname);
+ Metric,
+ *FieldIndex,
+ *MIndex,
+ *NIndex,
+ AbsTol,
+ RelTol,
+ sname);
free(sname);
}
@@ -322,12 +322,12 @@ int Ell_LinFlatRegistry(void (*function), const char *sname)
}
int Ell_LinFlatSolver(cGH *GH,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname)
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname)
{
int retval=ELL_SUCCESS;
@@ -362,12 +362,12 @@ void CCTK_FCALL CCTK_FNAME(Ell_LinFlatSolver)
ONE_FORTSTRING_CREATE(sname);
*ierr = Ell_LinFlatSolver(*GH,
- *FieldIndex,
- *MIndex,
- *NIndex,
- AbsTol,
- RelTol,
- sname);
+ *FieldIndex,
+ *MIndex,
+ *NIndex,
+ AbsTol,
+ RelTol,
+ sname);
free(sname);
}
@@ -399,20 +399,20 @@ int Ell_BrBrConfMetricRegistry(void (*function), const char *sname)
}
int Ell_BrBrConfMetricSolver(cGH *GH,
- int *MetricPsi,
- int FieldIndex,
- int MIndex,
- int NIndex,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname)
+ int *MetricPsi,
+ int FieldIndex,
+ int MIndex,
+ int NIndex,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname)
{
int retval=ELL_SUCCESS;
int (*fn)(cGH *,int *,int,int,int,CCTK_REAL *,CCTK_REAL *);
fn = (int(*)(cGH*,int*,int,int,int,CCTK_REAL*,CCTK_REAL*))
- (GetNamedData(BrBrConfMetricSolverDB,sname));
+ (GetNamedData(BrBrConfMetricSolverDB,sname));
if (fn)
{
@@ -443,13 +443,13 @@ void CCTK_FCALL CCTK_FNAME(Ell_BrBrConfMetricSolver)
ONE_FORTSTRING_CREATE(sname);
*ierr = Ell_BrBrConfMetricSolver(*GH,
- MetricPsi,
- *FieldIndex,
- *MIndex,
- *NIndex,
- AbsTol,
- RelTol,
- sname);
+ MetricPsi,
+ *FieldIndex,
+ *MIndex,
+ *NIndex,
+ AbsTol,
+ RelTol,
+ sname);
free(sname);
@@ -480,20 +480,20 @@ int Ell_PolyConfMetricRegistry(void (*function), const char *sname)
}
int Ell_PolyConfMetricSolver(cGH *GH,
- int *MetricPsi,
- int FieldIndex,
- int *PIndex,
- int Pcount,
- CCTK_REAL *AbsTol,
- CCTK_REAL *RelTol,
- const char *sname)
+ int *MetricPsi,
+ int FieldIndex,
+ int *PIndex,
+ int Pcount,
+ CCTK_REAL *AbsTol,
+ CCTK_REAL *RelTol,
+ const char *sname)
{
int retval=ELL_SUCCESS;
int (*fn)(cGH *,int *,int,int *,int,CCTK_REAL *,CCTK_REAL *);
fn = (int(*)(cGH*,int*,int,int*,int,CCTK_REAL*,CCTK_REAL*))
- (GetNamedData(PolyConfMetricSolverDB,sname));
+ (GetNamedData(PolyConfMetricSolverDB,sname));
if (fn)
{
@@ -523,13 +523,13 @@ void CCTK_FCALL CCTK_FNAME(Ell_PolyConfMetricSolver)
ONE_FORTSTRING_CREATE(sname);
*ierr = Ell_PolyConfMetricSolver(*GH,
- MetricPsi,
- *FieldIndex,
- PIndex,
- *Pcount,
- AbsTol,
- RelTol,
- sname);
+ MetricPsi,
+ *FieldIndex,
+ PIndex,
+ *Pcount,
+ AbsTol,
+ RelTol,
+ sname);
free(sname);
}
diff --git a/src/Ell_Register.c b/src/Ell_Register.c
index dcc50a7..6f2ec3f 100644
--- a/src/Ell_Register.c
+++ b/src/Ell_Register.c
@@ -26,8 +26,8 @@ CCTK_FILEVERSION(CactusElliptic_EllBase_Ell_Register_c)
static pNamedData *EqNameDB;
int Ell_RegisterSolver(void (*function),
- const char *sname,
- const char *eqname);
+ const char *sname,
+ const char *eqname);
int Ell_RegisterEq(void *(function)(const char *, void*), const char *eqname);
@@ -53,20 +53,20 @@ int Ell_RegisterEq(void *(function)(const char *, void*), const char *eqname)
{
if CCTK_EQUALS(elliptic_verbose,"yes")
{
- CCTK_VInfo(CCTK_THORNSTRING,"Registered elliptic class: %s",eqname);
+ CCTK_VInfo(CCTK_THORNSTRING,"Registered elliptic class: %s",eqname);
}
retval = ELL_SUCCESS;
}
else
{
CCTK_VInfo(CCTK_THORNSTRING,"Failed to register elliptic class: %s",
- eqname);
+ eqname);
}
}
else
{
CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Elliptic class %s already registered",eqname);
+ "Elliptic class %s already registered",eqname);
retval = ELL_CLASSEXISTS;
}
@@ -88,8 +88,8 @@ int Ell_RegisterEq(void *(function)(const char *, void*), const char *eqname)
place. Amen*/
int Ell_RegisterSolver(void (*function),
- const char *sname,
- const char *eqname)
+ const char *sname,
+ const char *eqname)
{
DECLARE_CCTK_PARAMETERS
@@ -111,8 +111,8 @@ int Ell_RegisterSolver(void (*function),
if CCTK_EQUALS(elliptic_verbose,"yes")
{
- CCTK_VInfo(CCTK_THORNSTRING,
- "Registered elliptic solver %s for %s",sname,eqname);
+ CCTK_VInfo(CCTK_THORNSTRING,
+ "Registered elliptic solver %s for %s",sname,eqname);
}
retval = ELL_SUCCESS;
@@ -120,15 +120,15 @@ int Ell_RegisterSolver(void (*function),
else if (ierr==ELL_SOLVEREXISTS)
{
CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_RegisterSolver: "
- "Registered second solver %s for %s",sname,eqname);
+ "Ell_RegisterSolver: "
+ "Registered second solver %s for %s",sname,eqname);
retval = ELL_SOLVEREXISTS;
}
else
{
CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_RegisterSolver: "
- "Failed to register solver %s for %s",sname,eqname);
+ "Ell_RegisterSolver: "
+ "Failed to register solver %s for %s",sname,eqname);
}
}
diff --git a/src/Startup.c b/src/Startup.c
index 732b236..a368a0b 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -59,47 +59,42 @@ void Ell_RegisterBaseEqTypes(cGH *GH)
err += Ell_RegisterEq(Ell_LinFlatRegistry, "Ell_LinFlat");
err += Ell_CreateKey(CCTK_VARIABLE_STRING,
- "EllLinFlat::Bnd");
+ "EllLinFlat::Bnd");
err += Ell_CreateKey(CCTK_VARIABLE_STRING,
- "EllLinConfMetric::Bnd");
+ "EllLinConfMetric::Bnd");
err += Ell_CreateKey(CCTK_VARIABLE_STRING,
- "EllLinMetric::Bnd");
+ "EllLinMetric::Bnd");
err += Ell_CreateKey(CCTK_VARIABLE_STRING,
- "EllLinFlat::Bnd::Robin");
+ "EllLinFlat::Bnd::Robin");
err += Ell_CreateKey(CCTK_VARIABLE_STRING,
- "EllLinConfMetric::Bnd::Robin");
+ "EllLinConfMetric::Bnd::Robin");
err += Ell_CreateKey(CCTK_VARIABLE_STRING,
- "EllLinMetric::Bnd::Robin");
+ "EllLinMetric::Bnd::Robin");
/* Register the variables needed to use these boundaries */
err += Ell_CreateKey(CCTK_VARIABLE_REAL,
- "EllLinConfMetric::Bnd::Robin::inf");
+ "EllLinConfMetric::Bnd::Robin::inf");
err += Ell_CreateKey(CCTK_VARIABLE_INT,
- "EllLinConfMetric::Bnd::Robin::falloff");
+ "EllLinConfMetric::Bnd::Robin::falloff");
err += Ell_CreateKey(CCTK_VARIABLE_REAL,
- "EllLinConfMetric::Bnd::Const::V0");
+ "EllLinConfMetric::Bnd::Const::V0");
/* Register the variables needed to use these boundaries */
err += Ell_CreateKey(CCTK_VARIABLE_REAL,
- "EllLinMetric::Bnd::Robin::inf");
+ "EllLinMetric::Bnd::Robin::inf");
err += Ell_CreateKey(CCTK_VARIABLE_INT,
- "EllLinMetric::Bnd::Robin::falloff");
+ "EllLinMetric::Bnd::Robin::falloff");
err += Ell_CreateKey(CCTK_VARIABLE_REAL, "EllLinMetric::Bnd::Const::V0");
/* Register the variables needed to use these boundaries */
err += Ell_CreateKey(CCTK_VARIABLE_REAL,
- "EllLinFlat::Bnd::Robin::inf");
+ "EllLinFlat::Bnd::Robin::inf");
err += Ell_CreateKey(CCTK_VARIABLE_INT,
- "EllLinFlat::Bnd::Robin::falloff");
+ "EllLinFlat::Bnd::Robin::falloff");
err += Ell_CreateKey(CCTK_VARIABLE_REAL,
- "EllLinFlat::Bnd::Const::V0");
+ "EllLinFlat::Bnd::Const::V0");
if (err<0) CCTK_WARN(1,"Error registering the basic elliptic classes");
}
-
-
-
-
-