Skip to content

Commit dc8f306

Browse files
authored
Merge pull request #428 from lanl/jmm/joss-comments
Changes from round of JOSS review
2 parents 47e0076 + 1e88aaa commit dc8f306

File tree

11 files changed

+33
-11
lines changed

11 files changed

+33
-11
lines changed

doc/sphinx/ApproxForTH.png

76.4 KB
Loading

doc/sphinx/GibbsOrder.png

63.1 KB
Loading

doc/sphinx/PMGvsMGUsupPress.png

89.2 KB
Loading

doc/sphinx/SteinbergGammarho.png

83 KB
Loading

doc/sphinx/src/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ time. For example:
1111
.. code-block:: bash
1212
1313
# from singularity-eos repo
14-
mkdir -p build && cd build
14+
mkdir -p builddir && cd builddir
1515
cmake .. -DSINGULARITY_BUILD_EXAMPLES=ON ..
1616
make -j
1717

doc/sphinx/src/getting-started.rst

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,26 @@ At it's most basic, you can download and compile ``singularity-eos`` with:
99
1010
git clone --recursive git@github.com:lanl/singularity-eos.git
1111
cd singularity-eos
12-
mkdir bin
13-
cd bin
14-
cmake -DSINGULARITY_FORCE_SUBMODULE_MODE=ON -DSINGULARITY_USE_FORTRAN=OFF ..
15-
make -j
16-
make install # optional: install into directory defined via CMAKE_INSTALL_PREFIX
12+
cmake -B builddir -S . -DSINGULARITY_FORCE_SUBMODULE_MODE=ON -DSINGULARITY_USE_FORTRAN=OFF -DSINGULARITY_BUILD_EXAMPLES=ON
13+
cmake --build builddir --parallel
14+
cmake --install builddir # optional: install into directory defined via CMAKE_INSTALL_PREFIX
1715
1816
This will download ``singularity-eos`` with no optional dependencies and
1917
compile the capabilities available in that form. For more details, see
2018
:ref:`our build page <building>`.
2119

20+
Once compiled, you can quickly check your builddir/install by going to
21+
``builddir/example`` and running ``./get_sound_speed_press``. You should be
22+
able to see the following output:
23+
24+
.. code-block::
25+
26+
The final values are:
27+
rho = 0.987467
28+
uu = 0.00987467
29+
P = 0.0059248
30+
cs = 0.0979796
31+
2232
If the library is in your include and lib paths (or you built it
2333
in-tree), you can include the ``eos`` part of the library with
2434

doc/sphinx/src/models.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ If the unitless user parameter :math:`b=\Gamma_0`, the Gruneisen parameter is of
698698
form where :math:`\Gamma_0 =` constant in compression. These two limitig cases are
699699
shown in the figure below.
700700

701-
.. image:: ../SteinbergGammarho.pdf
701+
.. image:: ../SteinbergGammarho.png
702702
:width: 500
703703
:alt: Figure: Demonstration of how the parameter b interpolated between two common approximations for Gamma
704704

@@ -978,7 +978,7 @@ The first omitted term in the expansion inside the square brackets is :math:`\Ga
978978
in fact even better than the common approximation of replacing the full temperature on the Hugoniot with the temperature on the
979979
isentrope, that is, the first term :math:`T_0 e^{\Gamma(\rho_0) \eta}`.
980980

981-
.. image:: ../ApproxForTH.pdf
981+
.. image:: ../ApproxForTH.png
982982
:width: 500
983983
:alt: Figure: Different approximations for the temperature on the Hugoniot.
984984

@@ -1018,7 +1018,7 @@ By expanding the MGUsup Hugoniot pressure into a power series in :math:`\eta` we
10181018
10191019
In the figure below we have used :math:`M=20` with these coefficients and show how the divergence in the MGUsup pressure at :math:`\eta = \frac{1}{s}` is avoided in the PowerMG, making it more suitable for modeling high pressures.
10201020

1021-
.. image:: ../PMGvsMGUsupPress.pdf
1021+
.. image:: ../PMGvsMGUsupPress.png
10221022
:width: 500
10231023
:alt: Figure: Comparing Hugoniot pressure for PowerMG and MGUsup
10241024

doc/sphinx/src/python.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Singularity EOS provides Python bindings which can be enabled with the CMake
77
``SINGULARITY_BUILD_PYTHON`` option. They provide a 1:1 mapping of the C++ EOS
88
types and give access to both scalar and vector functions.
99

10+
Where you build or install your python bindings to must be included in
11+
your python module search path. For example, if you do not install,
12+
this may be ``singularity-eos/builddir/python``.
13+
1014
.. note::
1115

1216
At this time, all Python bindings are host-only.

doc/sphinx/src/using-kpt.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ transportation rate from/to phases ``fromto[k]``, with ``k`` a phase transition
183183
in ``fromto``, "ij", is composed from the ``gibbs`` index of the "from" phase, :math:`i`, and the ``gibbs`` index of the "to" phase,
184184
:math:`j`, as :math:`i*10+j`, and with a single digit integer, "x", interpreted as "0x".
185185

186-
.. image:: ../GibbsOrder.pdf
186+
.. image:: ../GibbsOrder.png
187187
:width: 500
188188
:alt: Figure: How the phase transition index used in several arrays relate to the phase index in the gibbsorder array.
189189

joss-paper/paper.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ knowledge to compute them as performantly as possible.
217217

218218
Accelerators present new challenges to standard object-oriented
219219
programming. In particular, not all compiler stacks (such as Sycl
220-
[@SYCL] or OpenMP Target Offload [@chandra2001parallel])
220+
[@SYCL] or OpenMP [@chandra2001parallel] Target Offload [@openmp4])
221221
support relocatable device code, which is required for standard C++
222222
polymorphism. Even in programming models, such as CUDA [@cuda],
223223
which do support relocatable device code, polymorphism can be slower

0 commit comments

Comments
 (0)