diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2003-01-06 13:20:34 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2003-01-06 13:20:34 +0000 |
| commit | 28599d36fc36062eef56d906e46f38d26394d7d6 (patch) | |
| tree | d1a4d189d8c5f2fd3f930eed9ee4b91a3c0d715f | |
| parent | 6ae7a38b76a7290f49447bbeaade9e45335c0dd8 (diff) | |
For CCTK_InterpGridArrays(), merge the local and global parameter tables into a
single one.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3071 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rw-r--r-- | src/comm/Interp.c | 18 | ||||
| -rw-r--r-- | src/include/CommOverloadables.h | 6 |
2 files changed, 7 insertions, 17 deletions
diff --git a/src/comm/Interp.c b/src/comm/Interp.c index 5cee08f1..ad255f7a 100644 --- a/src/comm/Interp.c +++ b/src/comm/Interp.c @@ -78,8 +78,7 @@ void CCTK_FCALL CCTK_FNAME (CCTK_InterpGridArrays) (int *ierror, const cGH *GH, const int *N_dims, - const int *global_param_table_handle, - const int *local_param_table_handle, + const int *param_table_handle, const int *local_interp_handle, const int *coord_system_handle, const int *N_interp_points, @@ -1118,15 +1117,10 @@ void CCTK_FCALL CCTK_FNAME (CCTK_InterpLocal) @vtype const int * @vio in @endvar - @var global_param_table_handle - @vdesc (reference to) the parameter table handle for passing optional - parameters to the global interpolator routine - @vtype const int * - @vio in @endvar - @var local_param_table_handle + @var param_table_handle @vdesc (reference to) the parameter table handle for passing optional - parameters to the local interpolator routine + parameters to the interpolator routine @vtype const int * @vio in @endvar @@ -1191,8 +1185,7 @@ void CCTK_FCALL CCTK_FNAME (CCTK_InterpGridArrays) (int *ierror, const cGH *GH, const int *N_dims, - const int *global_param_table_handle, - const int *local_param_table_handle, + const int *param_table_handle, const int *local_interp_handle, const int *coord_system_handle, const int *N_interp_points, @@ -1204,8 +1197,7 @@ void CCTK_FCALL CCTK_FNAME (CCTK_InterpGridArrays) const CCTK_INT output_array_types[], void *const output_arrays[]) { - *ierror = CCTK_InterpGridArrays (GH, *N_dims, *global_param_table_handle, - *local_param_table_handle, + *ierror = CCTK_InterpGridArrays (GH, *N_dims, *param_table_handle, *local_interp_handle, *coord_system_handle, *N_interp_points, *interp_coords_type, interp_coords, diff --git a/src/include/CommOverloadables.h b/src/include/CommOverloadables.h index 52daa165..e07669a4 100644 --- a/src/include/CommOverloadables.h +++ b/src/include/CommOverloadables.h @@ -124,8 +124,7 @@ OVERLOADABLE(GroupStorageDecrease) #define RETURN_TYPE int #define ARGUMENTS const cGH *GH, \ int N_dims, \ - int global_param_table_handle, \ - int local_param_table_handle, \ + int param_table_handle, \ int local_interp_handle, \ int coord_system_handle, \ int N_interp_points, \ @@ -138,8 +137,7 @@ OVERLOADABLE(GroupStorageDecrease) void *const output_arrays[] #define USE_ARGUMENTS (void) (GH + 0); \ (void) (N_dims + 0); \ - (void) (global_param_table_handle + 0); \ - (void) (local_param_table_handle + 0); \ + (void) (param_table_handle + 0); \ (void) (local_interp_handle + 0); \ (void) (coord_system_handle + 0); \ (void) (N_interp_points + 0); \ |