From e90c22b21d8909cac00e7cc2618a65702ebdbb57 Mon Sep 17 00:00:00 2001 From: Sten Delos <sten@mpa-garching.mpg.de> Date: Thu, 15 Dec 2022 15:07:14 +0100 Subject: [PATCH] minor fix; no need for growth stats to account for radiation because they are still inaccurate in that context --- src/ngenic/ngenic.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ngenic/ngenic.h b/src/ngenic/ngenic.h index 36906b1..4c15d4f 100644 --- a/src/ngenic/ngenic.h +++ b/src/ngenic/ngenic.h @@ -119,12 +119,8 @@ class ngenic : public pm_mpi_fft static double ngenic_growth_int(double a, void *param) { -#if defined(RADIATION) && !defined(SMOOTHMATTER) - return pow(a / (All.Omega0 + (1 - All.Omega0 - All.OmegaLambda) * a + All.OmegaLambda * a * a * a + All.OmegaR / a), 1.5); -#elif !defined(RADIATION) && defined(SMOOTHMATTER) +#ifdef SMOOTHMATTER return pow(a / (All.Omega0 + All.OmegaSmooth + (1 - All.Omega0 - All.OmegaLambda - All.OmegaSmooth) * a + All.OmegaLambda * a * a * a), 1.5); -#elif defined(RADIATION) && defined(SMOOTHMATTER) - return pow(a / (All.Omega0 + All.OmegaSmooth + (1 - All.Omega0 - All.OmegaLambda - All.OmegaSmooth - All.OmegaR) * a + All.OmegaLambda * a * a * a + All.OmegaR / a), 1.5); #else return pow(a / (All.Omega0 + (1 - All.Omega0 - All.OmegaLambda) * a + All.OmegaLambda * a * a * a), 1.5); #endif -- GitLab