Small fixes to allow use-mpi-no and multi-metal field runs.

--HG-- branch : week-of-code
clairekope · May 13, 2010 · bac346e · bac346e
1 parent 6bc4fe4
commit bac346e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/enzo/Grid_SolveCoupledRateEquations.C b/src/enzo/Grid_SolveCoupledRateEquations.C
@@ -188,7 +188,7 @@ int grid::SolveCoupledRateEquations()
   float *MetalPointer;
   float *TotalMetals = NULL;
 
-  if (MetalNum != -1 && SNColour != -1) {
+  if (MetalNum != -1 && SNColourNum != -1) {
     for (dim = 0, size = 1; dim < GridRank; dim++)
       size *= GridDimension[dim];
     TotalMetals = new float[size];

diff --git a/src/enzo/Grid_SolveRateAndCoolEquations.C b/src/enzo/Grid_SolveRateAndCoolEquations.C
@@ -207,7 +207,7 @@ int grid::SolveRateAndCoolEquations()
   float *MetalPointer;
   float *TotalMetals = NULL;
 
-  if (MetalNum != -1 && SNColour != -1) {
+  if (MetalNum != -1 && SNColourNum != -1) {
     TotalMetals = new float[size];
     for (i = 0; i < size; i++)
       TotalMetals[i] = BaryonField[MetalNum][i] + BaryonField[SNColourNum][i];

diff --git a/src/enzo/PhotonCommunication.h b/src/enzo/PhotonCommunication.h
@@ -4,8 +4,6 @@
 #define EXTERN extern
 #endif /* DEFINE_STORAGE */
 
-#ifdef USE_MPI
-
 #define MAX_PH_RECEIVE_BUFFERS 50000
 #define MAX_PH_REQUESTS 50000
 
@@ -22,6 +20,8 @@
 #define BUFFER_END -99999
 #define NO_HINT -1
 
+#ifdef USE_MPI
+
 EXTERN char *PH_CommunicationReceiveBuffer[MAX_PH_RECEIVE_BUFFERS];
 EXTERN MPI_Request PH_CommunicationReceiveMPI_Request[MAX_PH_RECEIVE_BUFFERS];
 EXTERN Eint32 PH_CommunicationReceiveIndex;