More checking for invalid data pointers

git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllSOR/trunk@77 fa3da13c-9f13-4301-a575-cf5b8c5e1907

1 files changed, 14 insertions, 0 deletions

diff --git a/src/ConfMetric.c b/src/ConfMetric.c
index dad8580..1b714a7 100644
--- a/src/ConfMetric.c
+++ b/src/ConfMetric.c
@@ -196,6 +196,10 @@ int SORConfMetric3D(cGH *GH, int *MetricPsiI, int conformal,
 
   timelevel = 0;
   var = (CCTK_REAL*) CCTK_VarDataPtrI(GH, timelevel, FieldIndex);
+  if (!var)
+  {
+    CCTK_WARN(0,"Invalid data for Field");
+  }
 
   timelevel = 0;
   gxx = (CCTK_REAL*) CCTK_VarDataPtrI(GH, timelevel, MetricPsiI[0]);
@@ -204,11 +208,21 @@ int SORConfMetric3D(cGH *GH, int *MetricPsiI, int conformal,
   gyy = (CCTK_REAL*) CCTK_VarDataPtrI(GH, timelevel, MetricPsiI[3]);
   gyz = (CCTK_REAL*) CCTK_VarDataPtrI(GH, timelevel, MetricPsiI[4]);
   gzz = (CCTK_REAL*) CCTK_VarDataPtrI(GH, timelevel, MetricPsiI[5]);
+  if (!(gxx&&gyy&&gzz&&gxy&&gxz&&gyz))
+  {
+    CCTK_WARN(0,"Invalid data for Metric");
+  }
 
   if (conformal)
   {
     timelevel = 0;
+    psi = NULL;
     psi = (CCTK_REAL*) CCTK_VarDataPtrI(GH, timelevel, MetricPsiI[6]);
+    if (!psi)
+    {
+      CCTK_WARN(0,"Invalid data for conformal factor");
+    }
+
   }
 
   /* if we have a negative index for M/N, this GF is not needed,