Commits

Ji-hoon Kim committed c5a6892

Cleaned up Grid_SetFlaggingField; reorganized the doc accordingly.

  • Participants
  • Parent commits dcf1b6d

Comments (0)

Files changed (2)

File doc/manual/source/parameters/hierarchy.rst

 
     :: 
 
-       1 - refine by slope		       6  - refine by Jeans length
-       2 - refine by baryon mass	       7  - refine if (cooling time < cell width/sound speed)
-       3 - refine by shocks 		       11 - refine by resistive length
+       1 - refine by slope		       9 - refine by shear
+       2 - refine by baryon mass	       10 - refine by optical depth (in radiation calculation)
+       3 - refine by shocks 		       11 - refine by resistive length (in MHD calculation)
        4 - refine by particle mass	       12 - refine by defined region "MustRefineRegion"
        5 - refine by baryon overdensity	       13 - refine by metallicity
-       	  (currently disabled)
-       101 - avoid refinement in regions
-             defined in "AvoidRefineRegion"
+       	  (currently disabled)                 14 - refine around shockwaves
+       6  - refine by Jeans length             16 - refine by Jeans length from the inertial tensor	       
+       7  - refine if (cooling time < cell width/sound speed)
+       8 - refine by must-refine particles
+       100 - avoid refinement based on ForbiddenRefinement field
+       101 - avoid refinement in regions defined in "AvoidRefineRegion" 
 
 ``RefineRegionLeftEdge``, ``RefineRegionRightEdge`` (external)
     These two parameters control the region in which refinement is

File src/enzo/Grid_SetFlaggingField.C

 
     /* All of the calculation of particle mass flagging fields are
        done in grid::SetParticleMassFlaggingField now. */
-
  
     /* Flag all points that need extra resolution (FlagCellsToBeRefinedByMass
        return the number of flagged cells). */
     }
     break;
  
+    /* ==== METHOD 5: (disabled)  ==== */
+
     /* ==== METHOD 6: BY JEANS LENGTH ==== */
  
   case 6:
 #endif /* TRANSFER */
     break;
 
+    /* ==== METHOD 11: BY RESISTIVE LENGTH ==== */
+
   case 11:
-      NumberOfFlaggedCells = this->FlagCellsToBeRefinedByResistiveLength();
+    NumberOfFlaggedCells = this->FlagCellsToBeRefinedByResistiveLength();
+    if (NumberOfFlaggedCells < 0) {
+      ENZO_FAIL("Error in grid->FlagCellsToBeRefinedByResistiveLength.");
+    }
+    break;
+
+    /* ==== METHOD 12: FORCE REFINEMENT TO SOME LEVEL IN A SET REGION ==== */
+ 
+  case 12:
+    if (level < MustRefineRegionMinRefinementLevel) {
+      NumberOfFlaggedCells = this->FlagCellsToBeRefinedByMustRefineRegion(level);
       if (NumberOfFlaggedCells < 0) {
-		ENZO_FAIL("Error in grid->FlagCellsToBeRefinedByResistiveLength.");
+	ENZO_FAIL("Error in grid->FlagCellsToBeRefinedByMustRefineRegion.");
       }
-      break;
-
-      /* ==== METHOD 12: FORCE REFINEMENT TO SOME LEVEL IN A SET REGION ==== */
+    }
+    break;
  
-    case 12:
-      if (level < MustRefineRegionMinRefinementLevel) {
-	NumberOfFlaggedCells = this->FlagCellsToBeRefinedByMustRefineRegion(level);
-	if (NumberOfFlaggedCells < 0) {
-	  ENZO_FAIL("Error in grid->FlagCellsToBeRefinedByMustRefineRegion.");
-	}
+    /* ==== METHOD 13: FORCE REFINEMENT BASED ON METALLICITY OF GAS ==== */
+    
+  case 13:
+    if (level < MetallicityRefinementMinLevel) {
+      NumberOfFlaggedCells = this->FlagCellsToBeRefinedByMetallicity(level);
+      if (NumberOfFlaggedCells < 0) {
+	ENZO_FAIL("Error in grid->FlagCellsToBeRefinedByMetallicity.");
       }
-      break;
- 
-
-      /* ==== METHOD 13: FORCE REFINEMENT BASED ON METALLICITY OF GAS ==== */
- 
-    case 13:
-      if (level < MetallicityRefinementMinLevel) {
-	NumberOfFlaggedCells = this->FlagCellsToBeRefinedByMetallicity(level);
-	if (NumberOfFlaggedCells < 0) {
-	  ENZO_FAIL("Error in grid->FlagCellsToBeRefinedByMetallicity.");
-	}
-      }
-      break;
- 
-
-      /* ==== METHOD 14: Refine around Shockwaves ==== */
+    }
+    break;
+    
+    /* ==== METHOD 14: Refine around Shockwaves ==== */
   case 14:
     NumberOfFlaggedCells = this->FlagCellsToBeRefinedByShockwaves(level);
     if (NumberOfFlaggedCells < 0) {
       return FAIL;
     }
     break;
-    /* ==== undefined ==== */
+
+    /* ==== METHOD 15: undefined ==== */
+
     
     /* ==== METHOD 16: Refine on total Jeans length ==== */
   case 16: 
     }
     break;
 
+    /* ==== METHOD 17: undefined ==== */
+
     /* ==== METHOD 18: BY POSITION OF MUST-REFINE PARTICLES ONLY ABOVE A CERTAIN MASS  ==== */
   case 18:
 
 
     break;
  
- 
     /* ==== METHOD 100: UNDO REFINEMENT IN SOME REGIONS ==== */
  
     /* Must be done last ... */