CarpetLib: Correct C++ error in prolongation operators

Specify the template parameter T explicitly when calling the pointwise
interpolation routine.

3 files changed, 33 insertions, 33 deletions

diff --git a/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc
index 3cb27f8a6..d731d524d 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc
@@ -73,7 +73,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp0 (p + i*d1);
+      res += coeff<RT>(i) * interp0<T> (p + i*d1);
     }
     return res;
   }
@@ -89,7 +89,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp1 (p + i*d2, d1);
+      res += coeff<RT>(i) * interp1<T> (p + i*d2, d1);
     }
     return res;
   }
@@ -106,7 +106,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp2 (p + i*d3, d1, d2);
+      res += coeff<RT>(i) * interp2<T> (p + i*d3, d1, d2);
     }
     return res;
   }
@@ -244,7 +244,7 @@ namespace CarpetLib {
     
     // kernel
    l8000:
-    dst[DSTIND3(id,jd,kd)] = interp0 (& src[SRCIND3(is,js,ks)]);
+    dst[DSTIND3(id,jd,kd)] = interp0<T> (& src[SRCIND3(is,js,ks)]);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8001;
@@ -252,7 +252,7 @@ namespace CarpetLib {
     
     // kernel
    l8001:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is-3,js,ks)], srcdi);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is-3,js,ks)], srcdi);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -276,7 +276,7 @@ namespace CarpetLib {
     
     // kernel
    l8010:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js-3,ks)], srcdj);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js-3,ks)], srcdj);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8011;
@@ -285,7 +285,7 @@ namespace CarpetLib {
     // kernel
    l8011:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj);
+      interp2<T> (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -325,7 +325,7 @@ namespace CarpetLib {
     
     // kernel
    l8100:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js,ks-3)], srcdk);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js,ks-3)], srcdk);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8101;
@@ -334,7 +334,7 @@ namespace CarpetLib {
     // kernel
    l8101:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj);
+      interp2<T> (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -359,7 +359,7 @@ namespace CarpetLib {
     // kernel
    l8110:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk);
+      interp2<T> (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8111;
@@ -369,7 +369,7 @@ namespace CarpetLib {
    l8111:
     {
       dst[DSTIND3(id,jd,kd)] =
-        interp3 (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk);
+        interp3<T> (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk);
     }
     i = i+1;
     id = id+1;
diff --git a/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc
index d48380659..a7341139f 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc
@@ -69,7 +69,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp0 (p + i*d1);
+      res += coeff<RT>(i) * interp0<T> (p + i*d1);
     }
     return res;
   }
@@ -85,7 +85,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp1 (p + i*d2, d1);
+      res += coeff<RT>(i) * interp1<T> (p + i*d2, d1);
     }
     return res;
   }
@@ -102,7 +102,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp2 (p + i*d3, d1, d2);
+      res += coeff<RT>(i) * interp2<T> (p + i*d3, d1, d2);
     }
     return res;
   }
@@ -240,7 +240,7 @@ namespace CarpetLib {
     
     // kernel
    l8000:
-    dst[DSTIND3(id,jd,kd)] = interp0 (& src[SRCIND3(is,js,ks)]);
+    dst[DSTIND3(id,jd,kd)] = interp0<T> (& src[SRCIND3(is,js,ks)]);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8001;
@@ -248,7 +248,7 @@ namespace CarpetLib {
     
     // kernel
    l8001:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is-3,js,ks)], srcdi);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is-3,js,ks)], srcdi);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -272,7 +272,7 @@ namespace CarpetLib {
     
     // kernel
    l8010:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js-3,ks)], srcdj);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js-3,ks)], srcdj);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8011;
@@ -281,7 +281,7 @@ namespace CarpetLib {
     // kernel
    l8011:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj);
+      interp2<T> (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -321,7 +321,7 @@ namespace CarpetLib {
     
     // kernel
    l8100:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js,ks-3)], srcdk);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js,ks-3)], srcdk);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8101;
@@ -330,7 +330,7 @@ namespace CarpetLib {
     // kernel
    l8101:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj);
+      interp2<T> (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -355,7 +355,7 @@ namespace CarpetLib {
     // kernel
    l8110:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk);
+      interp2<T> (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8111;
@@ -365,7 +365,7 @@ namespace CarpetLib {
    l8111:
     {
       dst[DSTIND3(id,jd,kd)] =
-        interp3 (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk);
+        interp3<T> (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk);
     }
     i = i+1;
     id = id+1;
diff --git a/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc
index 045c7a627..cd0d6038b 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc
@@ -71,7 +71,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp0 (p + i*d1);
+      res += coeff<RT>(i) * interp0<T> (p + i*d1);
     }
     return res;
   }
@@ -87,7 +87,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp1 (p + i*d2, d1);
+      res += coeff<RT>(i) * interp1<T> (p + i*d2, d1);
     }
     return res;
   }
@@ -104,7 +104,7 @@ namespace CarpetLib {
     typedef typename typeprops<T>::real RT;
     T res = typeprops<T>::fromreal (0);
     for (int i=0; i<ncoeffs; ++i) {
-      res += coeff<RT>(i) * interp2 (p + i*d3, d1, d2);
+      res += coeff<RT>(i) * interp2<T> (p + i*d3, d1, d2);
     }
     return res;
   }
@@ -242,7 +242,7 @@ namespace CarpetLib {
     
     // kernel
    l8000:
-    dst[DSTIND3(id,jd,kd)] = interp0 (& src[SRCIND3(is,js,ks)]);
+    dst[DSTIND3(id,jd,kd)] = interp0<T> (& src[SRCIND3(is,js,ks)]);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8001;
@@ -250,7 +250,7 @@ namespace CarpetLib {
     
     // kernel
    l8001:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is-3,js,ks)], srcdi);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is-3,js,ks)], srcdi);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -274,7 +274,7 @@ namespace CarpetLib {
     
     // kernel
    l8010:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js-3,ks)], srcdj);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js-3,ks)], srcdj);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8011;
@@ -283,7 +283,7 @@ namespace CarpetLib {
     // kernel
    l8011:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj);
+      interp2<T> (& src[SRCIND3(is-3,js-3,ks)], srcdi, srcdj);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -323,7 +323,7 @@ namespace CarpetLib {
     
     // kernel
    l8100:
-    dst[DSTIND3(id,jd,kd)] = interp1 (& src[SRCIND3(is,js,ks-3)], srcdk);
+    dst[DSTIND3(id,jd,kd)] = interp1<T> (& src[SRCIND3(is,js,ks-3)], srcdk);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8101;
@@ -332,7 +332,7 @@ namespace CarpetLib {
     // kernel
    l8101:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj);
+      interp2<T> (& src[SRCIND3(is-3,js,ks-3)], srcdi, srcdj);
     i = i+1;
     id = id+1;
     is = is+1;
@@ -357,7 +357,7 @@ namespace CarpetLib {
     // kernel
    l8110:
     dst[DSTIND3(id,jd,kd)] =
-      interp2 (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk);
+      interp2<T> (& src[SRCIND3(is,js-3,ks-3)], srcdj, srcdk);
     i = i+1;
     id = id+1;
     if (i < regiext) goto l8111;
@@ -367,7 +367,7 @@ namespace CarpetLib {
    l8111:
     {
       dst[DSTIND3(id,jd,kd)] =
-        interp3 (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk);
+        interp3<T> (& src[SRCIND3(is-3,js-3,ks-3)], srcdi, srcdj, srcdk);
     }
     i = i+1;
     id = id+1;