[cig-commits] r14788 - mc/3D/CitcomS/trunk/lib

[leif at geodynamics.org]

Author: leif
Date: 2009-04-22 19:32:01 -0700 (Wed, 22 Apr 2009)
New Revision: 14788

Modified:
   mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu
Log:
Don't call through function pointers -- otherwise, 'nvcc' crashes!


Modified: mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu
===================================================================
--- mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu	2009-04-23 02:22:19 UTC (rev 14787)
+++ mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu	2009-04-23 02:32:01 UTC (rev 14788)
@@ -28,8 +28,6 @@
 /*------------------------------------------------------------------------*/
 /* from Regional_parallel_related.c */
 
-/* XXX: full_exchange_id_d() */
-
 __device__ void regional_exchange_id_d(
     struct All_variables *E,
     double **U,
@@ -84,6 +82,19 @@
 
 
 /*------------------------------------------------------------------------*/
+/* from Full_parallel_related.c */
+
+__device__ void full_exchange_id_d(
+    struct All_variables *E,
+    double **U,
+    int lev
+    )
+{
+    /* XXX */
+}
+
+
+/*------------------------------------------------------------------------*/
 /* from BC_util.c */
 
 __device__ void strip_bcs_from_residual(
@@ -166,8 +177,8 @@
         }          /* end for e */
     }         /* end for m  */
     
-    if (0) {
-        (E->solver.exchange_id_d)(E, Au, level);
+    if (0) { /* XXX */
+        full_exchange_id_d(E, Au, level);
     } else {
         regional_exchange_id_d(E, Au, level);
     }
@@ -233,8 +244,8 @@
         }     /* end for e */
     }     /* end for m */
     
-    if (0) {
-        (E->solver.exchange_id_d)(E, Au, level);
+    if (0) { /* XXX */
+        full_exchange_id_d(E, Au, level);
     } else {
         regional_exchange_id_d(E, Au, level);
     }