Skip to content

Commit

Permalink
Merge branch 'aemattssing' of github.com:lanl/singularity-eos into ae…
Browse files Browse the repository at this point in the history
…mattssing
  • Loading branch information
Ann Elisabet Wills - 298385 committed Jan 22, 2024
2 parents 46c61c6 + 563f418 commit 9ad9edf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Current develop

### Fixed (Repair bugs, etc)
- [[PR335]](https://github.com/lanl/singularity-eos/pull/335) Fix missing hermite.hpp in CMake install required for Helmholtz EOS
### Added (new features/APIs/variables/...)
- [[PR#336]](https://github.com/lanl/singularity-eos/pull/336) Included code and documentation for a full, temperature consistent, Mie-Gruneisen EOS based on a pressure power law expansion in eta = 1-V/V0. PowerMG.

Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/src/models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,7 @@ SAP Polynomial EOS
``````````````````

This model is specific to the Safety Applications Project (SAP). It is
an imcomplete EOS, and is a simple analytical form used to fit
an incomplete EOS, and is a simple analytical form used to fit
experimental data:

.. math::
Expand Down
1 change: 1 addition & 0 deletions singularity-eos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ set(EOS_HEADERS
base/constants.hpp
base/eos_error.hpp
base/sp5/singularity_eos_sp5.hpp
base/hermite.hpp
eos/eos.hpp
eos/eos_variant.hpp
eos/singularity_eos.hpp
Expand Down

0 comments on commit 9ad9edf

Please sign in to comment.