Combine CarpetLib's INSTANTIATE and Carpet's TYPECASE mechanism into a

single mechanism provided by CarpetLib.

Use this mechanism everywhere.

1 files changed, 3 insertions, 2 deletions

diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 636247d20..b6ff7e82b 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -8,6 +8,7 @@
 #include <dh.hh>
 #include <gf.hh>
 #include <operators.hh>
+#include <typeprops.hh>
 
 #include <carpet.hh>
 
@@ -158,7 +159,7 @@ namespace Carpet {
                 const int varindex = firstvarindex + var;
 #warning "TODO: allocate these in SetupGH, and after recomposing"
                 if (not arrdata.AT(group).AT(m).data.AT(var)) {
-                  switch (gp.vartype) {
+                  switch (specific_cactus_type(gp.vartype)) {
 #define TYPECASE(N,T)                                                   \
                     case N:                                             \
                       arrdata.AT(group).AT(m).data.AT(var) = new gf<T>  \
@@ -169,7 +170,7 @@ namespace Carpet {
                        prolongation_order_time,                         \
                        vectorlength, vectorindex, (gf<T>*)vectorleader); \
                     break;
-#include "typecase"
+#include "typecase.hh"
 #undef TYPECASE
                   default:
                     UnsupportedVarType (varindex);