Commits

Nathan Goldbaum committed ed63fb3

Updating the CollapseTestAccretingParticle to be a bit smaller, removing some stuff that Clang complains about in the AccretingParticle, fixing the precision that Gamma is written to the parameter file with.

  • Participants
  • Parent commits 348b7dd

Comments (0)

Files changed (3)

File run/Hydro/Hydro-3D/CollapseTestAccretingParticle/CollapseTestAccretingParticles.enzo

 #
 ProblemType                = 27           // Collapse test
 TopGridRank                = 3
-TopGridDimensions          = 128 128 128
+TopGridDimensions          = 64 64 64
 SelfGravity                = 1            // gravity on
 TopGridGravityBoundary     = 0            // periodic
 LeftFaceBoundaryCondition  = 3 3 3        // periodic
 CollapseTestInitialTemperature = 5e3    // temperature of the background gas
 CollapseTestSpherePosition[0]   = 0.49 0.49 0.49
 CollapseTestSphereVelocity[0]   = 0.0 0.0 0.0
-CollapseTestSphereRadius[0]     = 0.15
+CollapseTestSphereRadius[0]     = 0.30
 CollapseTestSphereCoreRadius[0] = 0.05  // only used with sphere type 5
 CollapseTestSphereDensity[0]    = 100   // sphere density, the background density is 1
 CollapseTestSphereTemperature[0] = 50    // put sphere in pressure equilibrium (rho * T is constant)

File src/enzo/headers/ActiveParticle_AccretingParticle.h

       // Do merging twice to catch pathological cases where merging
       // leaves multiple sinks inside the same accretion zone.
 
-      ParticleList = new ActiveParticleType*[NumberOfMergedParticles]();
+      ParticleList = new ActiveParticleType*[NumberOfMergedParticles];
 
       for (i = 0; i<NumberOfMergedParticles; i++)
 	ParticleList[i] = static_cast<ActiveParticleType*>(MergedParticles[i]);
 
       /* Assign local particles to grids */
  
-      ParticleList = new ActiveParticleType*[NumberOfMergedParticles]();
+      ParticleList = new ActiveParticleType*[NumberOfMergedParticles];
 
       // need to use a bit of redirection because C++ pointer arrays have
       // trouble with polymorphism

File src/enzo/io/WriteParameterFile.C

   fprintf(fptr, "HydroMethod                    = %"ISYM"\n", HydroMethod);
   fprintf(fptr, "huge_number                    = %e\n", huge_number);
   fprintf(fptr, "tiny_number                    = %e\n", tiny_number);
-  fprintf(fptr, "Gamma                          = %14.11"FSYM"\n", Gamma);
+  fprintf(fptr, "Gamma                          = %"GOUTSYM"\n", Gamma);
   fprintf(fptr, "PressureFree                   = %"ISYM"\n", PressureFree);
   fprintf(fptr, "RefineBy                       = %"ISYM"\n", RefineBy);
   fprintf(fptr, "MaximumRefinementLevel         = %"ISYM"\n", MaximumRefinementLevel);