fixed an error in RadiativeTransferReadParameters.C regarding dtPhoto…

…n, also some minor changes --HG-- branch : week-of-code
clairekope · Oct 12, 2009 · 1770707 · 1770707
1 parent 1500997
commit 1770707
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 35,664 deletions.
diff --git a/input/metal_cool_ratios.dat b/input/metal_cool_ratios.dat
diff --git a/src/enzo/CommunicationTransferSubgridParticles.C b/src/enzo/CommunicationTransferSubgridParticles.C
@@ -152,9 +152,11 @@ int CommunicationTransferSubgridParticles(LevelHierarchyEntry *LevelArray[],
       (GridPointers, NumberOfGrids, StarsToMove, Zero, Zero, 
        StarSendList, KeepLocal, ParticlesAreLocal, COPY_OUT, TRUE);
 
+    /*
     Grids[grid1]->GridData->TransferSubgridParticles
       (GridPointers, NumberOfGrids, NumberToMove, Zero, Zero, 
        SendList, KeepLocal, ParticlesAreLocal, COPY_OUT, TRUE);
+    */  //#####
 
     delete [] SiblingList.GridList;
 

diff --git a/src/enzo/Grid_ComputeRT_TimeStep.C b/src/enzo/Grid_ComputeRT_TimeStep.C
@@ -269,30 +269,30 @@ float grid::ComputeRT_TimeStep()
 
   /* Debugging info. */
 
-//  if (debug || NumberOfProcessors > 1) {
+  if (debug || NumberOfProcessors > 1) {
 //  if (debug) {
-//    printf("ComputeTimeStep = %"FSYM" (", dt);
-//    if (NumberOfBaryonFields > 0)
-//      printf("Bar = %"GSYM" ", dtBaryons);
-//    if (HydroMethod == Zeus_Hydro)
-//      printf("Vis = %"FSYM" ", dtViscous);
-//    if (ComovingCoordinates)
-//      printf("Exp = %"FSYM" ", dtExpansion);
-//    if (dtAcceleration != huge_number)
-//      printf("Acc = %"FSYM" ", dtAcceleration);
-//    if (NumberOfParticles)
-//      printf("Part = %"FSYM" ", dtParticles);
+    printf("ComputeTimeStep = %"FSYM" (", dt);
+    if (NumberOfBaryonFields > 0)
+      printf("Bar = %"GSYM" ", dtBaryons);
+    if (HydroMethod == Zeus_Hydro)
+      printf("Vis = %"FSYM" ", dtViscous);
+    if (ComovingCoordinates)
+      printf("Exp = %"FSYM" ", dtExpansion);
+    if (dtAcceleration != huge_number)
+      printf("Acc = %"FSYM" ", dtAcceleration);
+    if (NumberOfParticles)
+      printf("Part = %"FSYM" ", dtParticles);
 //    if (StarParticleFeedback >> POP3_STAR & 1 ||
 //	StarParticleFeedback >> STAR_CLUSTER & 1)
 //      printf("Star = %"FSYM" ", dtStar);
-//#ifdef TRANSFER
-//    if (RadiationPressure && RadiativeTransfer && dtRadPressure < 100)
-//      printf("Rad = %"GSYM" ", dtRadPressure);
-//    if (dtSafetyVelocity != huge_number)
-//      printf("Saf = %"GSYM" ", dtSafetyVelocity); 
-//#endif /* TRANSFER */
-//    printf(")\n");
-//  }
+#ifdef TRANSFER
+    if (RadiationPressure && RadiativeTransfer && dtRadPressure < 100)
+      printf("Rad = %"GSYM" ", dtRadPressure);
+    if (dtSafetyVelocity != huge_number)
+      printf("Saf = %"GSYM" ", dtSafetyVelocity); 
+#endif /* TRANSFER */
+    printf(")\n");
+  }
 
   return dt;
 }
diff --git a/src/enzo/Grid_IdentifyColourFields.C b/src/enzo/Grid_IdentifyColourFields.C
@@ -38,12 +38,14 @@ int grid::IdentifyColourFields(int &SNColourNum, int &MetalNum, int &MBHColourNu
   Galaxy1ColourNum = FindField(Galaxy1Colour, FieldType, NumberOfBaryonFields);
   Galaxy2ColourNum = FindField(Galaxy2Colour, FieldType, NumberOfBaryonFields);
 
+  /*
   if ((SNColourNum < 0) && (MetalNum < 0) && (MBHColourNum < 0) && 
       (Galaxy1ColourNum < 0) && (Galaxy2ColourNum < 0)) {
-//    fprintf(stderr, "No colour field identified; while this could happen, check if it was expected.\n");
-//    ENZO_FAIL("");
+    fprintf(stdout, "No colour field identified; while this could happen, check if it was expected.\n");
+    ENZO_FAIL("");
   }
-
+  */
+
   return SUCCESS;
 }
 
diff --git a/src/enzo/OutputFromEvolveLevel.C b/src/enzo/OutputFromEvolveLevel.C
@@ -44,6 +44,8 @@ int Group_WriteAllData(char *basename, int filenumber, HierarchyEntry *TopGrid,
 void my_exit(int status);
 int GenerateGridArray(LevelHierarchyEntry *LevelArray[], int level,
 		      HierarchyEntry **Grids[]);
+int  RebuildHierarchy(TopGridData *MetaData,
+		      LevelHierarchyEntry *LevelArray[], int level); //#####
 
 #define TIME_MESSAGING 
 
@@ -204,6 +206,14 @@ int OutputFromEvolveLevel(LevelHierarchyEntry *LevelArray[],TopGridData *MetaDat
   }
 
   if( Write == TRUE ){
+
+// Following ifdef is implemented to catch and redistribute all the particles/stars
+// out of the grid boundary before outputing the data hierarchy
+// Purely for test purpose, and not for public consumption yet.  Ji-hoon Kim in Oct.2009
+#ifndef CATCH_PARTICLES  //#####
+    fprintf(stdout, "*** Rebuilding hierarchy before WriteAllData. ***\n");
+    RebuildHierarchy(MetaData, LevelArray, level);
+#endif
 
     LevelHierarchyEntry *Temp2 = LevelArray[0];
     while (Temp2->NextGridThisLevel != NULL)

diff --git a/src/enzo/RadiativeTransferReadParameters.C b/src/enzo/RadiativeTransferReadParameters.C
@@ -22,7 +22,6 @@
 
 int RadiativeTransferReadParameters(FILE *fptr)
 {
-
   int i;
 
   char line[MAX_LINE_LENGTH], *dummy = new char[MAX_LINE_LENGTH];
@@ -69,7 +68,7 @@ int RadiativeTransferReadParameters(FILE *fptr)
 
     /* read parameters */
 
-    ret += sscanf(line, "RadiativeTransferRadiationPressure = %"ISYM, \
+    ret += sscanf(line, "RadiativeTransferRadiationPressure = %"ISYM, 
 		  &RadiationPressure);
     ret += sscanf(line, "RadiativeTransferSourceRadius = %"FSYM, 
 		  &RadiativeTransferSourceRadius);
@@ -103,8 +102,7 @@ int RadiativeTransferReadParameters(FILE *fptr)
 		  &RadiativeTransferHIIRestrictedTimestep);
     ret += sscanf(line, "RadiativeTransferAdaptiveTimestep = %"ISYM, 
 		  &RadiativeTransferAdaptiveTimestep);
-
-    ret += sscanf(line, "dtPhoton = %"FSYM, dtPhoton);
+    ret += sscanf(line, "dtPhoton = %"FSYM, &dtPhoton);
 
     /* if the line is suspicious, issue a warning */