Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SWIFTsim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

1a46a2f8

Commit 1a46a2f8 authored 4 years ago by Matthieu Schaller

Downloads
- Plain Diff

Merge branch 'eos_selection' into 'master'

Eos selection

Closes #743

See merge request !1290

parents 2f8eca80 85460c78

No related branches found

No related tags found

1 merge request!1290Eos selection

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

doc/RTD/source/ParameterFiles/parameter_description.rst 2 additions, 7 deletions

doc/RTD/source/ParameterFiles/parameter_description.rst
doc/RTD/source/Planetary/equations_of_state.rst 7 additions, 5 deletions

doc/RTD/source/Planetary/equations_of_state.rst
examples/Planetary/EarthImpact/earth_impact.yml 12 additions, 18 deletions

examples/Planetary/EarthImpact/earth_impact.yml
examples/Planetary/EarthImpact/make_anim.sh 2 additions, 2 deletions

examples/Planetary/EarthImpact/make_anim.sh
examples/Planetary/EarthImpact/plot_solution.py 5 additions, 5 deletions

examples/Planetary/EarthImpact/plot_solution.py
examples/parameter_example.yml 25 additions, 14 deletions

examples/parameter_example.yml
src/equation_of_state/planetary/equation_of_state.h 933 additions, 162 deletions

src/equation_of_state/planetary/equation_of_state.h

with 986 additions and 213 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment