fix: Pass root-variance (instead of variance) to cosmologicalMassVari…

…ance class mass() function In excursion set solvers the variance was being passed to the cosmologicalMassVariance class mass() function instead of the root-variance. This patch causes root-variances to be passed instead.
galacticusorg · Aug 11, 2021 · 10c39b5 · 10c39b5
1 parent 57d73d0
commit 10c39b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/source/structure_formation.excursion_sets.first_crossing_distribution.Farahi.F90 b/source/structure_formation.excursion_sets.first_crossing_distribution.Farahi.F90
@@ -904,10 +904,10 @@ subroutine farahiRateTabulate(self,varianceProgenitor,time,node)
 #endif
                 ! Construct the barrier table.
                 do i=1,self%varianceTableCountRate
-                   massProgenitor         =+cosmologicalMassVariance_%mass        (real(+varianceTableRateQuad(i)+varianceTableRateBaseQuad(iVariance),kind=8),self%timeTableRate(iTime)                        )
-                   growthFactorEffective  =+cosmologicalMassVariance_%rootVariance(      massProgenitor                                                       ,self%timeTableRate(iTime)                        ) &
-                        &                  /cosmologicalMassVariance_%rootVariance(      massProgenitor                                                       ,     timeProgenitor                              )
-                   barrierTableRateQuad(i)=+excursionSetBarrier_     %barrier     (real(+varianceTableRateQuad(i)+varianceTableRateBaseQuad(iVariance),kind=8),     timeProgenitor      ,node,rateCompute=.true.) &
+                   massProgenitor         =+cosmologicalMassVariance_%mass        (real(sqrt(+varianceTableRateQuad(i)+varianceTableRateBaseQuad(iVariance)),kind=8),self%timeTableRate(iTime)                        )
+                   growthFactorEffective  =+cosmologicalMassVariance_%rootVariance(           massProgenitor                                                        ,self%timeTableRate(iTime)                        ) &
+                        &                  /cosmologicalMassVariance_%rootVariance(           massProgenitor                                                        ,     timeProgenitor                              )
+                   barrierTableRateQuad(i)=+excursionSetBarrier_     %barrier     (real(     +varianceTableRateQuad(i)+varianceTableRateBaseQuad(iVariance) ,kind=8),     timeProgenitor      ,node,rateCompute=.true.) &
                         &                  *growthFactorEffective
                 end do
                 !$omp atomic

diff --git a/source/structure_formation.excursion_sets.first_crossing_distribution.Farahi.midpoint.F90 b/source/structure_formation.excursion_sets.first_crossing_distribution.Farahi.midpoint.F90
@@ -617,15 +617,15 @@ subroutine farahiMidpointRateTabulate(self,varianceProgenitor,time,node)
                 loopCount=loopCount+1_c_size_t
                 ! Construct the barrier table.
                 do i=1,self%varianceTableCountRate
-                   massProgenitor            =+cosmologicalMassVariance_%mass        (real(+varianceTableRateQuad   (i)+varianceTableRateBaseQuad(iVariance),kind=8),self%timeTableRate(iTime)                        )
-                   growthFactorEffective     =+cosmologicalMassVariance_%rootVariance(      massProgenitor                                                          ,self%timeTableRate(iTime)                        ) &
-                        &                     /cosmologicalMassVariance_%rootVariance(      massProgenitor                                                          ,     timeProgenitor                              )
-                   barrierTableRateQuad   (i)=+excursionSetBarrier_     %barrier     (real(+varianceTableRateQuad   (i)+varianceTableRateBaseQuad(iVariance),kind=8),     timeProgenitor      ,node,rateCompute=.true.) &
+                   massProgenitor            =+cosmologicalMassVariance_%mass        (real(sqrt(+varianceTableRateQuad   (i)+varianceTableRateBaseQuad(iVariance)),kind=8),self%timeTableRate(iTime)                        )
+                   growthFactorEffective     =+cosmologicalMassVariance_%rootVariance(           massProgenitor                                                           ,self%timeTableRate(iTime)                        ) &
+                        &                     /cosmologicalMassVariance_%rootVariance(           massProgenitor                                                           ,     timeProgenitor                              )
+                   barrierTableRateQuad   (i)=+excursionSetBarrier_     %barrier     (real(     +varianceTableRateQuad   (i)+varianceTableRateBaseQuad(iVariance) ,kind=8),     timeProgenitor      ,node,rateCompute=.true.) &
                         &                     *growthFactorEffective
-                   massProgenitor            =+cosmologicalMassVariance_%mass        (real(+varianceMidTableRateQuad(i)+varianceTableRateBaseQuad(iVariance),kind=8),self%timeTableRate(iTime)                        )
-                   growthFactorEffective     =+cosmologicalMassVariance_%rootVariance(      massProgenitor                                                          ,self%timeTableRate(iTime)                        ) &
-                        &                     /cosmologicalMassVariance_%rootVariance(      massProgenitor                                                          ,     timeProgenitor                              )
-                   barrierMidTableRateQuad(i)=+excursionSetBarrier_     %barrier     (real(+varianceMidTableRateQuad(i)+varianceTableRateBaseQuad(iVariance),kind=8),     timeProgenitor      ,node,rateCompute=.true.) &
+                   massProgenitor            =+cosmologicalMassVariance_%mass        (real(sqrt(+varianceMidTableRateQuad(i)+varianceTableRateBaseQuad(iVariance)),kind=8),self%timeTableRate(iTime)                        )
+                   growthFactorEffective     =+cosmologicalMassVariance_%rootVariance(           massProgenitor                                                           ,self%timeTableRate(iTime)                        ) &
+                        &                     /cosmologicalMassVariance_%rootVariance(           massProgenitor                                                           ,     timeProgenitor                              )
+                   barrierMidTableRateQuad(i)=+excursionSetBarrier_     %barrier     (real(     +varianceMidTableRateQuad(i)+varianceTableRateBaseQuad(iVariance),kind=8 ),     timeProgenitor      ,node,rateCompute=.true.) &
                         &                     *growthFactorEffective
                 end do
                 ! For zero variance, the rate is initialized to zero.