Further cogen fixes (and var name change due to clash with p define)

Author: willend

mccode/src/cogen.c.in

@@ -1631,7 +1631,7 @@ void def_trace_section(struct instr_def *instr)
   cout("#define t_offset _particle->t_offset");
   cout("#define p_trains _particle->p_trains");
   cout("#define alive_trains _particle->alive_trains");
-  cout("#define p_last_time_manipulation _particle->p_last_time_manipulation;");
+  cout("#define P_last_time_manipulation _particle->P_last_time_manipulation;");
   cout("#endif /* OPENACC */");
   cout("#endif /* TOF_TRAIN */");
 
@@ -1694,6 +1694,7 @@ void undef_trace_section(struct instr_def *instr)
   cout("#undef t_offset");
   cout("#undef p_trains");
   cout("#undef alive_trains");
+  cout("#undef P_last_time_manipulation");
   cout("#endif /* TOF_TRAIN */");
   cout("#endif /* OPENACC */");
 
@@ -2444,7 +2445,7 @@ cogen_header(struct instr_def *instr, char *output_name)
   cout("double *t_offset;");
   cout("double *p_trains;");
   cout("int *alive_trains;");
-  cout("double p_last_time_manipulation;");
+  cout("double P_last_time_manipulation;");
   cout("#endif /* TOF_TRAIN */");
   cout("#endif /* NOT OPENACC */");
   cout("");
@@ -2508,7 +2509,7 @@ cogen_header(struct instr_def *instr, char *output_name)
   cout("  double *t_offset;");
   cout("  double *p_trains;");
   cout("  int *alive_trains;");
-  cout("  double p_last_time_manipulation;");
+  cout("  double P_last_time_manipulation;");
   cout("  #pragma acc shape(t_offset[0:N_trains]) init_needed(N_trains)");
   cout("  #pragma acc shape(p_trains[0:N_trains]) init_needed(N_trains)");
   cout("  #pragma acc shape(alive_trains[0:N_trains]) init_needed(N_trains)");