Skip to content

Commit 1540d15

Browse files
committed
Merge branch 'dev' of github.com:TeamCOMPAS/COMPAS into lambda_enhancements
2 parents 4e88648 + da42e90 commit 1540d15

File tree

371 files changed

+109205
-215636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

371 files changed

+109205
-215636
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: COMPAS compile test
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
compas:
7+
name: Build COMPAS
8+
runs-on: ubuntu-18.04
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Install dependencies
13+
run: sudo apt install g++ libboost-all-dev libgsl-dev libhdf5-serial-dev
14+
15+
- name: Build Compas
16+
run: cd src && make -j $(nproc) -f Makefile
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: LaTeX compile test
2+
3+
# Test Latex compiles on pull_requests
4+
# Public documentation on push to dev
5+
6+
on:
7+
pull_request:
8+
push:
9+
branches: [dev]
10+
11+
jobs:
12+
latex:
13+
name: Build LaTeX documentation
14+
runs-on: ubuntu-18.04
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
19+
- name: Install dependencies
20+
run: sudo apt install texlive-base
21+
22+
# Need to do pdflatex, bibtex, pdflatex, pdflatex
23+
- name: pdflatex main
24+
uses: dante-ev/latex-action@latest
25+
with:
26+
working_directory: docs/COMPAS_LaTeX
27+
root_file: main.tex
28+
compiler: pdflatex
29+
args: -interaction=nonstopmode -shell-escape
30+
31+
- name: bibtex main
32+
uses: dante-ev/latex-action@latest
33+
with:
34+
working_directory: docs/COMPAS_LaTeX
35+
root_file: main.aux
36+
compiler: bibtex
37+
args:
38+
39+
- name: pdflatex main
40+
uses: dante-ev/latex-action@latest
41+
with:
42+
working_directory: docs/COMPAS_LaTeX
43+
root_file: main.tex
44+
compiler: pdflatex
45+
args: -interaction=nonstopmode -shell-escape
46+
47+
- name: pdflatex main
48+
uses: dante-ev/latex-action@latest
49+
with:
50+
working_directory: docs/COMPAS_LaTeX
51+
root_file: main.tex
52+
compiler: pdflatex
53+
args: -interaction=nonstopmode -shell-escape
54+
55+
56+
# If push to dev, publish the documentation
57+
- name: publish documentation
58+
if: github.event_name == 'push'
59+
run: |
60+
git checkout --orphan Documentation
61+
PDF_FILE=COMPAS_Documentation.pdf
62+
mv docs/COMPAS_LaTeX/main.pdf $PDF_FILE
63+
git rm -rf .
64+
git add -f $PDF_FILE
65+
git config user.name "Team COMPAS"
66+
git config user.email "<>"
67+
git commit -m "Documentation update"
68+
git push -f --set-upstream origin Documentation

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,24 @@ Thumbs.db
2121
__pycache__/
2222
COMPAS_Output*/
2323
output*/
24-
.github/
2524
COMPAS
2625
*.log
2726
*.aux
2827
*.toc
2928
*.bbl
3029
*.blg
30+
*.pdf
31+
*.eps
32+
*.png
3133
*.synctex
3234
*.synctex(busy)
3335
*.synctex.gz
3436
*.synctex.gz(busy)
3537

38+
# docs html
39+
*_build
40+
41+
*.vscode
42+
3643
Makefile-reinhold
3744
.gitignore

