diff options
author | schnetter <schnetter@6a38eb6e-646e-4a02-a296-d141613ad6c4> | 2004-03-09 09:45:05 +0000 |
---|---|---|
committer | schnetter <schnetter@6a38eb6e-646e-4a02-a296-d141613ad6c4> | 2004-03-09 09:45:05 +0000 |
commit | 0d0a338cb50efccfdabbbc65c917a1e63bc05ecb (patch) | |
tree | 6fd9d0609e957e35700cc0634df1724efe9ff640 /src/CopyBoundary.c | |
parent | 690b22e26602684e32447575b405158216ca25a3 (diff) |
Change the table keys to not contain any spaces. That makes it
possible to create tables from strings, which it turn makes it
possible to set them in parameter files, which it turn decouples
evolution thorns and boundary condition thorns.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Boundary/trunk@265 6a38eb6e-646e-4a02-a296-d141613ad6c4
Diffstat (limited to 'src/CopyBoundary.c')
-rw-r--r-- | src/CopyBoundary.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/CopyBoundary.c b/src/CopyBoundary.c index b87ffc3..d26f099 100644 --- a/src/CopyBoundary.c +++ b/src/CopyBoundary.c @@ -92,7 +92,7 @@ static int ApplyBndCopy (const cGH *GH, @returndesc return code of @seeroutine ApplyBndCopy -11 invalid table handle - -12 no "COPY FROM" key in table + -12 no "COPY_FROM" key in table -21 error reading boundary width array from table -22 wrong size boundary width array in table @endreturndesc @@ -140,13 +140,13 @@ CCTK_INT BndCopy(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars, /* Look on table for copy-from variable */ err = Util_TableQueryValueInfo(tables[i], &value_type, &value_size, - "COPY FROM"); + "COPY_FROM"); if (err == UTIL_ERROR_BAD_HANDLE) { CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, "Invalid table handle passed for Copy boundary " "conditions for %s. Name or index of variable to copy from " - "must be provided via key \"COPY FROM\". Aborting.", + "must be provided via key \"COPY_FROM\". Aborting.", CCTK_VarName(vars[i])); return -11; } else if (err==1) @@ -155,23 +155,23 @@ CCTK_INT BndCopy(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars, { copy_from_name = malloc(value_size*sizeof(char)); Util_TableGetString(tables[i], value_size, copy_from_name, - "COPY FROM"); + "COPY_FROM"); copy_from = CCTK_VarIndex(copy_from_name); free(copy_from_name); } else if (value_type==CCTK_VARIABLE_INT) { - Util_TableGetInt(tables[i], ©_from, "COPY FROM"); + Util_TableGetInt(tables[i], ©_from, "COPY_FROM"); } else { CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, - "Invalid data type for key \"COPY FROM\" " + "Invalid data type for key \"COPY_FROM\" " "Please use CCTK_STRING for the variable name, " "or CCTK_INT for the variable index."); } } else { CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, - "No key \"COPY FROM\" provided in table. Please enter the " + "No key \"COPY_FROM\" provided in table. Please enter the " "name or index of variable to copy from into the table " "under this key. Aborting."); return -12; @@ -192,7 +192,7 @@ CCTK_INT BndCopy(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars, if (widths[i]<0) { err = Util_TableGetIntArray(tables[i], gdim, width_alldirs, - "BOUNDARY WIDTH"); + "BOUNDARY_WIDTH"); if (err<0) { CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, |