changed default non-linear model to HMcode-2020 (#98)

cmbant · Jan 12, 2021 · 3a90f29 · 3a90f29
1 parent 126da1c
commit 3a90f29
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -101,5 +101,3 @@ deploy:
       branch: master
       repo: cmbant/CAMB
       tags: true
-
-
diff --git a/camb/cambdll.dll b/camb/cambdll.dll
diff --git a/camb/nonlinear.py b/camb/nonlinear.py
@@ -23,7 +23,7 @@ class NonLinearModel(F2003Class):
 halofit_mead2020 = 'mead2020'
 halofit_mead2020_feedback = 'mead2020_feedback'
 
-halofit_default = halofit_mead
+halofit_default = halofit_mead2020
 
 halofit_version_names = {halofit_original          : 1,
                          halofit_bird              : 2,

diff --git a/fortran/halofit.f90 b/fortran/halofit.f90
@@ -59,7 +59,7 @@ module NonLinear
     integer, parameter :: halofit_mead2016=5, halofit_halomodel=6, halofit_mead2015=8, halofit_mead2020=9
     integer, parameter :: halofit_mead2020_feedback=10
     integer, parameter :: halofit_mead=halofit_mead2016 ! AM Kept for backwards compatability
-    integer, parameter :: halofit_default=halofit_mead2016
+    integer, parameter :: halofit_default=halofit_mead2020
 
     logical :: HM_verbose = .false.
 

diff --git a/inifiles/params.ini b/inifiles/params.ini
@@ -256,7 +256,7 @@ do_late_rad_truncation   = T
 #8. HMcode (Mead et al. 2015; arXiv:1505.07833)
 #9. HMcode-2020 (Mead et al. 2020; arXiv:2009.01858)
 #10. HMcode-2020 with baryonic feedback (Mead et al. 2020; arXiv:2009.01858)
-halofit_version= 4
+halofit_version = 9
 
 #Baryonic feedback temperature if using HMcode-2020 with feedback
 #HMcode_logT_AGN = 7.8
Original file line number	Diff line number	Diff line change
Expand Up		@@ -101,5 +101,3 @@ deploy:
		branch: master
		repo: cmbant/CAMB
		tags: true