CODE_OF_CONDUCT.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# COMPAS Code of Conduct
2+
3+
Dear colleagues:
4+
5+
I want to take this opportunity to remind all of us (myself included)
6+
how important it is to maintain the highest standards of respectful and tolerant
7+
behavior in our professional interactions.
8+
9+
We are fortunate that Team COMPAS is a diverse group, and we want to benefit
10+
from that diversity and make sure that everyone in the team feels comfortable and welcome.
11+
12+
There are numerous codes of conduct describing what is considered appropriate
13+
professional behaviour; since many of us are based in Australia and connected to OzGrav,
14+
let me point to these two in particular:
15+
16+
ASA code of conduct: <https://asa.astronomy.org.au/wp-content/uploads/2020/09/ASA_Code_of_Conduct.pdf>
17+
18+
OzGrav code of conduct: <https://www.ozgrav.org/code-of-conduct.html>
19+
20+
Fundamentally, all of these codes are focused on one thing:
21+
maintaining a professional environment where everyone is treated with respect.
22+
23+
24+
If you notice that this is not happening, and are comfortable with doing so, please speak up or let me know offline*. We (myself included) should aim to be held accountable to each other, respect being challenged for our behavior, and remain willing to get advice on how we as individuals can help create a welcoming community where we can all thrive. Making mistakes is how we learn, both as individuals and as a community. I and others will be very grateful if you let us know about any suggestions and will endeavor to learn from them.
25+
26+
But there may be situations where this can be very uncomfortable.
27+
With that in mind, I’ve asked Prof. Elena Maria Rossi from Leiden University in the
28+
Netherlands to act as the COMPAS Ombudsperson, and Elena kindly agreed to do so.
29+
In addition to being a brilliant astrophysicist,
30+
Elena has a wealth of experience in championing equality and inclusivity;
31+
for example, she is the founder and chair of the LISA consortium Diversity and Inclusion committee.
32+
If you are experiencing any issues in interactions with COMPAS colleagues and would
33+
like to discuss them confidentially with someone who is outside of any local structures,
34+
please contact Elena, her contact details can be found at <https://www.universiteitleiden.nl/en/staffmembers/elena-rossi#tab-1>
35+
36+
Best wishes,
37+
Ilya
38+
39+
* see <https://ilyamandel.github.io/> for my contact information

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ WORKDIR /app/COMPAS
44

55
RUN apt-get update && apt-get install -y \
66
g++ \
7+
libhdf5-serial-dev \
78
libboost-all-dev \
89
libgsl-dev \
910
python3 \

README.md

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,50 @@
44

55
# Compact Object Mergers: Population Astrophysics & Statistics
66

