Analyse the options table more gracefully, and abort with a nice error

message if something is wrong.


git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/SummationByParts/trunk@28 f69c4107-0314-4c4f-9ad4-17e986b73f4a

1 files changed, 10 insertions, 4 deletions

diff --git a/src/get_coeffs.c b/src/get_coeffs.c
index 0d8e365..af1df67 100644
--- a/src/get_coeffs.c
+++ b/src/get_coeffs.c
@@ -1,10 +1,12 @@
+#include <assert.h>
+#include <stdio.h>
+
 #include "cctk.h"
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
-#include "util_Table.h"
-#include <stdio.h>
 
-#include <assert.h>
+#include "util_ErrorCodes.h"
+#include "util_Table.h"
 
 void DiffCoeff ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir,
                  const CCTK_INT nsize, CCTK_INT *imin, CCTK_INT *imax,
@@ -65,7 +67,11 @@ void DiffCoeff ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir,
 
   if ( table_handle >=0 ) {
     nelements = Util_TableGetInt ( table_handle, &loc_order, "order" );
-    assert(nelements>0);
+    if ( nelements == UTIL_ERROR_TABLE_NO_SUCH_KEY ) {
+      loc_order = order;
+    } else if ( nelements != 1) {
+      CCTK_WARN (0, "The options table has an entry \"order\", but it does not have the right properties");
+    }
   } else {
     loc_order = order;
   }