diff options
| -rw-r--r-- | Tools/CodeGen/CalculationFunction.m | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Tools/CodeGen/CalculationFunction.m b/Tools/CodeGen/CalculationFunction.m index 8e477ea..5356672 100644 --- a/Tools/CodeGen/CalculationFunction.m +++ b/Tools/CodeGen/CalculationFunction.m @@ -580,7 +580,8 @@ DefFn[ "public:", " typedef hrscc::CLaw<DGFE_"<>name<>"> claw;", " typedef hrscc::traits<DGFE_"<>name<>">::state_t state_t;", - " static int const nvars = state_t::nvars;", + " typedef hrscc::traits<DGFE_"<>name<>"> variables_t;", + " static int const nvars = variables_t::nvars;", " ", " DGFE_"<>name<>"();", " ", @@ -612,7 +613,7 @@ DefFn[ " assert(0);", " }", " ", - Map[" observer.flux[dir][state_t::i"<>ToString[#]<>"] = - flux"<>ToString[#]<>"L;" &, vars], + Map[" observer.flux[dir][variables_t::i"<>ToString[#]<>"] = - flux"<>ToString[#]<>"L;" &, vars], " }", " ", " template<hrscc::policy::direction_t dir>", @@ -654,10 +655,10 @@ DefFn[ "{", " using namespace hrscc;", " ", - Map[" CLaw<DGFE_"<>name<>">::conserved_idx[state_t::i"<>ToString[#]<>"] = varindex(CCTK_THORNSTRING \"::"<>ToString[#]<>"\");" &, vars], - Map[" CLaw<DGFE_"<>name<>">::primitive_idx[state_t::i"<>ToString[#]<>"] = varindex(CCTK_THORNSTRING \"::"<>ToString[#]<>"\");" &, vars], + Map[" CLaw<DGFE_"<>name<>">::conserved_idx[variables_t::i"<>ToString[#]<>"] = varindex(CCTK_THORNSTRING \"::"<>ToString[#]<>"\");" &, vars], + Map[" CLaw<DGFE_"<>name<>">::primitive_idx[variables_t::i"<>ToString[#]<>"] = varindex(CCTK_THORNSTRING \"::"<>ToString[#]<>"\");" &, vars], " ", - Map[" CLaw<DGFE_"<>name<>">::rhs_idx[state_t::i"<>ToString[#]<>"] = varindex(CCTK_THORNSTRING \"::"<>ToString[#]<>"rhs\");" &, vars], + Map[" CLaw<DGFE_"<>name<>">::rhs_idx[variables_t::i"<>ToString[#]<>"] = varindex(CCTK_THORNSTRING \"::"<>ToString[#]<>"rhs\");" &, vars], "}", "", "", |