diff --git a/README.md b/README.md index 4b0d9f8..b3c4173 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ Please note the separate licensing for Panphasia (see external/panphasia/LICENSE If you use MUSIC2-monofonIC in your scientific work, you are required to acknowledge this by linking to this repository and citing the relevant papers: -- For total matter sims, or 3LPT/PLT related aspects: Michaux et al. 2020 (arXiv:TBD) +- For total matter sims, or 3LPT/PLT related aspects: Michaux et al. 2020 [arXiv:2008.09588](https://arxiv.org/abs/2008.09588) -- For baryon+CDM sims, or PPT numerics related aspects: Hahn et al. 2020 (arXiv:TBD) +- For baryon+CDM sims, or PPT numerics related aspects: Hahn et al. 2020 [arXiv:2008.09124](https://arxiv.org/abs/2008.09124) ## Acknowledgments diff --git a/example.conf b/example.conf index 64e67d6..74d8900 100644 --- a/example.conf +++ b/example.conf @@ -38,11 +38,11 @@ nspec = 0.961 sigma_8 = 0.811 ZeroRadiation = false # For Back-scaling only: set to true if your simulation code - # can deal with Omega_r!=0 in its background FLRW model + # cannot deal with Omega_r!=0 in its background FLRW model ## Additional cosmological parameters (set by default to the given values) -# w0 = -1.0 -# wa = 0.0 +# w0 = -1.0 # not supported yet! +# wa = 0.0 # not supported yet! # Tcmb = 2.7255 # Neff = 3.046 diff --git a/external/class b/external/class index 6adecae..414e895 160000 --- a/external/class +++ b/external/class @@ -1 +1 @@ -Subproject commit 6adecae2f30172a94e003155090791abf509d995 +Subproject commit 414e89597d6eb93f713bad33c63aa62348f02e62 diff --git a/external/genericio.cmake b/external/genericio.cmake index 505bcc0..e322790 100644 --- a/external/genericio.cmake +++ b/external/genericio.cmake @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.11) include(FetchContent) FetchContent_Declare( genericio - GIT_REPOSITORY https://xgitlab.cels.anl.gov/mbuehlmann/genericio.git + GIT_REPOSITORY https://xgitlab.cels.anl.gov/hacc/genericio.git GIT_TAG master ) diff --git a/include/particle_plt.hh b/include/particle_plt.hh index 0213c86..cb4946f 100644 --- a/include/particle_plt.hh +++ b/include/particle_plt.hh @@ -1,6 +1,6 @@ // This file is part of monofonIC (MUSIC2) // A software package to generate ICs for cosmological simulations -// Copyright (C) 2020 by Oliver Hahn +// Copyright (C) 2020 by Oliver Hahn & Bruno Marcos (this file) // // monofonIC is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -14,6 +14,11 @@ // // You should have received a copy of the GNU General Public License // along with this program. If not, see . + +// +// NOTE: part of this code, notably the translation into the first Brillouin +// zone (FBZ), was adapted from Fortran code written by Bruno Marcos +// #pragma once #include diff --git a/src/main.cc b/src/main.cc index 6272918..0c244dc 100644 --- a/src/main.cc +++ b/src/main.cc @@ -96,7 +96,7 @@ int main( int argc, char** argv ) << " dP dP dP `88888P\' dP dP `88888P\' dP `88888P\' dP dP dP Y88888P\' \n" << std::endl; // git and versioning info: - music::ilog << "Version: v0.1a, git rev.: " << GIT_REV << ", tag: " << GIT_TAG << ", branch: " << GIT_BRANCH << std::endl; + music::ilog << "Version: git rev.: " << GIT_REV << ", tag: " << GIT_TAG << ", branch: " << GIT_BRANCH << std::endl; // Compilation CMake configuration, time etc info: music::ilog << "This " << CMAKE_BUILDTYPE_STR << " build was compiled at " << __TIME__ << " on " << __DATE__ << std::endl; diff --git a/src/plugins/output_gadget_hdf5.cc b/src/plugins/output_gadget_hdf5.cc index a63d34e..bce09d0 100644 --- a/src/plugins/output_gadget_hdf5.cc +++ b/src/plugins/output_gadget_hdf5.cc @@ -176,7 +176,7 @@ public: case cosmo_species::dm: return 1; case cosmo_species::baryon: - return 2; + return 0; case cosmo_species::neutrino: return 3; } diff --git a/version.cmake b/version.cmake index 5162ec7..07b4e4f 100644 --- a/version.cmake +++ b/version.cmake @@ -19,7 +19,7 @@ else() COMMAND bash -c "git diff --quiet --exit-code || echo +" OUTPUT_VARIABLE GIT_DIFF) execute_process( - COMMAND git describe --exact-match --tags + COMMAND git describe #--exact-match --tags OUTPUT_VARIABLE GIT_TAG ERROR_QUIET) execute_process( COMMAND git rev-parse --abbrev-ref HEAD @@ -48,4 +48,4 @@ endif() if (NOT "${VERSION}" STREQUAL "${VERSION_}") file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/version.cc "${VERSION}") -endif() \ No newline at end of file +endif()