Commits

John Wise committed ea3b0e9

Fixing most of the compiler warnings in the C/C++ code.

Comments (0)

Files changed (107)

src/enzo/CommunicationNonblockingRoutines.C

 int CommunicationFindOpenRequest(MPI_Request *requests, Eint32 last_free,
 				 Eint32 nrequests, Eint32 index, Eint32 &max_index);
 void CommunicationCheckForErrors(int NumberOfStatuses, MPI_Status *statuses,
-				 char *msg=NULL);
+				 const char *msg=NULL);
 int KeepTransportingSend(int keep_transporting);
 int KeepTransportingCheck(char* &kt_global, int &keep_transporting);
 int InitializePhotonMessages(void);
       i++;
       i = i % nrequests;
       if (count++ > MAX_PH_RECEIVE_BUFFERS)
-	ENZO_VFAIL("Exceeded number (%d) of comm. buffers MAX_PH_RECEIVE_BUFFERS :: %d %d %d %x", count, last_free, i, nrequests, requests[i]);
+	ENZO_VFAIL("Exceeded number (%d) of comm. buffers MAX_PH_RECEIVE_BUFFERS :: %d %d %d %p", count, last_free, i, nrequests, requests[i]);
     }
   } // ENDWHILE
 

src/enzo/CommunicationReceiverPhotons.C

 static Eint32 PH_ListOfIndices[MAX_PH_RECEIVE_BUFFERS];
 static MPI_Status PH_ListOfStatuses[MAX_PH_RECEIVE_BUFFERS];
 void CommunicationCheckForErrors(int NumberOfStatuses, MPI_Status *statuses,
-				 char *msg=NULL);
+				 const char *msg=NULL);
 int CommunicationFindOpenRequest(MPI_Request *requests, Eint32 last_free,
 				 Eint32 nrequests, Eint32 index, 
 				 Eint32 &max_index);
 
   
 
