Merge pull request #2 from abensonca/mergerTreeImprovement

Merger tree improvement
galacticusorg · Dec 1, 2022 · 8d9d3bf · 8d9d3bf
2 parents be99294 + ccfaed7
commit 8d9d3bf
Show file tree

Hide file tree

Showing 6 changed files with 763 additions and 604 deletions.
diff --git a/source/structure_formation.excursion_sets.barrier.critical_overdensity.F90 b/source/structure_formation.excursion_sets.barrier.critical_overdensity.F90
@@ -143,7 +143,7 @@ double precision function criticalOverdensityBarrierGradient(self,variance,time,
     double precision                                                        :: alpha      , mass
     !$GLC attributes unused :: rateCompute
 
-    if (variance <= 0.0d0) then
+    if (variance <= 0.0d0 .or. .not.self%criticalOverdensity_%isMassDependent()) then
        ! Return zero critical overdensity gradient at this time for infinite mass.
        criticalOverdensityBarrierGradient=0.0d0
     else