1 files changed, 23 insertions, 23 deletions

diff --git a/Carpet/CarpetLib/src/prolongate_3d_o3_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o3_rf2.cc
index a55bd69da..91b3e5bc1 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_o3_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_o3_rf2.cc
@@ -6,7 +6,7 @@
 #include <cctk.h>
 #include <cctk_Parameters.h>
 
-#include "operator_prototypes.hh"
+#include "operator_prototypes_3d.hh"
 #include "typeprops.hh"
 
 using namespace std;
@@ -31,7 +31,7 @@ namespace CarpetLib {
   prolongate_3d_o3_rf2 (T const * restrict const src,
                         ivect3 const & restrict srcext,
                         T * restrict const dst,
-                        ivect const & restrict dstext,
+                        ivect3 const & restrict dstext,
                         ibbox3 const & restrict srcbbox,
                         ibbox3 const & restrict dstbbox,
                         ibbox3 const & restrict regbbox)
@@ -143,7 +143,7 @@ namespace CarpetLib {
     goto l81;
     
     // begin j loop
-   l80:
+  l80:
     j = 0;
     js = j0;
     jd = dstjoff;
@@ -151,7 +151,7 @@ namespace CarpetLib {
     goto l801;
     
     // begin i loop
-   l800:
+  l800:
     i = 0;
     is = i0;
     id = dstioff;
@@ -159,7 +159,7 @@ namespace CarpetLib {
     goto l8001;
     
     // kernel
-   l8000:
+  l8000:
     dst[DSTIND3(id,jd,kd)] = src[SRCIND3(is,js,ks)];
     i = i+1;
     id = id+1;
@@ -167,7 +167,7 @@ namespace CarpetLib {
     goto l900;
     
     // kernel
-   l8001:
+  l8001:
     dst[DSTIND3(id,jd,kd)] =
       + f1 * src[SRCIND3(is-1,js,ks)]
       + f2 * src[SRCIND3(is  ,js,ks)]
@@ -180,14 +180,14 @@ namespace CarpetLib {
     goto l900;
     
     // end i loop
-   l900:
+  l900:
     j = j+1;
     jd = jd+1;
     if (j < regjext) goto l801;
     goto l90;
     
     // begin i loop
-   l801:
+  l801:
     i = 0;
     is = i0;
     id = dstioff;
@@ -195,7 +195,7 @@ namespace CarpetLib {
     goto l8011;
     
     // kernel
-   l8010:
+  l8010:
     dst[DSTIND3(id,jd,kd)] =
       + f1 * src[SRCIND3(is,js-1,ks)]
       + f2 * src[SRCIND3(is,js  ,ks)]
@@ -207,7 +207,7 @@ namespace CarpetLib {
     goto l901;
     
     // kernel
-   l8011:
+  l8011:
     dst[DSTIND3(id,jd,kd)] =
       + f1*f1 * src[SRCIND3(is-1,js-1,ks)]
       + f2*f1 * src[SRCIND3(is  ,js-1,ks)]
@@ -232,7 +232,7 @@ namespace CarpetLib {
     goto l901;
     
     // end i loop
-   l901:
+  l901:
     j = j+1;
     jd = jd+1;
     js = js+1;
@@ -240,14 +240,14 @@ namespace CarpetLib {
     goto l90;
     
     // end j loop
-   l90:
+  l90:
     k = k+1;
     kd = kd+1;
     if (k < regkext) goto l81;
     goto l9;
     
     // begin j loop
-   l81:
+  l81:
     j = 0;
     js = j0;
     jd = dstjoff;
@@ -255,7 +255,7 @@ namespace CarpetLib {
     goto l811;
     
     // begin i loop
-   l810:
+  l810:
     i = 0;
     is = i0;
     id = dstioff;
@@ -263,7 +263,7 @@ namespace CarpetLib {
     goto l8101;
     
     // kernel
-   l8100:
+  l8100:
     dst[DSTIND3(id,jd,kd)] =
       + f1 * src[SRCIND3(is,js,ks-1)]
       + f2 * src[SRCIND3(is,js,ks  )]
@@ -275,7 +275,7 @@ namespace CarpetLib {
     goto l910;
     
     // kernel
-   l8101:
+  l8101:
     dst[DSTIND3(id,jd,kd)] =
       + f1*f1 * src[SRCIND3(is-1,js,ks-1)]
       + f2*f1 * src[SRCIND3(is  ,js,ks-1)]
@@ -300,14 +300,14 @@ namespace CarpetLib {
     goto l910;
     
     // end i loop
-   l910:
+  l910:
     j = j+1;
     jd = jd+1;
     if (j < regjext) goto l811;
     goto l91;
     
     // begin i loop
-   l811:
+  l811:
     i = 0;
     is = i0;
     id = dstioff;
@@ -315,7 +315,7 @@ namespace CarpetLib {
     goto l8111;
     
     // kernel
-   l8110:
+  l8110:
     dst[DSTIND3(id,jd,kd)] =
       + f1*f1 * src[SRCIND3(is,js-1,ks-1)]
       + f2*f1 * src[SRCIND3(is,js  ,ks-1)]
@@ -339,7 +339,7 @@ namespace CarpetLib {
     goto l911;
     
     // kernel
-   l8111:
+  l8111:
     {
       T const res1 =
         + f1*f1*f1 * src[SRCIND3(is-1,js-1,ks-1)]
@@ -418,7 +418,7 @@ namespace CarpetLib {
     goto l911;
     
     // end i loop
-   l911:
+  l911:
     j = j+1;
     jd = jd+1;
     js = js+1;
@@ -426,7 +426,7 @@ namespace CarpetLib {
     goto l91;
     
     // end j loop
-   l91:
+  l91:
     k = k+1;
     kd = kd+1;
     ks = ks+1;
@@ -434,7 +434,7 @@ namespace CarpetLib {
     goto l9;
     
     // end k loop
-   l9:;
+  l9:;
     
   }