-  int PrintToScreenBoundaries(float *field, char *display, int direction, int slice,
+  int PrintToScreenBoundaries(float *field, const char *display, int direction, int slice,
 			      int check, float diffvalue);  
-  int PrintToScreenBoundaries(float *field, char *display, int direction, int slice);
-  int PrintToScreenBoundaries(float *field, char *display);
+  int PrintToScreenBoundaries(float *field, const char *display, int direction, int slice);
+  int PrintToScreenBoundaries(float *field, const char *display);
   int PrintToScreenBoundaries();
   int PrintToScreenBoundaries(int field);
 

src/enzo/Grid_AddH2Dissociation.C

   int DeNum, HINum, HIINum, HeINum, HeIINum, HeIIINum, HMNum, H2INum, H2IINum,
       DINum, DIINum, HDINum;
 
-  const double pc = 3.086e18, clight = 3e10;
+  const double pc = 3.086e18;
   double H2Luminosity, H2ISigma = 3.71e-18;
 
   if (MyProcessorNumber != ProcessorNumber)

src/enzo/Grid_ElectronFractionEstimate.C

   dbase1 = DensityUnits * pow((afloat*aUnits), 3);
   CoolUnit = (pow(aUnits,5) * pow(xbase1,2) * pow(mh,2)) /
     (pow(TimeUnits,3) * dbase1);
-  float a3 = afloat*afloat*afloat;
 
   for (k = GridStartIndex[2]; k <= GridEndIndex[2]; k++) {
     for (j = GridStartIndex[1]; j <= GridEndIndex[1]; j++) {

src/enzo/Grid_NestedCosmologySimulationInitializeGrid.C

   int         Slab_Rank;
  
   hsize_t     mem_stride, mem_count;
-  hsize_t     slab_stride[4], slab_block[4];
+  hsize_t     slab_stride[4], slab_count[4];
  
   hsize_t    mem_offset;
   hsize_t    slab_offset[4];

src/enzo/Grid_ParticleSplitter.C

 
   /* Initialize */
  
-  int dim, i, size, field, GhostZones = DEFAULT_GHOST_ZONES;
+  int dim, i, size, GhostZones = DEFAULT_GHOST_ZONES;
   int DensNum, GENum, TENum, Vel1Num, Vel2Num, Vel3Num, B1Num, B2Num, B3Num;
 
   LCAPERF_START("grid_ParticleSplitter");

src/enzo/Grid_PoissonSolver.C

 
 
 
-int grid::PrintToScreenBoundaries(float *field, char *display, int direction, int slice,
+int grid::PrintToScreenBoundaries(float *field, const char *display, int direction, int slice,
 				   int check, float diffvalue){
 
   
 int grid::PrintToScreenBoundaries(float *field, const char *display){
  if (!debug) return SUCCESS;
 
-  //return SUCCESS;
-
-
-
-
   PrintToScreenBoundaries(field, display, 1, (int) floor(GridDimension[1]/2.0), 1, 0.0); 
   //PrintToScreenBoundaries(field, display, 1, DEFAULT_GHOST_ZONES, 0, 0.0);
   // PrintToScreenBoundaries(field, display, 0, DEFAULT_GHOST_ZONES, 0, 0.0);
 
+  return SUCCESS;
+
 }
 
 int grid::PrintToScreenBoundaries(){

src/enzo/Grid_RadHydroStreamTestInitializeGrid.C

       printf("RadHydroStreamTestInitializeGrid:\n");
       printf("       RadStreamDim = %"ISYM"\n",RadStreamDim);
       printf("       RadStreamDir = %"ISYM"\n",RadStreamDir);
-      printf("     MaxRadiationDt = %g\n",MyProcessorNumber,MaxRadiationDt);
+      printf("     MaxRadiationDt = %g\n",MaxRadiationDt);
 
       printf("    DensityConstant = %g\n",DensityConstant);    
       printf("         TEConstant = %g\n",TEConstant);    

src/enzo/Grid_ReadGrid.C

       PhiNum = NumberOfBaryonFields;
       int PhiToAdd = PhiField;
       this->AddFields(&PhiToAdd, 1);
-      DataLabel[PhiNum] = PhiName;
+      DataLabel[PhiNum] = (char*)PhiName;
     }
 
     /* if we restart from a different solvers output without a Phi_pField 
 	Phi_pNum = NumberOfBaryonFields;
 	int Phi_pToAdd = Phi_pField;
 	this->AddFields(&Phi_pToAdd, 1);
-	DataLabel[Phi_pNum] = Phi_pName;
+	DataLabel[Phi_pNum] = (char*)Phi_pName;
       }
     }
 

src/enzo/Grid_SetSubgridMarkerFromSubgrid.C

 
   /* declarations */
     
-  int i, j, k, dim, field, index;
+  int i, j, k, dim, index;
   int SubgridStart[MAX_DIMENSION], SubgridEnd[MAX_DIMENSION];
 
   /* if the field has not been allocated yet, do it here */ 

src/enzo/Grid_TestGravitySphereCheckResults.C

     BaryonField[NumberOfBaryonFields++] = new float[size];
     BaryonField[NumberOfBaryonFields++] = new float[size];
  
-    DataLabel[NumberOfBaryonFields-3] = TGSTangName;
-    DataLabel[NumberOfBaryonFields-2] = TGSRadialName;
-    DataLabel[NumberOfBaryonFields-1] = TGSAnalyticName;
+    DataLabel[NumberOfBaryonFields-3] = (char*)TGSTangName;
+    DataLabel[NumberOfBaryonFields-2] = (char*)TGSRadialName;
+    DataLabel[NumberOfBaryonFields-1] = (char*)TGSAnalyticName;
  
     float r, GridPos[MAX_DIMENSION];
     int n = 0;

src/enzo/Grid_TransferSubgridParticles.C

  
   /* Declarations. */
 
-  int i, j, index, dim, n1, grid, proc;
+  int i, j, index, dim, n1, proc;
   int i0, j0, k0;
 
   /* ----------------------------------------------------------------- */

src/enzo/Grid_WriteGrid.C

       
       char *DataLabelN[4];
       if (GridRank==2) {
-	DataLabelN[0]=(const char*) "Velocity_Div";
-	DataLabelN[1]=(const char*) "Velocity_Vorticity";
+	DataLabelN[0]=(char*) "Velocity_Div";
+	DataLabelN[1]=(char*) "Velocity_Vorticity";
       }
       if (GridRank==3) {
-	DataLabelN[0]=(const char*) "Velocity_Div";
-	DataLabelN[1]=(const char*) "Velocity_Vorticity1";
-	DataLabelN[2]=(const char*) "Velocity_Vorticity2";
-	DataLabelN[3]=(const char*) "Velocity_Vorticity3";
+	DataLabelN[0]=(char*) "Velocity_Div";
+	DataLabelN[1]=(char*) "Velocity_Vorticity1";
+	DataLabelN[2]=(char*) "Velocity_Vorticity2";
+	DataLabelN[3]=(char*) "Velocity_Vorticity3";
       }
 
       

src/enzo/Grid_ZeusSolver.C

 
   /*  Locals */
 
-  int ie, is, je, js, k, ks, ke, n, ixyz, ret;
+  int i, ie, is, je, js, ks, ke, n, ixyz, ret;
   int DensNum, GENum, TENum, Vel1Num, Vel2Num, Vel3Num;
   float pmin;
   float *d, *e, *u, *v, *w;

src/enzo/Group_ReadAllData.C

   char line[MAX_LINE_LENGTH];
 
   FILE *fptr;
-  FILE *tptr;
 #ifdef TASKMAP
   FILE *mptr;
 #endif /* TASKMAP */
   hid_t       file_acc_template;
   size_t      memory_increment; // in bytes
   herr_t      h5_status;
+  hbool_t     dump_flag;
 #endif
-  hbool_t     dump_flag;
 
   herr_t      h5_error = -1;
 

src/enzo/Group_WriteAllData.C

   char id[MAX_CYCLE_TAG_SIZE], *cptr, name[MAX_LINE_LENGTH];
   char dumpdirname[MAX_LINE_LENGTH];
   char dumpdirroot[MAX_LINE_LENGTH];
-#ifdef SYSCALL
+#ifndef SYSCALL
   char unixcommand[MAX_LINE_LENGTH];
 #endif
   char gridbasename[MAX_LINE_LENGTH];

src/enzo/HydroShockTubesInitialize.C

   /* set up field names and units */
 
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism) {
-    DataLabel[count++] = GEName;
+    DataLabel[count++] = (char*)GEName;
   }
 
   for (i = 0; i < count; i++)

src/enzo/ImplosionInitialize.C

  
   /* set up field names and units */
  
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/KHInitialize.C

 
   /* set up field names and units */
 
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
 
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/LoadBalanceSimulatedAnnealing.C

   }
 
   int i, j, node, nsucc;
-  float temperature, H;
+  float temperature;
   double *ProcWork, *NodeWork;
 
   ProcWork = new double[NumberOfProcessors];

src/enzo/Makefile

 clean:
 	-@rm -f *.so *.o uuid/*.o *.mod *.f *.f90 DEPEND.bak *~ $(OUTPUT) *.exe \
           auto_show*.C svn_version.def hydro_rk/*.o *.oo hydro_rk/*.oo \
-          uuid/*.oo DEPEND TAGS \
+          uuid/*.oo DEPEND TAGS $(FOUTPUT) \
           libconfig/*.o \
           python_bridge/problemtype_handler.C \
           python_bridge/problemtype_handler.h \

src/enzo/NestedCosmologySimulationInitialize.C

   // set up field names and units
  
   i = 0;
-  DataLabel[i++] = DensName;
-  DataLabel[i++] = Vel1Name;
+  DataLabel[i++] = (char*)DensName;
+  DataLabel[i++] = (char*)Vel1Name;
   if (MetaData.TopGridRank > 1 || (HydroMethod == MHD_RK) || (HydroMethod == HD_RK))
-    DataLabel[i++] = Vel2Name;
+    DataLabel[i++] = (char*)Vel2Name;
   if (MetaData.TopGridRank > 2 || (HydroMethod == MHD_RK) || (HydroMethod == HD_RK))
-    DataLabel[i++] = Vel3Name;
-  DataLabel[i++] = TEName;
+    DataLabel[i++] = (char*)Vel3Name;
+  DataLabel[i++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[i++] = GEName;
+    DataLabel[i++] = (char*)GEName;
   if (HydroMethod == MHD_RK) {
-    DataLabel[i++] = BxName;
-    DataLabel[i++] = ByName;
-    DataLabel[i++] = BzName;
-    DataLabel[i++] = PhiName;
+    DataLabel[i++] = (char*)BxName;
+    DataLabel[i++] = (char*)ByName;
+    DataLabel[i++] = (char*)BzName;
+    DataLabel[i++] = (char*)PhiName;
     if(UseDivergenceCleaning){
-      DataLabel[i++] = Phi_pName;
-      DataLabel[i++] = DebugName;
+      DataLabel[i++] = (char*)Phi_pName;
+      DataLabel[i++] = (char*)DebugName;
     }
   }
    if (MultiSpecies) {
-    DataLabel[i++] = ElectronName;
-    DataLabel[i++] = HIName;
-    DataLabel[i++] = HIIName;
-    DataLabel[i++] = HeIName;
-    DataLabel[i++] = HeIIName;
-    DataLabel[i++] = HeIIIName;
+    DataLabel[i++] = (char*)ElectronName;
+    DataLabel[i++] = (char*)HIName;
+    DataLabel[i++] = (char*)HIIName;
+    DataLabel[i++] = (char*)HeIName;
+    DataLabel[i++] = (char*)HeIIName;
+    DataLabel[i++] = (char*)HeIIIName;
     if (MultiSpecies > 1) {
-      DataLabel[i++] = HMName;
-      DataLabel[i++] = H2IName;
-      DataLabel[i++] = H2IIName;
+      DataLabel[i++] = (char*)HMName;
+      DataLabel[i++] = (char*)H2IName;
+      DataLabel[i++] = (char*)H2IIName;
     }
     if (MultiSpecies > 2) {
-      DataLabel[i++] = DIName;
-      DataLabel[i++] = DIIName;
-      DataLabel[i++] = HDIName;
+      DataLabel[i++] = (char*)DIName;
+      DataLabel[i++] = (char*)DIIName;
+      DataLabel[i++] = (char*)HDIName;
     }
   }
  
   if (CosmologySimulationUseMetallicityField) {
-    DataLabel[i++] = MetalName;
+    DataLabel[i++] = (char*)MetalName;
     if (StarMakerTypeIaSNe)
-      DataLabel[i++] = MetalIaName;
+      DataLabel[i++] = (char*)MetalIaName;
     if(MultiMetals){
-      DataLabel[i++] = ExtraNames[0];
-      DataLabel[i++] = ExtraNames[1];
+      DataLabel[i++] = (char*)ExtraNames[0];
+      DataLabel[i++] = (char*)ExtraNames[1];
     }
   }
  
   if(STARMAKE_METHOD(COLORED_POP3_STAR)){
-    DataLabel[i++] = ForbidName;
+    DataLabel[i++] = (char*)ForbidName;
   }
 
   if (WritePotential)
-    DataLabel[i++] = GPotName;
+    DataLabel[i++] = (char*)GPotName;
  
   if (ShockMethod) {
-    DataLabel[i++] = MachName;
+    DataLabel[i++] = (char*)MachName;
     if(StorePreShockFields){
-      DataLabel[i++] = PSTempName;
-      DataLabel[i++] = PSDenName;
+      DataLabel[i++] = (char*)PSTempName;
+      DataLabel[i++] = (char*)PSDenName;
     }
   } 
  

src/enzo/New_Grid_ReadGrid.C

 	PhiNum = NumberOfBaryonFields;
 	int PhiToAdd = PhiField;
 	this->AddFields(&PhiToAdd, 1);
-	DataLabel[PhiNum] = PhiName;
+	DataLabel[PhiNum] = (char*)PhiName;
       } else { 
 	if (0) 
 	  for (int n = 0; n < size; n++)
 	  Phi_pNum = NumberOfBaryonFields;
 	  int Phi_pToAdd = Phi_pField;
 	  this->AddFields(&Phi_pToAdd, 1);
-	  DataLabel[Phi_pNum] = Phi_pName;
+	  DataLabel[Phi_pNum] = (char*)Phi_pName;
 	}
       }
 

src/enzo/NohInitialize.C

 
   /* set up field names and units */
 
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
 
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/OneZoneFreefallTestInitialize.C

      fields.  Just FYI. */
 
   i = 0;
-  DataLabel[i++] = DensName;
-  DataLabel[i++] = TEName;
+  DataLabel[i++] = (char*)DensName;
+  DataLabel[i++] = (char*)TEName;
   if(DualEnergyFormalism)
-    DataLabel[i++] = GEName;
-  DataLabel[i++] = Vel1Name;
+    DataLabel[i++] = (char*)GEName;
+  DataLabel[i++] = (char*)Vel1Name;
 
   if(MetaData.TopGridRank > 1)
-    DataLabel[i++] = Vel2Name;
+    DataLabel[i++] = (char*)Vel2Name;
 
   if(MetaData.TopGridRank > 2)
-    DataLabel[i++] = Vel3Name;
+    DataLabel[i++] = (char*)Vel3Name;
 
   if (TestProblemData.MultiSpecies) {
-    DataLabel[i++] = ElectronName;
-    DataLabel[i++] = HIName;
-    DataLabel[i++] = HIIName;
-    DataLabel[i++] = HeIName;
-    DataLabel[i++] = HeIIName;
-    DataLabel[i++] = HeIIIName;
+    DataLabel[i++] = (char*)ElectronName;
+    DataLabel[i++] = (char*)HIName;
+    DataLabel[i++] = (char*)HIIName;
+    DataLabel[i++] = (char*)HeIName;
+    DataLabel[i++] = (char*)HeIIName;
+    DataLabel[i++] = (char*)HeIIIName;
     if (TestProblemData.MultiSpecies > 1) {
-      DataLabel[i++] = HMName;
-      DataLabel[i++] = H2IName;
-      DataLabel[i++] = H2IIName;
+      DataLabel[i++] = (char*)HMName;
+      DataLabel[i++] = (char*)H2IName;
+      DataLabel[i++] = (char*)H2IIName;
     }
     if (TestProblemData.MultiSpecies > 2) {
-      DataLabel[i++] = DIName;
-      DataLabel[i++] = DIIName;
-      DataLabel[i++] = HDIName;
+      DataLabel[i++] = (char*)DIName;
+      DataLabel[i++] = (char*)DIIName;
+      DataLabel[i++] = (char*)HDIName;
     }
   }
  
   if (TestProblemData.UseMetallicityField) {
-    DataLabel[i++] = MetalName;
+    DataLabel[i++] = (char*)MetalName;
 
     if(TestProblemData.MultiMetals){
-      DataLabel[i++] = ExtraNames[0];
-      DataLabel[i++] = ExtraNames[1];
+      DataLabel[i++] = (char*)ExtraNames[0];
+      DataLabel[i++] = (char*)ExtraNames[1];
     }
   }
  

src/enzo/PoissonSolverTestInitialize.C

   /* set up field names and units */
 
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism) {
-    DataLabel[count++] = GEName;
+    DataLabel[count++] = (char*)GEName;
   }
-  DataLabel[count++] = BxName;
-  DataLabel[count++] = ByName;
-  DataLabel[count++] = BzName;
-  DataLabel[count++] = PhiName;
+  DataLabel[count++] = (char*)BxName;
+  DataLabel[count++] = (char*)ByName;
+  DataLabel[count++] = (char*)BzName;
+  DataLabel[count++] = (char*)PhiName;
   if(UseDivergenceCleaning){
 
-    DataLabel[count++] = Phi_pName;
+    DataLabel[count++] = (char*)Phi_pName;
   }
 
 

src/enzo/PressurelessCollapseInitialize.C

  
   /* set up field names and units */
  
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/ProtostellarCollapseInitialize.C

   float ProtostellarCollapseOuterEnergy     = 1e3;
   float ProtostellarCollapseCoreRadius      = 0.005;
   float ProtostellarCollapseAngularVelocity = 0.0;
-  float dx = (DomainRightEdge[0] - DomainLeftEdge[0])/
-                                                   MetaData.TopGridDims[0];
 
   /* set no subgrids by default. */
 
 
   /* set up field names and units */
 
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
 
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/RHIonizationClumpInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
-  DataLabel[BaryonField++] = DeName;
-  DataLabel[BaryonField++] = HIName;
-  DataLabel[BaryonField++] = HIIName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
+  DataLabel[BaryonField++] = (char*)DeName;
+  DataLabel[BaryonField++] = (char*)HIName;
+  DataLabel[BaryonField++] = (char*)HIIName;
 
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RHIonizationSteepInitialize.C

   // note: we must set up He species fields as well since Enzo 
   //       requires them for H chemistry (initialized to zero)
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
-  DataLabel[BaryonField++] = DeName;
-  DataLabel[BaryonField++] = HIName;
-  DataLabel[BaryonField++] = HIIName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
+  DataLabel[BaryonField++] = (char*)DeName;
+  DataLabel[BaryonField++] = (char*)HIName;
+  DataLabel[BaryonField++] = (char*)HIIName;
 
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RHIonizationTestInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
   if (RadHydroChemistry > 0) {
-    DataLabel[BaryonField++] = DeName;
-    DataLabel[BaryonField++] = HIName;
-    DataLabel[BaryonField++] = HIIName;
+    DataLabel[BaryonField++] = (char*)DeName;
+    DataLabel[BaryonField++] = (char*)HIName;
+    DataLabel[BaryonField++] = (char*)HIIName;
   }
   if (RadHydroChemistry == 3) {
-    DataLabel[BaryonField++] = HeIName;
-    DataLabel[BaryonField++] = HeIIName;
-    DataLabel[BaryonField++] = HeIIIName;
+    DataLabel[BaryonField++] = (char*)HeIName;
+    DataLabel[BaryonField++] = (char*)HeIIName;
+    DataLabel[BaryonField++] = (char*)HeIIIName;
   }
 
   for (int i=0; i<BaryonField; i++) 

src/enzo/RadHydroConstTestInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
   if (RadHydroChemistry > 0) {
-    DataLabel[BaryonField++] = DeName;
-    DataLabel[BaryonField++] = HIName;
-    DataLabel[BaryonField++] = HIIName;
+    DataLabel[BaryonField++] = (char*)DeName;
+    DataLabel[BaryonField++] = (char*)HIName;
+    DataLabel[BaryonField++] = (char*)HIIName;
   }
   if (RadHydroChemistry == 3) {
-    DataLabel[BaryonField++] = HeIName;
-    DataLabel[BaryonField++] = HeIIName;
-    DataLabel[BaryonField++] = HeIIIName;
+    DataLabel[BaryonField++] = (char*)HeIName;
+    DataLabel[BaryonField++] = (char*)HeIIName;
+    DataLabel[BaryonField++] = (char*)HeIIIName;
   }
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RadHydroGreyMarshakWaveInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
+    DataLabel[BaryonField++] = (char*) IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
 
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RadHydroPulseTestInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
 
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RadHydroRadShockInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
 
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RadHydroStreamTestInitialize.C

 
   // set up field names and units
   int BaryonField = 0;
-  DataLabel[BaryonField++] = DensName;
-  DataLabel[BaryonField++] = TEName;
+  DataLabel[BaryonField++] = (char*)DensName;
+  DataLabel[BaryonField++] = (char*)TEName;
   if (DualEnergyFormalism) 
-    DataLabel[BaryonField++] = IEName;
-  DataLabel[BaryonField++] = Vel0Name;
-  DataLabel[BaryonField++] = Vel1Name;
-  DataLabel[BaryonField++] = Vel2Name;
-  DataLabel[BaryonField++] = RadName;
+    DataLabel[BaryonField++] = (char*)IEName;
+  DataLabel[BaryonField++] = (char*)Vel0Name;
+  DataLabel[BaryonField++] = (char*)Vel1Name;
+  DataLabel[BaryonField++] = (char*)Vel2Name;
+  DataLabel[BaryonField++] = (char*)RadName;
 
   for (int i=0; i<BaryonField; i++) 
     DataUnits[i] = NULL;

src/enzo/RadiatingShockInitialize.C

      fields.  Just FYI. */
 
   i = 0;
-  DataLabel[i++] = DensName;
-  DataLabel[i++] = TEName;
+  DataLabel[i++] = (char*)DensName;
+  DataLabel[i++] = (char*)TEName;
   if(DualEnergyFormalism)
-    DataLabel[i++] = GEName;
-  DataLabel[i++] = Vel1Name;
+    DataLabel[i++] = (char*)GEName;
+  DataLabel[i++] = (char*)Vel1Name;
 
   if(MetaData.TopGridRank > 1)
-    DataLabel[i++] = Vel2Name;
+    DataLabel[i++] = (char*)Vel2Name;
 
   if(MetaData.TopGridRank > 2)
-    DataLabel[i++] = Vel3Name;
+    DataLabel[i++] = (char*)Vel3Name;
 
   if (TestProblemData.MultiSpecies) {
-    DataLabel[i++] = ElectronName;
-    DataLabel[i++] = HIName;
-    DataLabel[i++] = HIIName;
-    DataLabel[i++] = HeIName;
-    DataLabel[i++] = HeIIName;
-    DataLabel[i++] = HeIIIName;
+    DataLabel[i++] = (char*)ElectronName;
+    DataLabel[i++] = (char*)HIName;
+    DataLabel[i++] = (char*)HIIName;
+    DataLabel[i++] = (char*)HeIName;
+    DataLabel[i++] = (char*)HeIIName;
+    DataLabel[i++] = (char*)HeIIIName;
     if (TestProblemData.MultiSpecies > 1) {
-      DataLabel[i++] = HMName;
-      DataLabel[i++] = H2IName;
-      DataLabel[i++] = H2IIName;
+      DataLabel[i++] = (char*)HMName;
+      DataLabel[i++] = (char*)H2IName;
+      DataLabel[i++] = (char*)H2IIName;
     }
     if (TestProblemData.MultiSpecies > 2) {
-      DataLabel[i++] = DIName;
-      DataLabel[i++] = DIIName;
-      DataLabel[i++] = HDIName;
+      DataLabel[i++] = (char*)DIName;
+      DataLabel[i++] = (char*)DIIName;
+      DataLabel[i++] = (char*)HDIName;
     }
   }
  
   if (TestProblemData.UseMetallicityField) {
-    DataLabel[i++] = MetalName;
+    DataLabel[i++] = (char*)MetalName;
 
     if(TestProblemData.MultiMetals){
-      DataLabel[i++] = ExtraNames[0];
-      DataLabel[i++] = ExtraNames[1];
+      DataLabel[i++] = (char*)ExtraNames[0];
+      DataLabel[i++] = (char*)ExtraNames[1];
     }
   }
 
 
     int GCM = TestProblemData.GloverChemistryModel;  // purely for convenience
 
-    DataLabel[i++] = HIIName;
-    DataLabel[i++] = HIName;
-    DataLabel[i++] = H2IName;
+    DataLabel[i++] = (char*)HIIName;
+    DataLabel[i++] = (char*)HIName;
+    DataLabel[i++] = (char*)H2IName;
 
     if( (GCM==1) || (GCM==2) || (GCM==3) || (GCM==7) ){
-      DataLabel[i++] = DIName;
-      DataLabel[i++] = DIIName;
-      DataLabel[i++] = HDIName;
-      DataLabel[i++] = HeIName;
-      DataLabel[i++] = HeIIName;
-      DataLabel[i++] = HeIIIName;
+      DataLabel[i++] = (char*)DIName;
+      DataLabel[i++] = (char*)DIIName;
+      DataLabel[i++] = (char*)HDIName;
+      DataLabel[i++] = (char*)HeIName;
+      DataLabel[i++] = (char*)HeIIName;
+      DataLabel[i++] = (char*)HeIIIName;
     }
 
     if( (GCM==3) || (GCM==5) || (GCM==7) ){
-      DataLabel[i++] = COIName;
+      DataLabel[i++] = (char*)COIName;
     }
 
     if( (GCM==2) || (GCM==3) || (GCM==7) ){
-      DataLabel[i++] = CIName;
-      DataLabel[i++] = CIIName;
-      DataLabel[i++] = OIName;
-      DataLabel[i++] = OIIName;
+      DataLabel[i++] = (char*)CIName;
+      DataLabel[i++] = (char*)CIIName;
+      DataLabel[i++] = (char*)OIName;
+      DataLabel[i++] = (char*)OIIName;
     }
 
     if( (GCM==2) || (GCM==3) ){
-      DataLabel[i++] = SiIName;
-      DataLabel[i++] = SiIIName;
-      DataLabel[i++] = SiIIIName;
+      DataLabel[i++] = (char*)SiIName;
+      DataLabel[i++] = (char*)SiIIName;
+      DataLabel[i++] = (char*)SiIIIName;
     }
 
     if( (GCM==3) || (GCM==7) ){
-      DataLabel[i++] = CHIName;
-      DataLabel[i++] = CH2IName;
-      DataLabel[i++] = CH3IIName;
-      DataLabel[i++] = C2IName;
-      DataLabel[i++] = HCOIIName;
-      DataLabel[i++] = OHIName;
-      DataLabel[i++] = H2OIName;
-      DataLabel[i++] = O2IName;
+      DataLabel[i++] = (char*)CHIName;
+      DataLabel[i++] = (char*)CH2IName;
+      DataLabel[i++] = (char*)CH3IIName;
+      DataLabel[i++] = (char*)C2IName;
+      DataLabel[i++] = (char*)HCOIIName;
+      DataLabel[i++] = (char*)OHIName;
+      DataLabel[i++] = (char*)H2OIName;
+      DataLabel[i++] = (char*)O2IName;
     }
 
   } //   if(TestProblemData.GloverChemistryModel)

src/enzo/RecalibrateMBHFeedbackThermalRadius.C

 					double &EjectaThermalEnergy)
 {
 
-  const double pc = 3.086e18, Msun = 1.989e33, pMass = 1.673e-24, 
-    gravConst = 6.673e-8, yr = 3.1557e7, Myr = 3.1557e13;
-
   float AvgVelocity[MAX_DIMENSION], MassEnclosed = 0, Metallicity = 0, ColdGasMass = 0;
   float OneOverRSquaredSum, initialRadius; 
-  int i, l, dim, FirstLoop = TRUE, MBHFeedbackThermalRadiusTooSmall;
+  int l, dim, FirstLoop = TRUE, MBHFeedbackThermalRadiusTooSmall;
   LevelHierarchyEntry *Temp, *Temp2;
   FLOAT Time;
 

src/enzo/RotatingCylinderInitialize.C

      fields.  Just FYI. */
 
   i = 0;
-  DataLabel[i++] = DensName;
-  DataLabel[i++] = TEName;
+  DataLabel[i++] = (char*)DensName;
+  DataLabel[i++] = (char*)TEName;
   if(DualEnergyFormalism)
-    DataLabel[i++] = GEName;
-  DataLabel[i++] = Vel1Name;
+    DataLabel[i++] = (char*)GEName;
+  DataLabel[i++] = (char*)Vel1Name;
 
   if(MetaData.TopGridRank > 1)
-    DataLabel[i++] = Vel2Name;
+    DataLabel[i++] = (char*)Vel2Name;
 
   if(MetaData.TopGridRank > 2)
-    DataLabel[i++] = Vel3Name;
+    DataLabel[i++] = (char*)Vel3Name;
 
   if (TestProblemData.UseMetallicityField)
-    DataLabel[i++] = MetalName;
+    DataLabel[i++] = (char*)MetalName;
 
   for(j=0; j < i; j++)
     DataUnits[j] = NULL;

src/enzo/ShockInABoxInitialize.C

  
   /* set up field names and units */
  
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/ShockPoolInitialize.C

  
   /* set up field names and units */
  
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/SphericalInfallInitialize.C

   /* set up field names and units */
  
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[count++] = GEName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
+    DataLabel[count++] = (char*)GEName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
   if (WritePotential)
-    DataLabel[count++] = GPotName;  
+    DataLabel[count++] = (char*)GPotName;  
 
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/Star_CalculateFeedbackParameters.C

   float StarLevelCellWidth, tdyn, frac;
   double EjectaVolume, SNEnergy, HeliumCoreMass, Delta_SF, MetalMass;
 
-  int bin, size=1;
+  int bin;
   float mdot;
 
   Radius = 0.0;

src/enzo/Star_DisableParticle.C

 int Star::DisableParticle(LevelHierarchyEntry *LevelArray[])
 {
 
-  int i, nPart, NumberOfGrids, changedGrid = INT_UNDEFINED, found = FALSE;
+  int i, NumberOfGrids, changedGrid = INT_UNDEFINED, found = FALSE;
   HierarchyEntry **Grids;
   
   NumberOfGrids = GenerateGridArray(LevelArray, this->level, &Grids);

src/enzo/Star_MultiplyAccretionRate.C

 {
 
   const double Grav = 6.673e-8, m_h = 1.673e-24;
-  const double yr = 3.1557e7, sigma_T = 6.65e-25, c = 3.0e10;
+  const double sigma_T = 6.65e-25, c = 3.0e10;
 
   float mdot, mdot_Edd;
 

src/enzo/Star_SetFeedbackFlag.C

   const float PISNLowerMass = 140, PISNUpperMass = 260;
   const float StarClusterSNeStart = 4.0;   // Myr after cluster is born
   const float StarClusterSNeEnd = 20.0; // Myr (lifetime of a 8 Msun star)
-  const double G = 6.673e-8, k_b = 1.38e-16, m_h = 1.673e-24;
-  const double Msun = 1.989e33;
 
   int abs_type;
   float AgeInMyr;

src/enzo/TestGravityInitialize.C

   /* set up field names and units */
  
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[count++] = GEName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
+    DataLabel[count++] = (char*)GEName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/TestGravitySphereInitialize.C

   /* set up field names and units */
  
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[count++] = GEName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
+    DataLabel[count++] = (char*)GEName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/TestOrbitInitialize.C

   /* set up field names and units */
 
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[count++] = GEName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
+    DataLabel[count++] = (char*)GEName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
 
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/TurbulenceSimulationInitialize.C

   /* set up field names and units */
  
   i = 0;
-  DataLabel[i++] = DensName;
-  DataLabel[i++] = TEName;
+  DataLabel[i++] = (char*)DensName;
+  DataLabel[i++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[i++] = GEName;
-  DataLabel[i++] = Vel1Name;
-  DataLabel[i++] = Vel2Name;
-  DataLabel[i++] = Vel3Name;
+    DataLabel[i++] = (char*)GEName;
+  DataLabel[i++] = (char*)Vel1Name;
+  DataLabel[i++] = (char*)Vel2Name;
+  DataLabel[i++] = (char*)Vel3Name;
   if (HydroMethod == MHD_RK) {
-    DataLabel[i++] = BxName;
-    DataLabel[i++] = ByName;
-    DataLabel[i++] = BzName;
-    DataLabel[i++] = PhiName;
+    DataLabel[i++] = (char*)BxName;
+    DataLabel[i++] = (char*)ByName;
+    DataLabel[i++] = (char*)BzName;
+    DataLabel[i++] = (char*)PhiName;
   }
   if (UseDrivingField) {
-    DataLabel[i++] = Drive1Name;
-    DataLabel[i++] = Drive2Name;
-    DataLabel[i++] = Drive3Name;
+    DataLabel[i++] = (char*)Drive1Name;
+    DataLabel[i++] = (char*)Drive2Name;
+    DataLabel[i++] = (char*)Drive3Name;
   }
   if(WritePotential)
-      DataLabel[i++] = GravPotName;
+      DataLabel[i++] = (char*)GravPotName;
 
   for (j = 0; j < i; j++)
     DataUnits[j] = NULL;

src/enzo/WavePoolInitialize.C

  
   /* set up field names and units */
  
-  DataLabel[0] = DensName;
-  DataLabel[1] = TEName;
-  DataLabel[2] = Vel1Name;
-  DataLabel[3] = Vel2Name;
-  DataLabel[4] = Vel3Name;
+  DataLabel[0] = (char*)DensName;
+  DataLabel[1] = (char*)TEName;
+  DataLabel[2] = (char*)Vel1Name;
+  DataLabel[3] = (char*)Vel2Name;
+  DataLabel[4] = (char*)Vel3Name;
  
   DataUnits[0] = NULL;
   DataUnits[1] = NULL;

src/enzo/ZeldovichPancakeInitialize.C

   /* set up field names and units */
  
   int i = 0;
-  DataLabel[i++] = DensName;
-  DataLabel[i++] = Vel1Name;
+  DataLabel[i++] = (char*)DensName;
+  DataLabel[i++] = (char*)Vel1Name;
   if (MetaData.TopGridRank > 1 || (HydroMethod == MHD_RK) || (HydroMethod == HD_RK))
-    DataLabel[i++] = Vel2Name;
+    DataLabel[i++] = (char*)Vel2Name;
   if (MetaData.TopGridRank > 2 || (HydroMethod == MHD_RK) || (HydroMethod == HD_RK))
-    DataLabel[i++] = Vel3Name;
-  DataLabel[i++] = TEName;
+    DataLabel[i++] = (char*)Vel3Name;
+  DataLabel[i++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[i++] = GEName;
+    DataLabel[i++] = (char*)GEName;
   if (HydroMethod == MHD_RK) {
-    DataLabel[i++] = BxName;
-    DataLabel[i++] = ByName;
-    DataLabel[i++] = BzName;
-    DataLabel[i++] = PhiName;
+    DataLabel[i++] = (char*)BxName;
+    DataLabel[i++] = (char*)ByName;
+    DataLabel[i++] = (char*)BzName;
+    DataLabel[i++] = (char*)PhiName;
     if(UseDivergenceCleaning){
-      DataLabel[i++] = Phi_pName;
-      DataLabel[i++] = DebugName;
+      DataLabel[i++] = (char*)Phi_pName;
+      DataLabel[i++] = (char*)DebugName;
     }
   }
  

src/enzo/Zeus_xTransport.C

       fistart, fjstart, fiend, fjend, lface, rface;
   float dnew, f2[ijk], f3[ijk], f4[ijk], f5[ijk],
         dstar[ijk], estar[ijk], ustar[ijk], vstar[ijk], wstar[ijk],
-        uavgi[ijk], uavgj[ijk], uavgk[ijk], df, ueff[ijk];
+        uavgi[ijk], uavgj[ijk], uavgk[ijk], ueff[ijk];
   float *colstar[MAX_COLOR];
 
 //=======================================================================

src/enzo/Zeus_zTransport.C

 
   /* Locals */
 
-  int i, j, k, im1, jm1, k1, k2, n, dim, idim, jdim, offset, ic,
+  int i, j, k, im1, jm1, km1, k1, k2, n, dim, idim, jdim, offset, ic,
       fistart, fjstart, fiend, fjend, lface, rface;
-  float dnew[ijk], f2[ijk], f3[ijk], f4[ijk], f5[ijk],
+  float dnew, f2[ijk], f3[ijk], f4[ijk], f5[ijk],
         dstar[ijk], estar[ijk], ustar[ijk], vstar[ijk], wstar[ijk],
         uavgi[ijk], uavgj[ijk], uavgk[ijk], ueff[ijk];
   float *colstar[MAX_COLOR];

src/enzo/hydro_rk/AGNDiskInitialize.C

 int AGNDiskInitialize(FILE *fptr, FILE *Outfptr, 
 		      HierarchyEntry &TopGrid, TopGridData &MetaData)
 {
-  char *DensName = "Density";
-  char *Vel1Name = "x-velocity";
-  char *Vel2Name = "y-velocity";
-  char *Vel3Name = "z-velocity";
-  char *TEName   = "TotalEnergy";
-  char *GEName   = "GasEnergy";
-  char *BxName = "Bx";
-  char *ByName = "By";
-  char *BzName = "Bz";
-  char *PhiName = "Phi";
-  char *ElectronName = "Electron_Density";
-  char *HIName    = "HI_Density";
-  char *HIIName   = "HII_Density";
-  char *HeIName   = "HeI_Density";
-  char *HeIIName  = "HeII_Density";
-  char *HeIIIName = "HeIII_Density";
-  char *HMName    = "HM_Density";
-  char *H2IName   = "H2I_Density";
-  char *H2IIName  = "H2II_Density";
-  char *DIName    = "DI_Density";
-  char *DIIName   = "DII_Density";
-  char *HDIName   = "HDI_Density";
-  char *kphHIName    = "HI_kph";
-  char *gammaHIName  = "HI_gamma";
-  char *kphHeIName   = "HeI_kph";
-  char *gammaHeIName = "HeI_gamma";
-  char *kphHeIIName  = "HeII_kph";
-  char *gammaHeIIName= "HeII_gamma";
-  char *kdissH2IName = "H2I_kdiss";
-  char *RadAccel1Name = "RadAccel1";
-  char *RadAccel2Name = "RadAccel2";
-  char *RadAccel3Name = "RadAccel3";
-  char *GravPotenName = "PotentialField";
+  const char *DensName = "Density";
+  const char *Vel1Name = "x-velocity";
+  const char *Vel2Name = "y-velocity";
+  const char *Vel3Name = "z-velocity";
+  const char *TEName   = "TotalEnergy";
+  const char *GEName   = "GasEnergy";
+  const char *BxName = "Bx";
+  const char *ByName = "By";
+  const char *BzName = "Bz";
+  const char *PhiName = "Phi";
+  const char *ElectronName = "Electron_Density";
+  const char *HIName    = "HI_Density";
+  const char *HIIName   = "HII_Density";
+  const char *HeIName   = "HeI_Density";
+  const char *HeIIName  = "HeII_Density";
+  const char *HeIIIName = "HeIII_Density";
+  const char *HMName    = "HM_Density";
+  const char *H2IName   = "H2I_Density";
+  const char *H2IIName  = "H2II_Density";
+  const char *DIName    = "DI_Density";
+  const char *DIIName   = "DII_Density";
+  const char *HDIName   = "HDI_Density";
+  const char *kphHIName    = "HI_kph";
+  const char *gammaHIName  = "HI_gamma";
+  const char *kphHeIName   = "HeI_kph";
+  const char *gammaHeIName = "HeI_gamma";
+  const char *kphHeIIName  = "HeII_kph";
+  const char *gammaHeIIName= "HeII_gamma";
+  const char *kdissH2IName = "H2I_kdiss";
+  const char *RadAccel1Name = "RadAccel1";
+  const char *RadAccel2Name = "RadAccel2";
+  const char *RadAccel3Name = "RadAccel3";
+  const char *GravPotenName = "PotentialField";
 
   /* declarations */
 
   char  line[MAX_LINE_LENGTH];
-  int   dim, ret, level, sphere, i;
+  int   ret, level, i;
 
   /* set default parameters */
 
 
   } // end input from parameter file
 
-  float DensityUnits = 1.0, LengthUnits = 1.0, TemperatureUnits = 1, TimeUnits, 
-    VelocityUnits, CriticalDensity = 1, BoxLength = 1, mu = 0.6;
+  float DensityUnits = 1.0, LengthUnits = 1.0, TemperatureUnits = 1, TimeUnits = 1,
+    VelocityUnits = 1;
   GetUnits(&DensityUnits, &LengthUnits, &TemperatureUnits,
 	   &TimeUnits, &VelocityUnits, 1);
   float MagneticUnits = sqrt(DensityUnits*4.0*M_PI)*VelocityUnits;
   /* set up field names and units */
 
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism)
-    DataLabel[count++] = GEName;
+    DataLabel[count++] = (char*)GEName;
   if (HydroMethod == MHD_RK) {
-      DataLabel[count++] = BxName;
-      DataLabel[count++] = ByName;
-      DataLabel[count++] = BzName;
-      DataLabel[count++] = PhiName;
+      DataLabel[count++] = (char*)BxName;
+      DataLabel[count++] = (char*)ByName;
+      DataLabel[count++] = (char*)BzName;
+      DataLabel[count++] = (char*)PhiName;
   }
   if (MultiSpecies) {
-    DataLabel[count++] = ElectronName;
-    DataLabel[count++] = HIName;
-    DataLabel[count++] = HIIName;
-    DataLabel[count++] = HeIName;
-    DataLabel[count++] = HeIIName;
-    DataLabel[count++] = HeIIIName;
+    DataLabel[count++] = (char*)ElectronName;
+    DataLabel[count++] = (char*)HIName;
+    DataLabel[count++] = (char*)HIIName;
+    DataLabel[count++] = (char*)HeIName;
+    DataLabel[count++] = (char*)HeIIName;
+    DataLabel[count++] = (char*)HeIIIName;
     if (MultiSpecies > 1) {
-      DataLabel[count++] = HMName;
-      DataLabel[count++] = H2IName;
-      DataLabel[count++] = H2IIName;
+      DataLabel[count++] = (char*)HMName;
+      DataLabel[count++] = (char*)H2IName;
+      DataLabel[count++] = (char*)H2IIName;
     }
     if (MultiSpecies > 2) {
-      DataLabel[count++] = DIName;
-      DataLabel[count++] = DIIName;
-      DataLabel[count++] = HDIName;
+      DataLabel[count++] = (char*)DIName;
+      DataLabel[count++] = (char*)DIIName;
+      DataLabel[count++] = (char*)HDIName;
     }
   }  // if Multispecies                                                                                                      
 #ifdef TRANSFER
   if (RadiativeTransfer) {
     if (MultiSpecies) {
-      DataLabel[count++]  = kphHIName;
-      DataLabel[count++]  = gammaHIName;
-      DataLabel[count++]  = kphHeIName;
-      DataLabel[count++]  = gammaHeIName;
-      DataLabel[count++]  = kphHeIIName;
-      DataLabel[count++]  = gammaHeIIName;
+      DataLabel[count++]  = (char*)kphHIName;
+      DataLabel[count++]  = (char*)gammaHIName;
+      DataLabel[count++]  = (char*)kphHeIName;
+      DataLabel[count++]  = (char*)gammaHeIName;
+      DataLabel[count++]  = (char*)kphHeIIName;
+      DataLabel[count++]  = (char*)gammaHeIIName;
       if (MultiSpecies > 1)
-        DataLabel[count++]= kdissH2IName;
+        DataLabel[count++]= (char*)kdissH2IName;
     }
   }
 
   if (RadiationPressure) {
-    DataLabel[count++]  = RadAccel1Name;
-    DataLabel[count++]  = RadAccel2Name;
-    DataLabel[count++]  = RadAccel3Name;
+    DataLabel[count++]  = (char*)RadAccel1Name;
+    DataLabel[count++]  = (char*)RadAccel2Name;
+    DataLabel[count++]  = (char*)RadAccel3Name;
   }
 #endif
   if (WritePotential) {
-    DataLabel[count++] = GravPotenName;
+    DataLabel[count++] = (char*)GravPotenName;
   }
 
 

src/enzo/hydro_rk/Collapse1DInitialize.C

 int Collapse1DInitialize(FILE *fptr, FILE *Outfptr, 
 			 HierarchyEntry &TopGrid, TopGridData &MetaData)
 {
-  char *DensName = "Density";
-  char *TEName   = "TotalEnergy";
-  char *GEName   = "GasEnergy";
-  char *Vel1Name = "x-velocity";
-  char *Vel2Name = "y-velocity";
-  char *Vel3Name = "z-velocity";
-  char *ColourName = "colour";
+  const char *DensName = "Density";
+  const char *TEName   = "TotalEnergy";
+  const char *GEName   = "GasEnergy";
+  const char *Vel1Name = "x-velocity";
+  const char *Vel2Name = "y-velocity";
+  const char *Vel3Name = "z-velocity";
 
   /* declarations */
 
   char  line[MAX_LINE_LENGTH];
-  int   dim, ret, level, sphere, i;
+  int   ret, level, i;
 
   /* set default parameters */
 
-  int n_sphere = 1;
   int RefineAtStart   = TRUE;
   int UseParticles    = FALSE;
   float MediumDensity = 1.0, 
   /* set up field names and units */
 
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism) {
-    DataLabel[count++] = GEName;
+    DataLabel[count++] = (char*)GEName;
   }
 
 

src/enzo/hydro_rk/Collapse3DInitialize.C

 int Collapse3DInitialize(FILE *fptr, FILE *Outfptr, 
 			  HierarchyEntry &TopGrid, TopGridData &MetaData)
 {
-  char *DensName = "Density";
-  char *TEName   = "TotalEnergy";
-  char *GEName   = "GasEnergy";
-  char *Vel1Name = "x-velocity";
-  char *Vel2Name = "y-velocity";
-  char *Vel3Name = "z-velocity";
-  char *ColourName = "colour";
-  char *ElectronName = "Electron_Density";
-  char *HIName    = "HI_Density";
-  char *HIIName   = "HII_Density";
-  char *HeIName   = "HeI_Density";
-  char *HeIIName  = "HeII_Density";
-  char *HeIIIName = "HeIII_Density";
-  char *HMName    = "HM_Density";
-  char *H2IName   = "H2I_Density";
-  char *H2IIName  = "H2II_Density";
-  char *DIName    = "DI_Density";
-  char *DIIName   = "DII_Density";
-  char *HDIName   = "HDI_Density";
-  char *kphHIName    = "HI_kph";
-  char *gammaHIName  = "HI_gamma";
-  char *kphHeIName   = "HeI_kph";
-  char *gammaHeIName = "HeI_gamma";
-  char *kphHeIIName  = "HeII_kph";
-  char *gammaHeIIName= "HeII_gamma";
-  char *kdissH2IName = "H2I_kdiss";
-  char *RadAccel1Name = "RadAccel1";
-  char *RadAccel2Name = "RadAccel2";
-  char *RadAccel3Name = "RadAccel3";
+  const char *DensName = "Density";
+  const char *TEName   = "TotalEnergy";
+  const char *GEName   = "GasEnergy";
+  const char *Vel1Name = "x-velocity";
+  const char *Vel2Name = "y-velocity";
+  const char *Vel3Name = "z-velocity";
+  //const char *ColourName = "colour";
+  const char *ElectronName = "Electron_Density";
+  const char *HIName    = "HI_Density";
+  const char *HIIName   = "HII_Density";
+  const char *HeIName   = "HeI_Density";
+  const char *HeIIName  = "HeII_Density";
+  const char *HeIIIName = "HeIII_Density";
+  const char *HMName    = "HM_Density";
+  const char *H2IName   = "H2I_Density";
+  const char *H2IIName  = "H2II_Density";
+  const char *DIName    = "DI_Density";
+  const char *DIIName   = "DII_Density";
+  const char *HDIName   = "HDI_Density";
+  const char *kphHIName    = "HI_kph";
+  const char *gammaHIName  = "HI_gamma";
+  const char *kphHeIName   = "HeI_kph";
+  const char *gammaHeIName = "HeI_gamma";
+  const char *kphHeIIName  = "HeII_kph";
+  const char *gammaHeIIName= "HeII_gamma";
+  const char *kdissH2IName = "H2I_kdiss";
+  const char *RadAccel1Name = "RadAccel1";
+  const char *RadAccel2Name = "RadAccel2";
+  const char *RadAccel3Name = "RadAccel3";
 
 
   /* declarations */
   /* set up field names and units */
 
   int count = 0;
-  DataLabel[count++] = DensName;
-  DataLabel[count++] = Vel1Name;
-  DataLabel[count++] = Vel2Name;
-  DataLabel[count++] = Vel3Name;
-  DataLabel[count++] = TEName;
+  DataLabel[count++] = (char*)DensName;
+  DataLabel[count++] = (char*)Vel1Name;
+  DataLabel[count++] = (char*)Vel2Name;
+  DataLabel[count++] = (char*)Vel3Name;
+  DataLabel[count++] = (char*)TEName;
   if (DualEnergyFormalism) {
-    DataLabel[count++] = GEName;
+    DataLabel[count++] = (char*)GEName;
   }
   if (MultiSpecies) {
-    DataLabel[count++] = ElectronName;
-    DataLabel[count++] = HIName;
-    DataLabel[count++] = HIIName;
-    DataLabel[count++] = HeIName;
-    DataLabel[count++] = HeIIName;
-    DataLabel[count++] = HeIIIName;
+    DataLabel[count++] = (char*)ElectronName;
+    DataLabel[count++] = (char*)HIName;
+    DataLabel[count++] = (char*)HIIName;
+    DataLabel[count++] = (char*)HeIName;
+    DataLabel[count++] = (char*)HeIIName;
+    DataLabel[count++] = (char*)HeIIIName;
     if (MultiSpecies > 1) {
-      DataLabel[count++] = HMName;
-      DataLabel[count++] = H2IName;
-      DataLabel[count++] = H2IIName;
+      DataLabel[count++] = (char*)HMName;
+      DataLabel[count++] = (char*)H2IName;
+      DataLabel[count++] = (char*)H2IIName;
     }
     if (MultiSpecies > 2) {
-      DataLabel[count++] = DIName;
-      DataLabel[count++] = DIIName;
-      DataLabel[count++] = HDIName;
+      DataLabel[count++] = (char*)DIName;
+      DataLabel[count++] = (char*)DIIName;
+      DataLabel[count++] = (char*)HDIName;
     }
   }  // if Multispecies                                                                                                      
   //if (PhotonTestUseColour)
-  //DataLabel[count++] = ColourName;
+  //DataLabel[count++] = (char*)ColourName;
 #ifdef TRANSFER
   if (RadiativeTransfer)
     if (MultiSpecies) {
-      DataLabel[count++]  = kphHIName;
-      DataLabel[count++]  = gammaHIName;
-      DataLabel[count++]  = kphHeIName;
-      DataLabel[count++]  = gammaHeIName;
-      DataLabel[count++]  = kphHeIIName;
-      DataLabel[count++]  = gammaHeIIName;
+      DataLabel[count++]  = (char*)kphHIName;
+      DataLabel[count++]  = (char*)gammaHIName;
+      DataLabel[count++]  = (char*)kphHeIName;
+      DataLabel[count++]  = (char*)gammaHeIName;
+      DataLabel[count++]  = (char*)kphHeIIName;
+      DataLabel[count++]  = (char*)gammaHeIIName;
       if (MultiSpecies > 1)
-        DataLabel[count++]= kdissH2IName;
+        DataLabel[count++]= (char*)kdissH2IName;
     } // if RadiativeTransfer                                                                                                
 
   if (RadiationPressure) {
-    DataLabel[count++]  = RadAccel1Name;
-    DataLabel[count++]  = RadAccel2Name;
-    DataLabel[count++]  = RadAccel3Name;
+    DataLabel[count++]  = (char*)RadAccel1Name;
+    DataLabel[count++]  = (char*)RadAccel2Name;
+    DataLabel[count++]  = (char*)RadAccel3Name;
   }
 #endif
 

src/enzo/hydro_rk/CollapseMHD3DInitialize.C

    const char *DebugName = "Debug";
    const char *Phi_pName = "Phip";
    const char *GravPotenName = "PotentialField";
-   const char *Acce1Name = "AccelerationField1";
-   const char *Acce2Name = "AccelerationField2";
-   const char *Acce3Name = "AccelerationField3";
+//   const char *Acce1Name = "AccelerationField1";
+//   const char *Acce2Name = "AccelerationField2";
+//   const char *Acce3Name = "AccelerationField3";
 
   /* declarations */
 
     float MediumEnergy;
     float DensityUnits, LengthUnits, TemperatureUnits, TimeUnits, 
       VelocityUnits;
-    float tmp1, tmp2, tmp3;
     GetUnits(&DensityUnits, &LengthUnits, &TemperatureUnits, &TimeUnits, 
 	     &VelocityUnits, MetaData.Time);
     MediumEnergy = MediumTemperature / TemperatureUnits / ((Gamma-1.0)*Mu);

src/enzo/hydro_rk/ComputeDednerWaveSpeeds.C

   if (HydroMethod != MHD_RK) 
     return SUCCESS;
 
-  float DensityUnits = 1.0, LengthUnits = 1.0, TemperatureUnits = 1, TimeUnits, 
-    VelocityUnits, CriticalDensity = 1, BoxLength = 1, MagneticUnits;
+  float DensityUnits = 1.0, LengthUnits = 1.0, TemperatureUnits = 1, TimeUnits = 1, 
+    VelocityUnits = 1;
   double MassUnits;
   GetUnits(&DensityUnits, &LengthUnits, &TemperatureUnits, &TimeUnits, &VelocityUnits, 1.0);
   MassUnits = DensityUnits*pow(LengthUnits,3);