Commit bca94340 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'master' into FOF

parents f8a0b838 080b8536
......@@ -49,9 +49,12 @@ examples/*/*.mpg
examples/*/*/gravity_checks_*.dat
examples/*/*/coolingtables.tar.gz
examples/*/*/coolingtables
examples/*/*/yieldtables.tar.gz
examples/*/*/yieldtables
examples/Cooling/CoolingRates/cooling_rates
examples/Cooling/CoolingRates/cooling_element_*.dat
examples/Cooling/CoolingRates/cooling_output.dat
examples/SubgridTests/StellarEvolution/StellarEvolutionSolution*
tests/testActivePair
tests/testActivePair.sh
......@@ -110,6 +113,7 @@ tests/testMaths
tests/testRandom
tests/testThreadpool
tests/testParser
tests/testFeedback
tests/parser_output.yml
tests/testPeriodicBC.sh
tests/testPeriodicBCPerturbed.sh
......
......@@ -35,6 +35,7 @@ Parameters:
-M, --multipole-reconstruction Reconstruct the multipoles every time-step.
-s, --hydro Run with hydrodynamics.
-S, --stars Run with stars.
-B, --black-holes Run with black holes.
-x, --velociraptor Run with structure finding.
--limiter Run with time-step limiter.
......
......@@ -83,6 +83,7 @@ Parameters:
-M, --multipole-reconstruction Reconstruct the multipoles every time-step.
-s, --hydro Run with hydrodynamics.
-S, --stars Run with stars.
-B, --black-holes Run with black holes.
-x, --velociraptor Run with structure finding.
--limiter Run with time-step limiter.
......
......@@ -1329,7 +1329,8 @@ case "$with_subgrid" in
with_subgrid_entropy_floor=none
with_subgrid_stars=GEAR
with_subgrid_star_formation=GEAR
with_subgrid_feedback=thermal
with_subgrid_feedback=none
with_subgrid_black_holes=none
;;
EAGLE)
with_subgrid_cooling=EAGLE
......@@ -1338,7 +1339,8 @@ case "$with_subgrid" in
with_subgrid_entropy_floor=EAGLE
with_subgrid_stars=EAGLE
with_subgrid_star_formation=EAGLE
with_subgrid_feedback=none
with_subgrid_feedback=EAGLE
with_subgrid_black_holes=EAGLE
;;
*)
AC_MSG_ERROR([Unknown subgrid choice: $with_subgrid])
......@@ -1369,7 +1371,7 @@ esac
# Hydro scheme.
AC_ARG_WITH([hydro],
[AS_HELP_STRING([--with-hydro=<scheme>],
[Hydro dynamics to use @<:@gadget2, minimal, pressure-entropy, pressure-energy, pressure-energy-monaghan, default, gizmo-mfv, gizmo-mfm, shadowfax, planetary, anarchy-pu debug default: gadget2@:>@]
[Hydro dynamics to use @<:@gadget2, minimal, pressure-entropy, pressure-energy, pressure-energy-monaghan, default, gizmo-mfv, gizmo-mfm, shadowfax, planetary, anarchy-pu default: gadget2@:>@]
)],
[with_hydro="$withval"],
[with_hydro="gadget2"]
......@@ -1728,7 +1730,7 @@ case "$with_stars" in
AC_DEFINE([STARS_GEAR], [1], [GEAR stellar model])
;;
none)
AC_DEFINE([STARS_NONE], [1], [None stellar model])
AC_DEFINE([STARS_NONE], [1], [Basic stellar model])
;;
*)
......@@ -1739,7 +1741,7 @@ esac
# Feedback model
AC_ARG_WITH([feedback],
[AS_HELP_STRING([--with-feedback=<model>],
[Feedback model to use @<:@none, thermal, debug default: none@:>@]
[Feedback model to use @<:@none, EAGLE, debug default: none@:>@]
)],
[with_feedback="$withval"],
[with_feedback="none"]
......@@ -1754,10 +1756,11 @@ if test "$with_subgrid" != "none"; then
fi
case "$with_feedback" in
thermal)
AC_DEFINE([FEEDBACK_THERMAL], [1], [Thermal Blastwave])
EAGLE)
AC_DEFINE([FEEDBACK_EAGLE], [1], [EAGLE stellar feedback and evolution model])
;;
none)
AC_DEFINE([FEEDBACK_NONE], [1], [No feedback])
;;
*)
......@@ -1765,10 +1768,39 @@ case "$with_feedback" in
;;
esac
# Black hole model.
AC_ARG_WITH([black-holes],
[AS_HELP_STRING([--with-black-holes=<model>],
[Black holes model to use @<:@none, default: none@:>@]
)],
[with_black_holes="$withval"],
[with_black_holes="none"]
)
if test "$with_subgrid" != "none"; then
if test "$with_black_holes" != "none"; then
AC_MSG_ERROR([Cannot provide with-subgrid and with-black-holes together])
else
with_black_holes="$with_subgrid_black_holes"
fi
fi
case "$with_black_holes" in
none)
AC_DEFINE([BLACK_HOLES_NONE], [1], [No black hole model])
;;
EAGLE)
AC_DEFINE([BLACK_HOLES_EAGLE], [1], [EAGLE black hole model])
;;
*)
AC_MSG_ERROR([Unknown black-hole model: $with_black_holes])
;;
esac
# External potential
AC_ARG_WITH([ext-potential],
[AS_HELP_STRING([--with-ext-potential=<pot>],
[external potential @<:@none, point-mass, point-mass-ring, point-mass-softened, isothermal, softened-isothermal, nfw, hernquist, disc-patch, sine-wave, default: none@:>@]
[external potential @<:@none, point-mass, point-mass-ring, point-mass-softened, isothermal, nfw, hernquist, disc-patch, sine-wave, default: none@:>@]
)],
[with_potential="$withval"],
[with_potential="none"]
......@@ -1886,6 +1918,9 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$ac_cv_path_ac_pt_DX_DOXYGEN" != ""])
# Check if using EAGLE cooling
AM_CONDITIONAL([HAVEEAGLECOOLING], [test $with_cooling = "EAGLE"])
# Check if using EAGLE feedback
AM_CONDITIONAL([HAVEEAGLEFEEDBACK], [test $with_feedback = "EAGLE"])
# Handle .in files.
AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile examples/Cooling/CoolingRates/Makefile doc/Makefile doc/Doxyfile tests/Makefile])
AC_CONFIG_FILES([argparse/Makefile tools/Makefile])
......@@ -1962,7 +1997,8 @@ AC_MSG_RESULT([
Tracers : $with_tracers
Stellar model : $with_stars
Star formation model : $with_star_formation
Feedback model : $with_feedback
Star feedback model : $with_feedback
Black holes model : $with_black_holes
Individual timers : $enable_timers
Task debugging : $enable_task_debugging
......
......@@ -763,7 +763,6 @@ INPUT = @top_srcdir@ @top_srcdir@/src @top_srcdir@/tests @top_
INPUT += @top_srcdir@/src/hydro/Minimal
INPUT += @top_srcdir@/src/hydro/Gadget2
INPUT += @top_srcdir@/src/gravity/Default
INPUT += @top_srcdir@/src/stars/Default
INPUT += @top_srcdir@/src/riemann
INPUT += @top_srcdir@/src/potential/point_mass
INPUT += @top_srcdir@/src/equation_of_state/ideal_gas
......@@ -776,6 +775,8 @@ INPUT += @top_srcdir@/src/entropy_floor/EAGLE
INPUT += @top_srcdir@/src/star_formation/EAGLE
INPUT += @top_srcdir@/src/tracers/EAGLE
INPUT += @top_srcdir@/src/stars/EAGLE
INPUT += @top_srcdir@/src/feedback/EAGLE
INPUT += @top_srcdir@/src/black_holes/EAGLE
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
......@@ -810,7 +811,7 @@ RECURSIVE = NO
# Note that relative paths are relative to the directory from which doxygen is
# run.
EXCLUDE =
EXCLUDE = @top_srcdir@/src/cooling/EAGLE/newton_cooling.c
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
......
......@@ -30,6 +30,7 @@ can be found by typing ``./swift -h``::
-M, --multipole-reconstruction Reconstruct the multipoles every time-step.
-s, --hydro Run with hydrodynamics.
-S, --stars Run with stars.
-B, --black-holes Run with black holes.
-x, --velociraptor Run with structure finding.
--limiter Run with time-step limiter.
......
......@@ -656,6 +656,17 @@ which stops these from being done at the scale of the leaf cells, of which
there can be a large number. In this case cells with gravity tasks must be at
least 4 levels above the leaf cells (when possible).
To control the depth at which the ghost tasks are placed, there are
two parameters (one for the gas, one for the stars). These specify the
maximum number of particles allowed in such a task before splitting
into finer ones. These parameters are:
.. code:: YAML
engine_max_parts_per_ghost: 1000
engine_max_sparts_per_ghost: 1000
Extra space is required when particles are created in the system (to the time
of the next rebuild). These are controlled by:
......
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Created with matplotlib (https://matplotlib.org/) -->
<svg height="226.8pt" version="1.1" viewBox="0 0 226.8 226.8" width="226.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Created with matplotlib (http://matplotlib.org/) -->
<svg height="226pt" version="1.1" viewBox="0 0 226 226" width="226pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<style type="text/css">
*{stroke-linecap:butt;stroke-linejoin:round;}
......@@ -35,14 +35,14 @@ L 250.907152 -156.365649
L 250.907152 -156.365649
L 77.714425 -156.365649
z
" id="m5eebb27285" style="stroke:#e6e6e6;"/>
" id="m97efab0c60" style="stroke:#e6e6e6;"/>
</defs>
<g clip-path="url(#pf19aa30d2c)">
<use style="fill:#e6e6e6;stroke:#e6e6e6;" x="0" xlink:href="#m5eebb27285" y="226.8"/>
<g clip-path="url(#p5e3fe66b1e)">
<use style="fill:#e6e6e6;stroke:#e6e6e6;" x="0" xlink:href="#m97efab0c60" y="226.8"/>
</g>
</g>
<g id="PolyCollection_2">
<path clip-path="url(#pf19aa30d2c)" d="M 146.991516 49022.756825
<path clip-path="url(#p5e3fe66b1e)" d="M 146.991516 49022.756825
L 146.991516 85.113175
L 250.907152 -12.410825
L 250.907152 49022.756825
......@@ -63,15 +63,15 @@ C -0.894634 -0.51958 -1 -0.265203 -1 0
C -1 0.265203 -0.894634 0.51958 -0.707107 0.707107
C -0.51958 0.894634 -0.265203 1 0 1
z
" id="mbe6c555b8c" style="stroke:#000000;"/>
" id="me4af860824" style="stroke:#000000;"/>
</defs>
<g clip-path="url(#pf19aa30d2c)">
<use style="stroke:#000000;" x="77.714425" xlink:href="#mbe6c555b8c" y="70.434351"/>
<g clip-path="url(#p5e3fe66b1e)">
<use style="stroke:#000000;" x="77.714425" xlink:href="#me4af860824" y="70.434351"/>
</g>
</g>
<g id="PathCollection_2">
<g clip-path="url(#pf19aa30d2c)">
<use style="stroke:#000000;" x="146.991516" xlink:href="#mbe6c555b8c" y="85.113175"/>
<g clip-path="url(#p5e3fe66b1e)">
<use style="stroke:#000000;" x="146.991516" xlink:href="#me4af860824" y="85.113175"/>
</g>
</g>
<g id="matplotlib.axis_1">
......@@ -80,10 +80,10 @@ z
<defs>
<path d="M 0 0
L 0 3.5
" id="m9a9665ec89" style="stroke:#000000;stroke-width:0.8;"/>
" id="m680b56acf8" style="stroke:#000000;stroke-width:0.8;"/>
</defs>
<g>
<use style="stroke:#000000;stroke-width:0.8;" x="60.395152" xlink:href="#m9a9665ec89" y="197.316"/>
<use style="stroke:#000000;stroke-width:0.8;" x="60.395152" xlink:href="#m680b56acf8" y="197.316"/>
</g>
</g>
<g id="text_1">
......@@ -108,7 +108,7 @@ Q 22 4.90625 22 7.90625
L 22 59.703125
Q 16.796875 57.09375 8.90625 57.09375
z
" id="CMUSerif-Roman-49"/>
" id="CMUSerif-Roman-31"/>
<path d="M 3.90625 32
Q 3.90625 46.703125 7.59375 54.703125
Q 12.796875 66.59375 25 66.59375
......@@ -138,13 +138,13 @@ Q 16.796875 61.40625 15.25 58.59375
Q 13.703125 55.796875 13 51.59375
Q 12.203125 46.203125 12.203125 33.203125
z
" id="CMUSerif-Roman-48"/>
" id="CMUSerif-Roman-30"/>
<path d="M 1 18.59375
L 1 24.5
L 27.59375 24.5
L 27.59375 18.59375
z
" id="CMUSerif-Roman-45"/>
" id="CMUSerif-Roman-2d"/>
<path d="M 4.203125 31.59375
Q 4.203125 47.296875 12.203125 56.9375
Q 20.203125 66.59375 30.5 66.59375
......@@ -186,20 +186,20 @@ Q 21.40625 40.40625 18.5 37.5
Q 15.59375 34.59375 14.5 30.75
Q 13.40625 26.90625 13.40625 22.59375
z
" id="CMUSerif-Roman-54"/>
" id="CMUSerif-Roman-36"/>
</defs>
<g transform="translate(52.295152 211.256625)scale(0.1 -0.1)">
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-49"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-45"/>
<use transform="translate(124.064102 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-54"/>
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-31"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-30"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-2d"/>
<use transform="translate(124.064102 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-36"/>
</g>
</g>
</g>
<g id="xtick_2">
<g id="line2d_2">
<g>
<use style="stroke:#000000;stroke-width:0.8;" x="95.033698" xlink:href="#m9a9665ec89" y="197.316"/>
<use style="stroke:#000000;stroke-width:0.8;" x="95.033698" xlink:href="#m680b56acf8" y="197.316"/>
</g>
</g>
<g id="text_2">
......@@ -232,20 +232,20 @@ M 5.59375 19.59375
L 30 19.59375
L 30 56.90625
z
" id="CMUSerif-Roman-52"/>
" id="CMUSerif-Roman-34"/>
</defs>
<g transform="translate(86.933698 211.256625)scale(0.1 -0.1)">
<use transform="translate(0 0.442188)" xlink:href="#CMUSerif-Roman-49"/>
<use transform="translate(49.999985 0.442188)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(100.75411 30.607813)scale(0.7)" xlink:href="#CMUSerif-Roman-45"/>
<use transform="translate(124.064102 30.607813)scale(0.7)" xlink:href="#CMUSerif-Roman-52"/>
<use transform="translate(0 0.442188)" xlink:href="#CMUSerif-Roman-31"/>
<use transform="translate(49.999985 0.442188)" xlink:href="#CMUSerif-Roman-30"/>
<use transform="translate(100.75411 30.607813)scale(0.7)" xlink:href="#CMUSerif-Roman-2d"/>
<use transform="translate(124.064102 30.607813)scale(0.7)" xlink:href="#CMUSerif-Roman-34"/>
</g>
</g>
</g>
<g id="xtick_3">
<g id="line2d_3">
<g>
<use style="stroke:#000000;stroke-width:0.8;" x="129.672243" xlink:href="#m9a9665ec89" y="197.316"/>
<use style="stroke:#000000;stroke-width:0.8;" x="129.672243" xlink:href="#m680b56acf8" y="197.316"/>
</g>
</g>
<g id="text_3">
......@@ -284,43 +284,43 @@ Q 41.203125 9.90625 42.40625 17.40625
L 44.90625 17.40625
L 42.09375 0
z
" id="CMUSerif-Roman-50"/>
" id="CMUSerif-Roman-32"/>
</defs>
<g transform="translate(121.572243 211.256625)scale(0.1 -0.1)">
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-49"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-45"/>
<use transform="translate(124.064102 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-50"/>
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-31"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-30"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-2d"/>
<use transform="translate(124.064102 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-32"/>
</g>
</g>
</g>
<g id="xtick_4">
<g id="line2d_4">
<g>
<use style="stroke:#000000;stroke-width:0.8;" x="164.310789" xlink:href="#m9a9665ec89" y="197.316"/>
<use style="stroke:#000000;stroke-width:0.8;" x="164.310789" xlink:href="#m680b56acf8" y="197.316"/>
</g>
</g>
<g id="text_4">
<!-- $\mathdefault{10^{0}}$ -->
<g transform="translate(157.410789 211.256625)scale(0.1 -0.1)">
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-49"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-31"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-30"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-30"/>
</g>
</g>
</g>
<g id="xtick_5">
<g id="line2d_5">
<g>
<use style="stroke:#000000;stroke-width:0.8;" x="198.949334" xlink:href="#m9a9665ec89" y="197.316"/>
<use style="stroke:#000000;stroke-width:0.8;" x="198.949334" xlink:href="#m680b56acf8" y="197.316"/>
</g>
</g>
<g id="text_5">
<!-- $\mathdefault{10^{2}}$ -->
<g transform="translate(192.049334 211.256625)scale(0.1 -0.1)">
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-49"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-50"/>
<use transform="translate(0 0.21875)" xlink:href="#CMUSerif-Roman-31"/>
<use transform="translate(49.999985 0.21875)" xlink:href="#CMUSerif-Roman-30"/>
<use transform="translate(100.75411 30.384375)scale(0.7)" xlink:href="#CMUSerif-Roman-32"/>
</g>
</g>
</g>
......@@ -377,7 +377,7 @@ L 32.796875 0
Q 29.296875 0.296875 18 0.296875
Q 6.796875 0.296875 3.296875 0
z
" id="CMUSerif-Roman-72"/>
" id="CMUSerif-Roman-48"/>
<path d="M 1.90625 -12.40625
Q 1.90625 -10.296875 3.15625 -9.1875
Q 4.40625 -8.09375 6.09375 -8.09375
......@@ -412,7 +412,7 @@ Q 19.09375 -20.5 11.09375 -20.5
Q 7.296875 -20.5 4.59375 -18.140625
Q 1.90625 -15.796875 1.90625 -12.40625
z
" id="CMUSerif-Roman-121"/>
" id="CMUSerif-Roman-79"/>
<path d="M 3.40625 21.5
Q 3.40625 31 10.046875 37.59375
Q 16.703125 44.203125 25.703125 44.203125
......@@ -443,7 +443,7 @@ Q 32.796875 42 26.09375 42
Q 19.09375 42 14.796875 35.59375
Q 11.703125 30.796875 11.703125 21.40625
z
" id="CMUSerif-Roman-100"/>
" id="CMUSerif-Roman-64"/>
<path d="M 2.796875 0
L 2.796875 3.09375
Q 8.09375 3.09375 9.34375 3.75
......@@ -478,7 +478,7 @@ Q 13 0.296875 11.09375 0.25
Q 9.203125 0.203125 6.703125 0.09375
Q 4.203125 0 2.796875 0
z
" id="CMUSerif-Roman-114"/>
" id="CMUSerif-Roman-72"/>
<path d="M 16 -1.09375
Q 2.796875 11.90625 2.796875 21.40625
Q 2.796875 30.90625 9.25 37.84375
......@@ -501,7 +501,7 @@ Q 21.703125 42.59375 18.546875 40.890625
Q 15.40625 39.203125 13.5 35.90625
Q 11.09375 31.5 11.09375 22.203125
z
" id="CMUSerif-Roman-111"/>
" id="CMUSerif-Roman-6f"/>
<path d="M 2.796875 -7.90625
Q 2.796875 -4.703125 5.25 -1.890625
Q 7.703125 0.90625 12 2.09375
......@@ -559,7 +559,7 @@ Q 30.90625 41.90625 22.203125 41.90625
Q 17.796875 41.90625 15.09375 37.90625
Q 13.5 35.203125 13.5 29.5
z
" id="CMUSerif-Roman-103"/>
" id="CMUSerif-Roman-67"/>
<path d="M 2.796875 22
Q 2.796875 31.40625 8.84375 38.09375
Q 14.90625 44.796875 23.59375 44.796875
......@@ -594,7 +594,7 @@ Q 18.5 41.203125 16.390625 39.546875
Q 14.296875 37.90625 12.84375 34.15625
Q 11.40625 30.40625 11.203125 25.203125
z
" id="CMUSerif-Roman-101"/>
" id="CMUSerif-Roman-65"/>
<path d="M 3.203125 0
L 3.203125 3.09375
Q 8.5 3.09375 9.75 3.75
......@@ -630,8 +630,8 @@ L 25.703125 0
Q 15.5 0.296875 14.5 0.296875
Q 13.703125 0.296875 3.203125 0
z
" id="CMUSerif-Roman-110"/>
<path id="CMUSerif-Roman-32"/>
" id="CMUSerif-Roman-6e"/>
<path id="CMUSerif-Roman-20"/>
<path d="M 3.203125 40
L 3.203125 43.09375
L 17.90625 44.203125
......@@ -663,7 +663,7 @@ L 11 30.796875
Q 11 37.59375 10 38.796875
Q 9 40 3.203125 40
z
" id="CMUSerif-Roman-117"/>
" id="CMUSerif-Roman-75"/>
<path d="M 3.203125 0
L 3.203125 3.09375
Q 8.5 3.09375 9.75 3.75
......@@ -716,7 +716,7 @@ L 25.703125 0
Q 15.5 0.296875 14.5 0.296875
Q 13.703125 0.296875 3.203125 0
z
" id="CMUSerif-Roman-109"/>
" id="CMUSerif-Roman-6d"/>
<path d="M 2.796875 65.203125
L 2.796875 68.296875
L 17.203125 69.40625
......@@ -743,7 +743,7 @@ Q 36.90625 42 30.40625 42
Q 23.09375 42 18.59375 35.59375
Q 17.5 34 17.5 32
z
" id="CMUSerif-Roman-98"/>
" id="CMUSerif-Roman-62"/>
<path d="M 3.296875 1.296875
L 3.296875 14.5
Q 3.296875 15.59375 3.34375 16
......@@ -792,7 +792,7 @@ Q 4.90625 -1.09375 4.40625 -1.09375
Q 3.59375 -1.09375 3.4375 -0.59375
Q 3.296875 -0.09375 3.296875 1.296875
z
" id="CMUSerif-Roman-115"/>
" id="CMUSerif-Roman-73"/>
<path d="M 3.296875 0
L 3.296875 3.09375
Q 8.59375 3.09375 9.84375 3.75
......@@ -819,7 +819,7 @@ Q 15 56.296875 12.796875 56.296875
Q 10.5 56.296875 9 57.890625
Q 7.5 59.5 7.5 61.59375
z
" id="CMUSerif-Roman-105"/>
" id="CMUSerif-Roman-69"/>
<path d="M 1.90625 40
L 1.90625 42.203125
Q 6.5 42.40625 9.546875 45.65625
......@@ -845,7 +845,7 @@ Q 13.296875 2.203125 11.84375 5.140625
Q 10.40625 8.09375 10.40625 12.40625
L 10.40625 40
z
" id="CMUSerif-Roman-116"/>
" id="CMUSerif-Roman-74"/>
<path d="M 7.71875 1.703125
Q 7.71875 2.296875 7.8125 2.59375
L 15.28125 32.421875
......@@ -898,7 +898,7 @@ Q 12.15625 -1.125 10.6875 -1.125
Q 9.46875 -1.125 8.59375 -0.34375
Q 7.71875 0.4375 7.71875 1.703125
z
" id="Cmmi10-110"/>
" id="Cmmi10-6e"/>
<path d="M 3.078125 0
L 3.078125 3.515625
Q 13.375 3.515625 13.375 6.6875
......@@ -928,7 +928,7 @@ L 22.703125 6.6875
Q 22.703125 3.515625 33.015625 3.515625
L 33.015625 0
z
" id="Cmr10-72"/>
" id="Cmr10-48"/>
<path d="M 10.40625 -25
L 10.40625 75
L 25.5 75
......@@ -938,7 +938,7 @@ L 17.09375 -22.703125
L 25.5 -22.703125
L 25.5 -25
z
" id="CMUSerif-Roman-91"/>
" id="CMUSerif-Roman-5b"/>
<path d="M 16.09375 -1.09375
Q 3.40625 12.09375 3.40625 21.59375
Q 3.40625 31.09375 9.65625 37.9375
......@@ -969,7 +969,7 @@ Q 34.796875 1.40625 31.75 0.15625
Q 28.703125 -1.09375 24.90625 -1.09375
Q 16.09375 -1.09375 3.40625 12.09375
z
" id="CMUSerif-Roman-99"/>
" id="CMUSerif-Roman-63"/>
<path d="M 10.203125 23
Q 9.375 23 8.828125 23.625
Q 8.296875 24.265625 8.296875 25
......@@ -981,7 +981,7 @@ Q 69.390625 25.734375 69.390625 25
Q 69.390625 24.265625 68.875 23.625
Q 68.359375 23 67.578125 23
z
" id="Cmsy10-161"/>
" id="Cmsy10-a1"/>
<path d="M 9.515625 7.71875
Q 11.859375 4.296875 15.8125 2.640625
Q 19.78125 0.984375 24.3125 0.984375
......@@ -1038,7 +1038,7 @@ Q 15.828125 15.046875 15.828125 13.484375
Q 15.828125 11.03125 14.109375 9.375
Q 12.40625 7.71875 10.015625 7.71875
z
" id="Cmr10-51"/>
" id="Cmr10-33"/>
<path d="M 2.09375 -22.703125
L 10.5 -22.703125
L 10.5 72.703125
......@@ -1048,42 +1048,42 @@ L 17.203125 75
L 17.203125 -25
L 2.09375 -25
z
" id="CMUSerif-Roman-93"/>
" id="CMUSerif-Roman-5d"/>
</defs>
<g transform="translate(48.976 221.69725)scale(0.1 -0.1)">
<use transform="translate(0 0.109375)" xlink:href="#CMUSerif-Roman-72"/>
<use transform="translate(74.999985 0.109375)" xlink:href="#CMUSerif-Roman-121"/>
<use transform="translate(127.699982 0.109375)" xlink:href="#CMUSerif-Roman-100"/>
<use transform="translate(183.199966 0.109375)" xlink:href="#CMUSerif-Roman-114"/>
<use transform="translate(222.299957 0.109375)" xlink:href="#CMUSerif-Roman-111"/>
<use transform="translate(272.299942 0.109375)" xlink:href="#CMUSerif-Roman-103"/>
<use transform="translate(322.299927 0.109375)" xlink:href="#CMUSerif-Roman-101"/>
<use transform="translate(366.699921 0.109375)" xlink:href="#CMUSerif-Roman-110"/>
<use transform="translate(422.199905 0.109375)" xlink:href="#CMUSerif-Roman-32"/>
<use transform="translate(455.499893 0.109375)" xlink:href="#CMUSerif-Roman-110"/>
<use transform="translate(510.999878 0.109375)" xlink:href="#CMUSerif-Roman-117"/>
<use transform="translate(566.499863 0.109375)" xlink:href="#CMUSerif-Roman-109"/>
<use transform="translate(649.79985 0.109375)" xlink:href="#CMUSerif-Roman-98"/>
<use transform="translate(705.299835 0.109375)" xlink:href="#CMUSerif-Roman-101"/>
<use transform="translate(749.699829 0.109375)" xlink:href="#CMUSerif-Roman-114"/>
<use transform="translate(788.79982 0.109375)" xlink:href="#CMUSerif-Roman-32"/>
<use transform="translate(822.099808 0.109375)" xlink:href="#CMUSerif-Roman-100"/>
<use transform="translate(877.599792 0.109375)" xlink:href="#CMUSerif-Roman-101"/>
<use transform="translate(921.999786 0.109375)" xlink:href="#CMUSerif-Roman-110"/>
<use transform="translate(977.499771 0.109375)" xlink:href="#CMUSerif-Roman-115"/>
<use transform="translate(1016.899765 0.109375)" xlink:href="#CMUSerif-Roman-105"/>
<use transform="translate(1044.599762 0.109375)" xlink:href="#CMUSerif-Roman-116"/>
<use transform="translate(1083.39975 0.109375)" xlink:href="#CMUSerif-Roman-121"/>
<use transform="translate(1136.099747 0.109375)" xlink:href="#CMUSerif-Roman-32"/>
<use transform="translate(1169.399734 0.109375)" xlink:href="#Cmmi10-110"/>
<use transform="translate(1229.4095 -16.896875)scale(0.7)" xlink:href="#Cmr10-72"/>
<use transform="translate(1288.286844 0.109375)" xlink:href="#CMUSerif-Roman-32"/>
<use transform="translate(1321.586832 0.109375)" xlink:href="#CMUSerif-Roman-91"/>
<use transform="translate(1349.386819 0.109375)" xlink:href="#CMUSerif-Roman-99"/>
<use transform="translate(1393.786813 0.109375)" xlink:href="#CMUSerif-Roman-109"/>
<use transform="translate(1481.550942 38.373438)scale(0.7)" xlink:href="#Cmsy10-161"/>
<use transform="translate(1535.930825 38.373438)scale(0.7)" xlink:href="#Cmr10-51"/>
<use transform="translate(1577.308168 0.109375)" xlink:href="#CMUSerif-Roman-93"/>
<use transform="translate(0 0.109375)" xlink:href="#CMUSerif-Roman-48"/>
<use transform="translate(74.999985 0.109375)" xlink:href="#CMUSerif-Roman-79"/>