7+
[![Documentation](https://img.shields.io/badge/Documentation-latest-orange.svg?style=flat)](https://github.com/TeamCOMPAS/COMPAS/blob/Documentation/COMPAS_Documentation.pdf)
8+
79
[//]: ## (Outline features)
810
COMPAS is a publicly available rapid binary population synthesis code (https://compas.science/) that is designed so that evolution prescriptions and model parameters are easily
911
adjustable. COMPAS draws properties for a binary star system from a set of initial distributions, and evolves it from zero-age main sequence to the end of its life as two compact
1012
remnants. It has been used for inference from observations of gravitational-wave mergers, Galactic neutron stars, X-ray binaries, and luminous red novae.
1113

1214
## Documentation
13-
[Getting started](./docs/getting_started.md)
14-
[Specifications](./docs/COMPAS_Doc.pdf)
15-
[Post-processing](./postProcessing/README.txt)
16-
[Running COMPAS inside a Docker container](./docs/docker.md)
15+
https://compas.science/docs
1716

1817
## Contact
1918
Please email your queries to compas-user@googlegroups.com. You are also welcome to join the [COMPAS User Google Group](https://groups.google.com/forum/#!members/compas-user) to engage in discussions with COMPAS users and developers.
2019

2120
## Acknowledgements
22-
If you use this code or parts of this code for results presented in a scientific publication, we would greatly appreciate if you send us your paper reference and make your input settings and output data publicly available by uploading it to the [COMPAS Zenodo community](https://zenodo.org/communities/compas/). Please also kindly include citations to the two following papers:
21+
If you use this code or parts of this code for results presented in a scientific publication, we would greatly appreciate if you send us your paper reference and make your input settings and output data publicly available by uploading it to the [COMPAS Zenodo community](https://zenodo.org/communities/compas/). Please also kindly include citations to our COMPAS methods paper https://ui.adsabs.harvard.edu/abs/2021arXiv210910352T/abstract. As the public COMPAS code is a product of work by the entire COMPAS collaboration over many years, we kindly request that, in recognition of this team effort, the paper is cited as “Team COMPAS: J. Riley et al.”. An example bibtex code is:
22+
23+
24+
@ARTICLE{COMPAS:2021methodsPaper,
25+
author = {{\noopsort{Team COMPAS}}{Team COMPAS: J. Riley} and {Riley}, Jeff and {Agrawal}, Poojan and {Barrett}, Jim W. and {Boyett}, Kristan N.~K. and {Broekgaarden}, Floor S. and {Chattopadhyay}, Debatri and {Gaebel}, Sebastian M. and {Gittins}, Fabian and {Hirai}, Ryosuke and {Howitt}, George and {Justham}, Stephen and {Khandelwal}, Lokesh and {Kummer}, Floris and {Lau}, Mike Y.~M. and {Mandel}, Ilya and {de Mink}, Selma E. and {Neijssel}, Coenraad and {Riley}, Tim and {van Son}, Lieke and {Stevenson}, Simon and {Vigna-Gomez}, Alejandro and {Vinciguerra}, Serena and {Wagg}, Tom and {Willcox}, Reinhold},
26+
title = "{Rapid stellar and binary population synthesis with COMPAS}",
27+
journal = {arXiv e-prints},
28+
keywords = {Astrophysics - Instrumentation and Methods for Astrophysics, Astrophysics - High Energy Astrophysical Phenomena, Astrophysics - Solar and Stellar Astrophysics},
29+
year = 2021,
30+
month = sep,
31+
eid = {arXiv:2109.10352},
32+
pages = {arXiv:2109.10352},
33+
archivePrefix = {arXiv},
34+
eprint = {2109.10352},
35+
primaryClass = {astro-ph.IM},
36+
adsurl = {https://ui.adsabs.harvard.edu/abs/2021arXiv210910352T},
37+
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
38+
}
39+
40+
Note that the preferred acknowledgement relies on \noopsort; to make it work, you'll have to include the following line at the start of your bibtex file:
41+
@PREAMBLE{ {\providecommand{\noopsort}[1]{}} }
42+
43+
44+
45+
In addition, we suggest to kindly include the two following papers:
2346

2447
1. Stevenson S., Vigna-Gómez A., Mandel I., Barrett J. W., Neijssel C. J., Perkins D., de Mink S. E., 2017, [Nature Communications, 8, 14906](https://ui.adsabs.harvard.edu/abs/2017NatCo...814906S/abstract)
2548
2. Vigna-Gómez A., Neijssel C. J., Stevenson S., Barrett J. W., Belczynski K., Justham S., de Mink S., M&uuml;ller B., Podsiadlowski Ph., Renzo M., Szécsi D., Mandel I., 2018, [MNRAS, 481, 4009](https://ui.adsabs.harvard.edu/abs/2018MNRAS.481.4009V/abstract)
2649

27-
We anticipate releasing a more detailed and comprehensive methods paper in the future. We also greatly appreciate an acknowledgement of the form:
50+
We also greatly appreciate an acknowledgement of the form:
2851

2952
>_Simulations in this paper made use of the COMPAS rapid binary population synthesis code (version X.X.X), which is freely available at http://github.com/TeamCOMPAS/COMPAS_.
3053
@@ -52,3 +75,9 @@ Furthermore,
5275

5376
## License
5477
[MIT](https://choosealicense.com/licenses/mit/)
78+
79+
80+
81+
### Highlighted papers that have made use of COMPAS are listed at https://compas.science/science.html ; see https://ui.adsabs.harvard.edu/public-libraries/gzRk1qpbRUy4cP2GydR36Q for a full ADS library
82+
83+

defaults/compas_hpc_input_default.py

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)