aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrideout <rideout@6a38eb6e-646e-4a02-a296-d141613ad6c4>2003-01-27 10:45:54 +0000
committerrideout <rideout@6a38eb6e-646e-4a02-a296-d141613ad6c4>2003-01-27 10:45:54 +0000
commit77b273f9b5c6eda5b2c47514537005b9a51ce555 (patch)
tree8ea3306a42c2a93429a684b12ec1ec88e9f2be6a
parent14ebce78f4d5d1f36f5c594c2bee66a1d6be3624 (diff)
Shorten names of functions which provide aliases, so that they fall
within the 32 character limit. Make local functions static. git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Boundary/trunk@193 6a38eb6e-646e-4a02-a296-d141613ad6c4
-rw-r--r--interface.ccl12
-rw-r--r--src/Boundary.c58
2 files changed, 35 insertions, 35 deletions
diff --git a/interface.ccl b/interface.ccl
index 7950d1d..06bdd60 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -14,7 +14,7 @@ USES INCLUDE HEADER: Symmetry.h
CCTK_INT FUNCTION Boundary_RegisterPhysicalBC CCTK_POINTER GH, \
CCTK_FPOINTER function_pointer, CCTK_STRING bc_name
PROVIDES FUNCTION Boundary_RegisterPhysicalBC WITH \
- Boundary_Boundary_RegisterPhysicalBC
+ Bdry_Boundary_RegisterPhysicalBC
USES FUNCTION Boundary_RegisterPhysicalBC
CCTK_INT FUNCTION Boundary_SelectVarForBC CCTK_POINTER GH, \
@@ -25,15 +25,15 @@ CCTK_INT FUNCTION Boundary_SelectGroupForBC CCTK_POINTER GH, \
CCTK_INT table_handle, CCTK_STRING group_name, CCTK_STRING bc_name
CCTK_INT FUNCTION Boundary_SelectGroupForBCI CCTK_POINTER GH, \
CCTK_INT table_handle, CCTK_INT group_index, CCTK_STRING bc_name
-PROVIDES FUNCTION Boundary_SelectVarForBC WITH Boundary_Boundary_SelectVarForBC
+PROVIDES FUNCTION Boundary_SelectVarForBC WITH Bdry_Boundary_SelectVarForBC
PROVIDES FUNCTION Boundary_SelectVarForBCI WITH \
- Boundary_Boundary_SelectVarForBCI
+ Bdry_Boundary_SelectVarForBCI
PROVIDES FUNCTION Boundary_SelectGroupForBC WITH \
- Boundary_Boundary_SelectGroupForBC
+ Bdry_Boundary_SelectGroupForBC
PROVIDES FUNCTION Boundary_SelectGroupForBCI WITH \
- Boundary_Boundary_SelectGroupForBCI
+ Bdry_Boundary_SelectGroupForBCI
CCTK_INT FUNCTION Boundary_SelectedGVs CCTK_POINTER GH, \
CCTK_INT array_size, CCTK_POINTER var_indicies, CCTK_POINTER table_handles, \
CCTK_STRING bc_name
-PROVIDES FUNCTION Boundary_SelectedGVs WITH Boundary_Boundary_SelectedGVs
+PROVIDES FUNCTION Boundary_SelectedGVs WITH Bdry_Boundary_SelectedGVs
diff --git a/src/Boundary.c b/src/Boundary.c
index fbbe352..5fb842a 100644
--- a/src/Boundary.c
+++ b/src/Boundary.c
@@ -70,32 +70,32 @@ struct BCDATA
********************* Local Routine Prototypes *********************
********************************************************************/
-int entry_less_than(struct BCVAR *new, struct BCVAR *current);
+static int entry_less_than(struct BCVAR *new, struct BCVAR *current);
/********************************************************************
***************** Aliased Routine Prototypes ***********************
********************************************************************/
-CCTK_INT Boundary_Boundary_RegisterPhysicalBC(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_RegisterPhysicalBC(CCTK_POINTER GH,
CCTK_FPOINTER fn_pointer,
CCTK_STRING bc_name);
-CCTK_INT Boundary_Boundary_SelectVarForBC(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectVarForBC(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_STRING var_name,
CCTK_STRING bc_name);
-CCTK_INT Boundary_Boundary_SelectVarForBCI(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectVarForBCI(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_INT var_index,
CCTK_STRING bc_name);
-CCTK_INT Boundary_Boundary_SelectGroupForBC(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectGroupForBC(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_STRING group_name,
CCTK_STRING bc_name);
-CCTK_INT Boundary_Boundary_SelectGroupForBCI(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectGroupForBCI(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_INT group_index,
CCTK_STRING bc_name);
-CCTK_INT Boundary_Boundary_SelectedGVs(CCTK_POINTER GH, CCTK_INT array_size,
+CCTK_INT Bdry_Boundary_SelectedGVs(CCTK_POINTER GH, CCTK_INT array_size,
CCTK_POINTER var_indices,
CCTK_POINTER table_handles,
CCTK_STRING bc_name);
@@ -134,7 +134,7 @@ static struct BCDATA *bcdata_list = NULL;
********************************************************************/
/*@@
- @routine Boundary_Boundary_RegisterPhysicalBC
+ @routine Bdry_Boundary_RegisterPhysicalBC
@date Sun Nov 3 19:51:37 CET 2002
@author David Rideout
@desc
@@ -167,7 +167,7 @@ static struct BCDATA *bcdata_list = NULL;
-3 error adding bc to table
@endreturndesc
@@*/
-CCTK_INT Boundary_Boundary_RegisterPhysicalBC(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_RegisterPhysicalBC(CCTK_POINTER GH,
CCTK_FPOINTER fn_pointer,
CCTK_STRING bc_name)
{
@@ -228,7 +228,7 @@ CCTK_INT Boundary_Boundary_RegisterPhysicalBC(CCTK_POINTER GH,
}
/*@@
- @routine Boundary_Boundary_SelectVarForBC
+ @routine Bdry_Boundary_SelectVarForBC
@date Sun Nov 3 19:51:37 CET 2002
@author David Rideout
@desc
@@ -262,10 +262,10 @@ CCTK_INT Boundary_Boundary_RegisterPhysicalBC(CCTK_POINTER GH,
@returndesc
0 success
-3 invalid variable name
- or the returncode of @seeroutine Boundary_Boundary_SelectVarForBCI
+ or the returncode of @seeroutine Bdry_Boundary_SelectVarForBCI
@endreturndesc
@@*/
-CCTK_INT Boundary_Boundary_SelectVarForBC(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectVarForBC(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_STRING var_name,
CCTK_STRING bc_name)
@@ -282,7 +282,7 @@ CCTK_INT Boundary_Boundary_SelectVarForBC(CCTK_POINTER GH,
retval = -3;
} else
{
- retval = Boundary_Boundary_SelectVarForBCI(GH, table_handle, var_index,
+ retval = Bdry_Boundary_SelectVarForBCI(GH, table_handle, var_index,
bc_name);
}
@@ -290,7 +290,7 @@ CCTK_INT Boundary_Boundary_SelectVarForBC(CCTK_POINTER GH,
}
/*@@
- @routine Boundary_Boundary_SelectVarForBCI
+ @routine Bdry_Boundary_SelectVarForBCI
@date Sun Nov 3 19:51:37 CET 2002
@author David Rideout
@desc
@@ -328,7 +328,7 @@ CCTK_INT Boundary_Boundary_SelectVarForBC(CCTK_POINTER GH,
-4 error allocating memory for new entry in 'bcdata' database
@endreturndesc
@@*/
-CCTK_INT Boundary_Boundary_SelectVarForBCI(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectVarForBCI(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_INT var_index,
CCTK_STRING bc_name)
@@ -509,7 +509,7 @@ CCTK_INT Boundary_Boundary_SelectVarForBCI(CCTK_POINTER GH,
}
/*@@
- @routine Boundary_Boundary_SelectGroupForBC
+ @routine Bdry_Boundary_SelectGroupForBC
@date Thu Dec 26 21:45:34 CET 2002
@author David Rideout
@desc
@@ -543,10 +543,10 @@ CCTK_INT Boundary_Boundary_SelectVarForBCI(CCTK_POINTER GH,
@returndesc
0 success
-6 invalid group name
- or the returncode of @seeroutine Boundary_Boundary_SelectGroupForBCI
+ or the returncode of @seeroutine Bdry_Boundary_SelectGroupForBCI
@endreturndesc
@@*/
-CCTK_INT Boundary_Boundary_SelectGroupForBC(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectGroupForBC(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_STRING group_name,
CCTK_STRING bc_name)
@@ -568,8 +568,8 @@ CCTK_INT Boundary_Boundary_SelectGroupForBC(CCTK_POINTER GH,
retval = -6;
} else
{
- /* call Boundary_Boundary_SelectGroupForBCI() */
- retval = Boundary_Boundary_SelectGroupForBCI(GH, table_handle, gi,
+ /* call Bdry_Boundary_SelectGroupForBCI() */
+ retval = Bdry_Boundary_SelectGroupForBCI(GH, table_handle, gi,
bc_name);
}
@@ -577,7 +577,7 @@ CCTK_INT Boundary_Boundary_SelectGroupForBC(CCTK_POINTER GH,
}
/*@@
- @routine Boundary_Boundary_SelectGroupForBCI
+ @routine Bdry_Boundary_SelectGroupForBCI
@date Thu Dec 26 21:45:34 CET 2002
@author David Rideout
@desc
@@ -611,10 +611,10 @@ CCTK_INT Boundary_Boundary_SelectGroupForBC(CCTK_POINTER GH,
@returndesc
0 success
-7 invalid group index
- or the returncode of @seeroutine Boundary_Boundary_SelectVarForBCI
+ or the returncode of @seeroutine Bdry_Boundary_SelectVarForBCI
@endreturndesc
@@*/
-CCTK_INT Boundary_Boundary_SelectGroupForBCI(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectGroupForBCI(CCTK_POINTER GH,
CCTK_INT table_handle,
CCTK_INT group_index,
CCTK_STRING bc_name)
@@ -635,14 +635,14 @@ CCTK_INT Boundary_Boundary_SelectGroupForBCI(CCTK_POINTER GH,
max_vi = vi + num_vars;
for (; vi<max_vi; ++vi)
{
- retval = Boundary_Boundary_SelectVarForBCI(GH, table_handle, vi, bc_name);
+ retval = Bdry_Boundary_SelectVarForBCI(GH, table_handle, vi, bc_name);
}
return retval;
}
/*@@
- @routine Boundary_Boundary_SelectedGVs
+ @routine Bdry_Boundary_SelectedGVs
@date Sun Nov 3 19:51:37 CET 2002
@author David Rideout
@desc
@@ -684,7 +684,7 @@ CCTK_INT Boundary_Boundary_SelectGroupForBCI(CCTK_POINTER GH,
number of variables selected for bc_name
@endreturndesc
@@*/
-CCTK_INT Boundary_Boundary_SelectedGVs(CCTK_POINTER GH,
+CCTK_INT Bdry_Boundary_SelectedGVs(CCTK_POINTER GH,
CCTK_INT array_size,
CCTK_POINTER var_indices,
CCTK_POINTER table_handles,
@@ -867,10 +867,10 @@ void Boundary_ApplyPhysicalBCs(CCTK_ARGUMENTS)
}
/* get selected vars for this bc_name*/
- err = Boundary_Boundary_SelectedGVs(cctkGH, num_vars, vars, tables,
+ err = Bdry_Boundary_SelectedGVs(cctkGH, num_vars, vars, tables,
current_bcdata->bc_name);
if (err<0) /* This is a redundant test for now,
- Boundary_Boundary_SelectedGVs never returns <0 */
+ Bdry_Boundary_SelectedGVs never returns <0 */
{
CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
"Error in Boundary_SelectedGVs for %s boundary condition",
@@ -1000,7 +1000,7 @@ void Boundary_ClearSelection(void)
has smaller variable index
@endreturndesc
@@*/
-int entry_less_than(struct BCVAR *new, struct BCVAR *current)
+static int entry_less_than(struct BCVAR *new, struct BCVAR *current)
{
int retval;