diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84995050..67f49259 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,19 +11,19 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "macos-10.15"] + os: ["ubuntu-latest", "macos-latest"] compiler: [gcc-10, clang] python-version: - - "3.6" - - "3.7" - "3.8" - "3.9" - "3.10" + - "3.11" + - "3.12" exclude: # Mac OS builds run with clang only - - os: "macos-10.15" + - os: "macos-latest" compiler: gcc-10 # Ubuntu builds run with gcc only @@ -42,11 +42,13 @@ jobs: with: python-version: ${{ matrix.python-version }} + # compile-time dependency versions reflect those in setup.py - name: Install Dependencies shell: bash run: | python -m pip install --upgrade pip - python -m pip install cython>=0.29.21 + python -m pip install setuptools>=18.0 + python -m pip install Cython>=3.0 - name: Display Environment Variables shell: bash @@ -63,7 +65,7 @@ jobs: shell: bash run: | make CC=$COMPILER - python setup.py build install --quiet + python -m pip install . -v make clean - name: Tests diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index d86c4a91..246c5ddb 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -1,43 +1,59 @@ -# This workflow creates a source distribution intended for uploading to PyPI -# and uploads it to GitHub actions as an artifact, where it then gets -# re-downloaded and combined with other wheels created by the wheels.yml -# workflow. +# This workflow creates a source distribution intended for uploading to PyPI, +# uploading the .tar.gz file to GitHub actions as an artifact. We upload the +# source distribution to PyPI manually. In previous versions of VICE, we +# pre-compiled the code and provided the binaries, but we have scaled this down +# for reasons described in the comments in the wheels.yml workflow file. +# Previously, the wheels.yml workflow would download this source distribution +# and combine it with the wheels created by bdist_linux.yml and bdist_macos.yml. name: Source Distribution +# only when specifically requested on: - workflow_call: - inputs: - os: - description: The OS to use for creating the source distribution - required: true - type: string - python-version: - description: The version of python for creating the source distribution - required: true - type: string + workflow_dispatch: + ### previous inputs from wheels.yml, which would call this workflow ### + # workflow_call: + # inputs: + # os: + # description: The OS to use for creating the source distribution + # required: true + # type: string + # python-version: + # description: The version of python for creating the source distribution + # required: true + # type: string jobs: sdist: name: Source Distribution - runs-on: ${{ inputs.os }} - env: - COMPILER: gcc + runs-on: ubuntu-latest + ### previous inputs from wheels.yml, which would call this workflow ### + # runs-on: ${{ inputs.os }} + # env: + # COMPILER: gcc steps: - name: Checkout Repository uses: actions/checkout@v2 - - name: Setup Python ${{ inputs.python-version }} + ### previous inputs from wheels.yml, which would call this workflow ### + # - name: Setup Python ${{ inputs.python-version }} + # uses: actions/setup-python@v2 + # with: + # python-version: ${{ inputs.python-version }} + + - name: Setup Python 3.12 uses: actions/setup-python@v2 with: - python-version: ${{ inputs.python-version }} + python-version: "3.12" - name: Install Dependencies shell: bash run: | python -m pip install --upgrade pip - python -m pip install Cython>=0.29.21 + python -m pip install build + python -m pip install setuptools>=18.0 + python -m pip install Cython>=3.0 python -m pip install wheel>=0.33.0 - name: Display Environment Variables @@ -54,9 +70,7 @@ jobs: - name: Create Source Distribution shell: bash run: | - make - python setup.py sdist - make clean + python -m build --sdist - name: Upload Source Distribution uses: actions/upload-artifact@v2 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 83b8bf1c..2a3e7c61 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,3 +1,20 @@ +# This workflow is designed to pre-compile VICE for distribution across all +# versions of python supported by the code base. In the current version, +# however, we simply provide a source distribution will be compiled on each +# user's system. Previous versions had provided pre-compiled binaries, and the +# workflow code which produced those wheels is preserved here. The comments +# from the top of this workflow from this previous distribution strategy are +# copied below. As such, this workflow is generally not invoked; instead we +# dispatch the sdist.yml workflow to create the source distribution. +# +# We elect to provide only a source distribution because, with the limited +# architecture available through GitHub actions for Mac OS, it is likely that +# many end user's of VICE will have to compile in place anyway. This will only +# become more the case in the near future when users will compile it to enable +# multithreading, which will require an in-place compilation. +# +# Previous Notes on Distribution Strategy: +# ---------------------------------------- # This workflow pre-compiles VICE for distribution across all versions of # python supported by the code base. Requiring a 64-bit system architecture, # we pre-compile for x86_64 hardware on both Mac OS and Linux. As of yet, @@ -9,7 +26,7 @@ # # At present, GitHub actions does not support a build matrix for jobs that # call a reusable workflow, so the Mac OS and manylinux jobs here implement -# the workaround from the following URL: +# the workaround from the following URL: # # https://github.community/t/reusable-workflow-with-strategy-matrix/205676/8 diff --git a/changelog.rst.txt b/changelog.rst.txt index 25236f96..820d5e04 100644 --- a/changelog.rst.txt +++ b/changelog.rst.txt @@ -1,4 +1,29 @@ +1.3.1 +===== +- ``vice.multizone`` + Enforces each zone to run in the same mode (related to the handling of + inflow metallicites; see below). + +- ``vice.singlezone`` and ``vice.multizone`` + - Handles non-zero inflow metallicities in a more stable way. Unit tests + search for numerical artifacts in "sudden event" evolutionary histories + exhibiting bursts in star formation. + + - Includes primordial metallicity component in the reported total abundance + in accreting gas at each timestep. + +- ``vice.dataframe`` + Fixed issues with inheritance structure affecting recent versions of + python (3.11 and 3.12) + +- ``vice.yields.ccsne.fractional`` + - Subtracts the remnant mass from the initial mass in computing net yields + from the tables containing gross yields. A small correction for metals, + the difference is significant for helium. + +- Fixed callback objects to be compatible with Cython>=3.0. + 1.3.0 ===== - ``vice.mlr`` diff --git a/docs/src/cover.tex b/docs/src/cover.tex index a9d09f31..146d8ded 100644 --- a/docs/src/cover.tex +++ b/docs/src/cover.tex @@ -6,5 +6,5 @@ \end{figure} \underline{\LARGE \textbf{Versatile Integrator for Chemical Evolution}} \par -{\Large \textbf{Version 1.3.0}} +{\Large \textbf{Version 1.3.1}} \end{center} diff --git a/docs/src/developers/contributors.rst b/docs/src/developers/contributors.rst index 923d269a..3aeb5598 100644 --- a/docs/src/developers/contributors.rst +++ b/docs/src/developers/contributors.rst @@ -7,51 +7,58 @@ Contributors James W. Johnson ---------------- | **Lead Developer** and **License Owner** (Spring 2018 - Present) -| Email: giganano9@gmail.com johnson.7419@buckeyemail.osu.edu -| Webiste: https://sites.google.com/view/jameswjohnson/ +| Email: jjohnson10@carnegiescience.edu giganano9@gmail.com +| Webiste: https://jamesjohnson.space +| The Observatories of the Carnegie Institution for Science +| 813 Santa Barbara St., Pasadena, CA, 91101, USA + +Liam Dubay +---------- +| **Contributing Developer** (Fall 2021 - Present) +| Email: dubay.11@buckeyemail.osu.edu +| Website: https://www.liamdubay.com/ | The Ohio State University Department of Astronomy -| 140 W. 18th Ave., Columbus, OH, 43204 +| 140 W. 18th Ave., Columbus, OH, 43204, USA Emily J. Griffith ----------------- | **Contributing Developer** (Summer 2020 - Present) -| Email: griffith.802@buckeyemail.osu.edu +| Email: Emily.Griffith-1@colorado.edu | Website: https://www.emilyjgriffith.com -| The Ohio State University Department of Astronomy -| 140 W. 18th Ave., Columbus, OH, 43204 +| University of Colorado Boulder Department of Astrophysical and Planetary Sciences +| 389 UCB, Boulder, CO, 80309, USA -John W. Bredall ---------------- -| **Contributing Developer** (Fall 2021 - Present) -| Email: bredall.1@buckeyemail.osu.edu -| Website: https://u.osu.edu/jbredall/ +Ari Bredall +----------- +| **Contributing Developer** (Fall 2021 - Summer 2023) +| Website: https://abredall.github.io/ | The Ohio State University Department of Astronomy -| 140 W. 18th Ave., Columbus, OH, 43204 +| 140 W. 18th Ave., Columbus, OH, 43204, USA David H. Weinberg ----------------- -| **Advising Developer** (Spring 2018 - Present) +| **Advising Developer** (Spring 2018 - Summer 2023) | Website: http://www.astronomy.ohio-state.edu/~dhw/ | The Ohio State University Department of Astronomy -| 140 W. 18th Ave., Columbus, OH, 43204 +| 140 W. 18th Ave., Columbus, OH, 43204, USA -Fiorenzo Vincenzo ------------------ -| **Advising Developer** (Spring 2019 - Present) -| Website: https://ccapp.osu.edu/people/vincenzo.3 -| The Ohio State University Center for Cosmology and Astroparticle Physics -| 191 West Woodruff Ave., Columbus, OH, 43210 +Jennifer A. Johnson +------------------- +| **Advising Developer** (Summer 2020 - Summer 2023) +| Website: http://www.astronomy.ohio-state.edu/~jaj/ +| The Ohio State University Department of Astronomy +| 140 W. 18th Ave., Columbus, OH, 43204, USA Jonathan C. Bird ---------------- -| **Advising Developer** (Spring 2019 - Present) +| **Advising Developer** (Spring 2019 - Spring 2022) | Website: http://vpac00.phy.vanderbilt.edu/~birdjc1/ | Vanderbilt University Department of Physics & Astronomy -| 6301 Stevenson Center, 2301 Vanderbilt Place, Nasvhille, TN 37235 +| 6301 Stevenson Center, 2301 Vanderbilt Place, Nasvhille, TN 37235, USA -Jennifer A. Johnson -------------------- -| **Advising Developer** (Summer 2020 - Present) -| Website: http://www.astronomy.ohio-state.edu/~jaj/ -| The Ohio State University Department of Astronomy -| 140 W. 18th Ave., Columbus, OH, 43204 +Fiorenzo Vincenzo +----------------- +| **Advising Developer** (Spring 2019 - Summer 2021) +| Website: https://www.hull.ac.uk/staff-directory/fiorenzo-vincenzo +| E.A. Milne Centre for Astrophysics, University of Hull +| Cottingham Road, Kingston upon Hull, HU6 7RX, United Kingdom diff --git a/docs/src/index.rst b/docs/src/index.rst index aba84eee..88b7b0ca 100644 --- a/docs/src/index.rst +++ b/docs/src/index.rst @@ -3,7 +3,7 @@ VICE: Versatile Integrator for Chemical Evolution ================================================= Welcome! -This is the documentation for **VICE version 1.3.0**. +This is the documentation for **VICE version 1.3.1**. First time users should familiarize themselves with VICE's API by going through our `tutorial`__, which can be launched automatically by running ``python -m vice --tutorial`` from a Unix terminal after diff --git a/docs/src/install.rst b/docs/src/install.rst index 7af696de..61c50b0d 100644 --- a/docs/src/install.rst +++ b/docs/src/install.rst @@ -23,7 +23,6 @@ do not want to use the binary using the ``--no-binary`` flag: $ python -m pip install vice [--user] --no-binary :all: - The option ``:all:`` above tells ``pip`` to install all of the packages in the current call to ``pip install`` without binaries; when installing multiple packages, this value can be specified as a comma-separated list. @@ -46,21 +45,25 @@ specifying the version number: $ python -m pip install vice== [...] +.. _windows_note: + Designed for systems with a Unix kernel, VICE does not function within a windows environment. Windows users should therefore install VICE within the `Windows Subsystem for Linux (WSL)`__. -Provided that the call to ``pip`` is ran from within WSL, the pre-compiled -binary installer from PyPI_ should install VICE properly. +We emphasize that the Anaconda prompt provided for Windows is **not** a true +Unix kernel, and therefore will fail to install and run VICE properly. +As long as the call to ``pip`` is ran from within WSL, the proper pre-compiled +binary for Linux systems provided on PyPI_ should install successfully. A `manual installation`__ on a windows machine must also be ran within -WSL. +WSL and cannot be conducted with the Anaconda prompt. __ WSL_ __ `Manual Installation`_ .. _WSL: https://docs.microsoft.com/en-us/windows/wsl/install-win10 For the current version, we provide pre-compiled binaries for Python_ versions -3.6-3.10 on computers with an x86_64 CPU architecture running Mac OS and Linux +3.7-3.10 on computers with an x86_64 CPU architecture running Mac OS and Linux operating systems. We do not provide pre-compiled binaries for CPU architectures other than x86_64. This includes Linux computers with Aarch64 hardware as well as the new ARM64 @@ -159,13 +162,13 @@ While VICE does not have any primary run-time dependencies, there are a few common compile-time dependencies that must be satisfied to install from source. They are as follows: -1. Python_ >= 3.6 +1. Python_ >= 3.7 2. setuptools_ >= 18.0 3. Make_ >= 3.81 -4. gcc_ >= 4.6 or clang_ >= 3.6.0 +4. gcc_ >= 4.6 or clang_ >= 3.6 On Mac OS X and Linux architectures, it is likely that Make_ and one of gcc_ or clang_ come pre-installed. Users may install with alternative C compilers @@ -323,11 +326,15 @@ __ issues_ Running the setup.py File Failed -------------------------------- -`Did you run it for multiple versions of python simultaneously?`__ -Alternatively, -`did you run a parallelized installation using the gcc C compiler?`__ -If neither is the case, please open an issue `here`__. +`Did you attempt your installation on Windows without using WSL?`__ +If not, `did you attempt the installation for multiple versions of python +simultaneously?`__ +Alternatively, `did you run a parallelized installation using the gcc C +compiler?`__ +If none of these solutions apply to your case, please open an issue `here`__. + +__ windows_note_ __ gcc_parallel_note_ __ simultaneous_note_ __ issues_ diff --git a/docs/src/science_documentation/yields/agb.rst b/docs/src/science_documentation/yields/agb.rst index 516d539f..5c8eb1ea 100644 --- a/docs/src/science_documentation/yields/agb.rst +++ b/docs/src/science_documentation/yields/agb.rst @@ -52,10 +52,10 @@ some characteristic mass in order to suppress these numerical artifacts. In this version of VICE, users can choose between the following nucleosynthesis studies: - - Cristallo et al. (2011, 2015) [7]_ [8]_ - - Karakas (2010) [9]_ - - Ventura et al. (2013) [10]_ - - Karakas & Lugaro (2016) [11]_; Karakas et al. (2018) [12]_ + - Cristallo et al. (2011, 2015) [8]_ [9]_ + - Karakas (2010) [10]_ + - Ventura et al. (2013) [11]_ + - Karakas & Lugaro (2016) [12]_; Karakas et al. (2018) [13]_ Users can also read these tables in with the ``vice.yields.agb.grid`` function. @@ -64,9 +64,9 @@ Relevant Source Code: - ``vice/src/singlezone/agb.c`` - ``vice/yields/agb/_grid_reader.pyx`` -.. [7] Cristallo et al. (2011), ApJS, 197, 17 -.. [8] Cristallo et al. (2015), ApJS, 219, 40 -.. [9] Karakas (2010), MNRAS, 403, 1413 -.. [10] Ventura et al. (2013), MNRAS, 431, 3642 -.. [11] Karakas & Lugaro (2016), ApJ, 825, 26 -.. [12] Karakas et al. (2018), MNRAS, 477, 421 +.. [8] Cristallo et al. (2011), ApJS, 197, 17 +.. [9] Cristallo et al. (2015), ApJS, 219, 40 +.. [10] Karakas (2010), MNRAS, 403, 1413 +.. [11] Ventura et al. (2013), MNRAS, 431, 3642 +.. [12] Karakas & Lugaro (2016), ApJ, 825, 26 +.. [13] Karakas et al. (2018), MNRAS, 477, 421 diff --git a/docs/src/science_documentation/yields/ccsne.rst b/docs/src/science_documentation/yields/ccsne.rst index 51fe2e0a..0b3a5171 100644 --- a/docs/src/science_documentation/yields/ccsne.rst +++ b/docs/src/science_documentation/yields/ccsne.rst @@ -4,11 +4,12 @@ Core Collapse Supernovae Because core collapse supernovae (CCSNe) are assumed to occur simultaneously with the formation of their progenitor stars [2]_, :math:`y_x^\text{CC}` represents the total yield from all CCSNe associated with a single stellar -population. Letting :math:`m_x` denote the net mass of some element :math:`x` -present in the CCSN ejecta, the yield at a given metallicity is defined by: +population. Letting :math:`m_x` denote the mass of some element :math:`x` +present in the CCSN ejecta from a progenitor of initial mass :math:`m`, the +yield at a given metallicity is defined by: .. math:: y_x^\text{CC} \equiv \frac{ - \int_{l_\text{CC}}^u (E(m)m_x + w_x - Z_{x,\text{prog}} m) + \int_{l_\text{CC}}^u (E(m)m_x + w_x - Z_{x,\text{prog}} (m - m_\text{rem})) \frac{dN}{dm} dm }{ \int_l^u m \frac{dN}{dm} dm @@ -17,16 +18,21 @@ present in the CCSN ejecta, the yield at a given metallicity is defined by: where the numerator is taken from the minimum mass for a CCSN explosion :math:`l_\text{CC}` to the upper mass limit of star formation :math:`u`, but the denominator is over the entire mass range of star formation, and -:math:`dN/dm` is the stellar initial mass function (IMF). This equation is -nothing more or less than the mathematical statement of "production divided -by total initial mass." +:math:`dN/dm` is the stellar initial mass function (IMF). +The constant ``CC_MIN_STELLAR_MASS`` declares :math:`l_\text{CC} = 8 M_\odot` +in ``vice/src/ccsne.h``. +This equation is nothing more or less than the mathematical statement of "metal +production divided by total initial mass of stars." :math:`E(m)` denotes the *explodability*: the fraction of star of mass :math:`m` which explode as a CCSN. :math:`w_x` denotes the mass yield of the -element :math:`x` due to winds at a mass :math:`m`, and the corrective term -:math:`Z_{x,\text{prog}} m` accounts for the birth abundances of the star to -compute a *net* rather than a *gross* yield. The constant -``CC_MIN_STELLAR_MASS`` declares :math:`l_\text{CC} = 8 M_\odot` in -``vice/src/ccsne.h``. +element :math:`x` due to stellar winds at a mass :math:`m`, and the corrective +term :math:`Z_{x,\text{prog}} (m - m_\text{rem})` accounts for the mass of the +element :math:`x` in the ejecta that was present at birth, converting the +quantity from a *gross* yield to a *net* yield. +In the current version of VICE, :math:`m_\text{rem}` is assumed to always be a +1.44 :math:`M_\odot` black hole for massive stars based on Weinberg, Andrews +& Freudenburg (2017) [6]_; additional, more realistic initial-final remnant +mass relations are currently being incorporated into the code base. In practice, supernova nucleosynthesis studies determine the value of :math:`m_x` for of order 10 values of :math:`m` at a given metallicity and @@ -111,3 +117,5 @@ Relevant Source Code: .. [5] Salpeter (1955), ApJ, 121, 161 +.. [6] Weinberg, Andrews & Freudenburg (2017), ApJ, 837, 183 + diff --git a/docs/src/science_documentation/yields/sneia.rst b/docs/src/science_documentation/yields/sneia.rst index d741f2b6..bd7adf7c 100644 --- a/docs/src/science_documentation/yields/sneia.rst +++ b/docs/src/science_documentation/yields/sneia.rst @@ -25,7 +25,7 @@ Intuitively, the SN Ia yield is thus specified by the mass yield of a single SN Ia explosion and the number of SN Ia events that occur per unit solar mass formed. -Maoz & Mannucci (2012) [6]_ found that :math:`N_\text{Ia}/M_\star` = +Maoz & Mannucci (2012) [7]_ found that :math:`N_\text{Ia}/M_\star` = :math:`(2 \pm 1) \times 10^{-3} M_\odot^{-1}`. That is, on average, approximately 500 :math:`M_\odot` of stars must form for a given stellar population to produce a single SN Ia. @@ -49,4 +49,4 @@ Relevant Source Code: - ``vice/yields/sneia/_yield_lookup.pyx`` -.. [6] Maoz & Mannucci (2012), PASA, 29, 447 +.. [7] Maoz & Mannucci (2012), PASA, 29, 447 diff --git a/setup.py b/setup.py index af719c75..f62ee6c1 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,8 @@ - The name of the extension to reinstall is invalid """ -# this version requires python >= 3.6.0 -MIN_PYTHON_VERSION = "3.6.0" +# this version requires python >= 3.8.0 +MIN_PYTHON_VERSION = "3.8.0" import sys import os if sys.version_info[:] < tuple( @@ -66,11 +66,11 @@ Programming Language :: Cython Programming Language :: Python Programming Language :: Python :: 3 -Programming Language :: Python :: 3.6 -Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 +Programming Language :: Python :: 3.11 +Programming Language :: Python :: 3.12 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython Topic :: Scientific/Engineering @@ -85,13 +85,13 @@ # ./docs/src/cover.tex MAJOR = 1 MINOR = 3 -MICRO = 0 -DEV = None +MICRO = 1 +DEV = 0 ALPHA = None BETA = None RC = None POST = None -ISRELEASED = True +ISRELEASED = False VERSION = "%d.%d.%d" % (MAJOR, MINOR, MICRO) if DEV is not None: assert isinstance(DEV, int), "Invalid version information" @@ -323,11 +323,11 @@ def setup_package(): scripts = ["bin/%s" % (i) for i in os.listdir("./bin/")], ext_modules = find_extensions(), include_dirs = include_dirs, - setup_requires = [ + setup_requires = [ # versions reflected in .github/workflows/ci.yml "setuptools>=18.0", # automatically handles Cython extensions - "Cython>=0.29.0" + "Cython>=3.0" ], - python_requires=">=3.6.*, <4", + python_requires=">=3.8,<4", zip_safe = False, verbose = "-q" not in sys.argv and "--quiet" not in sys.argv ) diff --git a/vice/_build_utils/c_extensions.py b/vice/_build_utils/c_extensions.py index a9273119..89660efd 100644 --- a/vice/_build_utils/c_extensions.py +++ b/vice/_build_utils/c_extensions.py @@ -512,6 +512,7 @@ "./vice/src/objects/callback_1arg.c", "./vice/src/objects/integral.c", "./vice/src/objects/imf.c", + "./vice/src/ssp/remnants.c", "./vice/src/io/ccsne.c", "./vice/src/io/utils.c", "./vice/src" diff --git a/vice/core/dataframe/_base.pyx b/vice/core/dataframe/_base.pyx index d13bce44..4926a55d 100644 --- a/vice/core/dataframe/_base.pyx +++ b/vice/core/dataframe/_base.pyx @@ -131,15 +131,15 @@ Got: %s""" % (type(frame))) In this case, the returned value will also be a dataframe. """ if isinstance(key, strcomp): # index via column label - return self.__subget__str(key) + return self._subget__str(key) elif isinstance(key, numbers.Number): # index via row number - return self.__subget__number(key) + return self._subget__number(key) else: raise IndexError("""Only integers and strings are valid indeces. \ Got: %s""" % (type(key))) - def __subget__str(self, key): + def _subget__str(self, key): """ Performs the __getitem__ operation when the key is a string. """ @@ -149,7 +149,7 @@ Got: %s""" % (type(key))) raise KeyError("Unrecognized dataframe key: %s" % (key)) - def __subget__number(self, key): + def _subget__number(self, key): """ Performs the __getitem__ operation when the key is a number """ diff --git a/vice/core/dataframe/_ccsn_yield_table.pyx b/vice/core/dataframe/_ccsn_yield_table.pyx index d72f1550..a8789170 100644 --- a/vice/core/dataframe/_ccsn_yield_table.pyx +++ b/vice/core/dataframe/_ccsn_yield_table.pyx @@ -136,7 +136,7 @@ cdef class ccsn_yield_table(base): return rep - def __subget__str(self, key): + def _subget__str(self, key): """ Override the base __getitem__ functionality for isotope lookup """ @@ -150,7 +150,7 @@ cdef class ccsn_yield_table(base): raise TypeError("This yields dataframe is not isotopic.") - def __subget__number(self, key): + def _subget__number(self, key): """ Override the base __getitem__ functionality for stellar mass lookup """ diff --git a/vice/core/dataframe/_fromfile.pyx b/vice/core/dataframe/_fromfile.pyx index 54f3728b..72f23fde 100644 --- a/vice/core/dataframe/_fromfile.pyx +++ b/vice/core/dataframe/_fromfile.pyx @@ -169,14 +169,14 @@ length the file dimension. File dimension: %d. Got: %d""" % ( Can be indexed via both str and int, allow negative indexing as well """ if isinstance(key, strcomp): - return self.__subget__str(key) + return self._subget__str(key) elif isinstance(key, numbers.Number): - return self.__subget__number(key) + return self._subget__number(key) else: raise KeyError("""Dataframe key must be of type str or int. \ Got: %s""" % (type(key))) - def __subget__str(self, key): + def _subget__str(self, key): """ Performs the __getitem__ operation when the key is of type str """ @@ -196,7 +196,7 @@ Got: %s""" % (type(key))) else: raise KeyError("All keys and labels must be ascii.") - def __subget__number(self, key): + def _subget__number(self, key): """ Performs the __getitem__ operation when the key is of type int """ diff --git a/vice/core/dataframe/_history.pyx b/vice/core/dataframe/_history.pyx index b22ccd5e..bda4bb87 100644 --- a/vice/core/dataframe/_history.pyx +++ b/vice/core/dataframe/_history.pyx @@ -108,6 +108,15 @@ cdef class history(fromfile): .. math:: [M/H] = \log_{10}\left(\frac{Z}{Z_\odot}\right) + .. versionadded:: 1.3.1 + + In previous versions, the primordial abundance by mass was included + in the numerical calculation of the inflow metallicity, but was not + recorded in the output. That is, an inflow metallicity of zero for + helium meant that the inflow metallicity was the primordial value. + In this patch, this book-keeping is adjusted to account for this, + and outputs will reflect a non-zero abundance in primordial gas. + Functions --------- - keys @@ -237,35 +246,35 @@ cdef class history(fromfile): scaled total ISM metallicity. """ if isinstance(key, strcomp): - return self.__subget__str(key) + return self._subget__str(key) elif isinstance(key, numbers.Number) and key % 1 == 0: - return self.__subget__int(key) + return self._subget__int(key) else: # No error yet, other possibilities in super's __getitem__ return super().__getitem__(key) - def __subget__str(self, key): + def _subget__str(self, key): """ Performs the __getitem__ operation when the key is of type str """ # See docstrings of subroutines for further info if key.lower().startswith("z(") and key.endswith(')'): - return self.__subget__str_z(key) + return self._subget__str_z(key) elif key.lower() == "y": - return self.__subget__str_y(key) + return self._subget__str_y(key) elif key.lower() == "z": - return self.__subget__str_ztot(key) + return self._subget__str_ztot(key) elif key.lower() == "[m/h]": - return self.__subget__str_logztot(key) + return self._subget__str_logztot(key) elif key.startswith('[') and key.endswith(']') and '/' in key: - return self.__subget__str_logzratio(key) + return self._subget__str_logzratio(key) elif key.lower() == "lookback": - return self.__subget__str_lookback(key) + return self._subget__str_lookback(key) else: # No error yet, other possibilities in super's __getitem__ - return super().__subget__str(key) + return super()._subget__str(key) - def __subget__str_z(self, key): + def _subget__str_z(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting a metallicity by mass Z of a given element. @@ -285,14 +294,14 @@ cdef class history(fromfile): raise KeyError("Element not tracked by simulation: %s" % ( element)) - def __subget__str_y(self, key): + def _subget__str_y(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the helium mass fraction Y. """ - return self.__subget__str_z("z(he)") + return self._subget__str_z("z(he)") - def __subget__str_ztot(self, key): + def _subget__str_ztot(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the total metallicity by mass Z @@ -307,7 +316,7 @@ cdef class history(fromfile): else: raise SystemError("Internal Error") - def __subget__str_logztot(self, key): + def _subget__str_logztot(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the log of the total metallicity by mass [M/H]. @@ -322,7 +331,7 @@ cdef class history(fromfile): else: raise SystemError("Internal Error") - def __subget__str_logzratio(self, key): + def _subget__str_logzratio(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting a logarithmic abundance ratio [X/Y]. This is generalized to @@ -348,7 +357,7 @@ cdef class history(fromfile): else: raise KeyError("Unrecognized dataframe key: %s" % (key)) - def __subget__str_lookback(self, key): + def _subget__str_lookback(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the lookback time. @@ -362,7 +371,7 @@ cdef class history(fromfile): else: raise SystemError("Internal Error") - def __subget__int(self, key): + def _subget__int(self, key): """ Performs the __getitem__ operation when the key is of type int. """ diff --git a/vice/core/dataframe/_tracers.pyx b/vice/core/dataframe/_tracers.pyx index 78da156c..9509506d 100644 --- a/vice/core/dataframe/_tracers.pyx +++ b/vice/core/dataframe/_tracers.pyx @@ -175,25 +175,25 @@ cdef class tracers(history): else: continue return tuple(elements[:]) - def __subget__str(self, key): + def _subget__str(self, key): # see docstring of subroutines for further info if key.lower().startswith("z(") and key.endswith(')'): - return self.__subget__str_z(key) + return self._subget__str_z(key) elif key.lower() == "y": - return self.__subget__str_y(key) + return self._subget__str_y(key) elif key.lower() == "z": - return self.__subget__str_ztot(key) + return self._subget__str_ztot(key) elif key.lower() == "[m/h]": - return self.__subget__str_logztot(key) + return self._subget__str_logztot(key) elif key.lower() == "age": - return self.__subget__str_age(key) + return self._subget__str_age(key) elif key.startswith('[') and key.endswith(']') and '/' in key: - return self.__subget__str_logzratio(key) + return self._subget__str_logzratio(key) else: # No error yet, other possibilities in super's __getitem__ - return super().__subget__str(key) + return super()._subget__str(key) - def __subget__str_z(self, key): + def _subget__str_z(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting a metallicity by mass Z of a given element. @@ -216,7 +216,7 @@ cdef class tracers(history): raise KeyError("Element not tracked by simulation: %s" % ( element)) - def __subget__str_ztot(self, key): + def _subget__str_ztot(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the total metallicity by mass Z @@ -231,7 +231,7 @@ cdef class tracers(history): else: raise SystemError("Internal Error") - def __subget__str_logztot(self, key): + def _subget__str_logztot(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the log of the total metallicity by mass [M/H]. @@ -246,7 +246,7 @@ cdef class tracers(history): else: raise SystemError("Internal Error") - def __subget__str_age(self, key): + def _subget__str_age(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting the age of the star particles. @@ -260,7 +260,7 @@ cdef class tracers(history): else: raise SystemError("Internal Error") - def __subget__str_logzratio(self, key): + def _subget__str_logzratio(self, key): """ Performs the __getitem__ operation when the key is of type str and is requesting an abundance ratio [x/Y]. @@ -285,7 +285,7 @@ cdef class tracers(history): else: raise KeyError("Unrecognized dataframe key: %s" % (key)) - def __subget__int(self, key): + def _subget__int(self, key): """ Performs the __getitem__ operation when the key is of type int. """ diff --git a/vice/core/dataframe/tests/ccsn_yield_table.py b/vice/core/dataframe/tests/ccsn_yield_table.py index ddba5d65..39165b6f 100644 --- a/vice/core/dataframe/tests/ccsn_yield_table.py +++ b/vice/core/dataframe/tests/ccsn_yield_table.py @@ -120,7 +120,11 @@ def test_todict(): vice.core.dataframe.ccsn_yield_table.todict unit test """ def test(): - return (isinstance(_TEST_NONISOTOPIC_.todict(), dict) and - isinstance(_TEST_ISOTOPIC_.todict(), dict)) + try: + success = isinstance(_TEST_NONISOTOPIC_.todict(), dict) + success &= isinstance(_TEST_ISOTOPIC_.todict(), dict) + except: + return False + return success return ["vice.core.dataframe.ccsn_yield_table.todict", test] diff --git a/vice/core/multizone/_multizone.pyx b/vice/core/multizone/_multizone.pyx index cd61ecc6..ec148223 100644 --- a/vice/core/multizone/_multizone.pyx +++ b/vice/core/multizone/_multizone.pyx @@ -391,6 +391,7 @@ zone and at least one timestep larger than 1.""") self.align_element_attributes() self.zone_alignment_warnings() self.timestep_alignment_error() + self.mode_alignment_error() for i in range(self._mz[0].mig[0].n_zones): times = self._zones[i]._singlezone__zone_prep(output_times) self._mz[0].zones[i][0].output_times = copy_pylist( @@ -890,6 +891,17 @@ its time of formation, must equal its zone of origin.""") pass + def mode_alignment_error(self): + r""" + Raises a Runtime Error if each zones are not all running in the same + mode. + """ + if len(dict.fromkeys([self._zones[i].mode for i in range( + self._mz[0].mig[0].n_zones)])) > 1: + raise RuntimeError("All zones must run in the same mode.") + else: pass + + def import_mlr_data(self): # import the mass-lifetime relation data on this extension if mlr.setting in ["vincenzo2016", "hpt2000", "ka1997"]: diff --git a/vice/core/multizone/multizone.py b/vice/core/multizone/multizone.py index 57cc2681..cf5981f4 100644 --- a/vice/core/multizone/multizone.py +++ b/vice/core/multizone/multizone.py @@ -664,7 +664,8 @@ def run(self, output_times, capture = False, overwrite = False, r""" Run the simulation. - **Signature**: x.run(output_times, capture = False, overwrite = False) + **Signature**: x.run(output_times, capture = False, overwrite = False, + pickle = True) Parameters ---------- diff --git a/vice/core/objects/_callback_1arg.pxd b/vice/core/objects/_callback_1arg.pxd index b199c8cd..26a49fdc 100644 --- a/vice/core/objects/_callback_1arg.pxd +++ b/vice/core/objects/_callback_1arg.pxd @@ -3,7 +3,7 @@ cdef extern from "../../src/objects.h": ctypedef struct CALLBACK_1ARG: - double (*callback)(double, void *) + double (*callback)(double, void *) except * double assumed_constant void *user_func diff --git a/vice/core/objects/_callback_2arg.pxd b/vice/core/objects/_callback_2arg.pxd index 701a6c9b..6a3ebdd0 100644 --- a/vice/core/objects/_callback_2arg.pxd +++ b/vice/core/objects/_callback_2arg.pxd @@ -3,7 +3,7 @@ cdef extern from "../../src/objects.h": ctypedef struct CALLBACK_2ARG: - double (*callback)(double, double, void *) + double (*callback)(double, double, void *) except * double assumed_constant void *user_func diff --git a/vice/core/singlezone/singlezone.py b/vice/core/singlezone/singlezone.py index 4a285c14..38091761 100644 --- a/vice/core/singlezone/singlezone.py +++ b/vice/core/singlezone/singlezone.py @@ -935,6 +935,25 @@ def Zin(self): passed, allowing real numbers and functions to be assigned on an element-by-element basis. + This attribute quantifies only the metallicity of gas inflow *in excess* + of that which is produced by the big bang. For example, even when this + attribute is set to 0 for helium, its abundance by mass in accreting + gas will still be given by ``vice.primordial["he"]``. If the element in + question was not produced during big bang nucleosynthesis (i.e. + ``vice.primordial["x"] = 0`` for some element "x"), then the same + numerical solution applies and this attribute quantifies the total + abundance by mass in the inflow. + + .. versionadded:: 1.3.1 + + In previous versions, the primordial abundance by mass of each + element was included in the numerical calculation of the inflow + metallicity but was not recorded in the output. That is, an inflow + metallicity of zero for helium meant that its abundance in + infalling gas was exactly the primordial abundance. With this + patch, this book-keeping is adjusted to account for this, and + outputs will reflect a non-zero abundance in primordial gas. + .. tip:: The easiest way to switch this attribute to a dataframe is by diff --git a/vice/core/singlezone/tests/__init__.py b/vice/core/singlezone/tests/__init__.py index e6480423..7e2a2da6 100644 --- a/vice/core/singlezone/tests/__init__.py +++ b/vice/core/singlezone/tests/__init__.py @@ -11,6 +11,7 @@ from ....testing import moduletest from . import _singlezone from . import trials + from . import sanitychecks from .from_output import test_from_output from ....src.singlezone.tests import test as src_test @@ -24,6 +25,7 @@ def test(): test_from_output(), _singlezone.test(run = False), trials.test(run = False), + sanitychecks.test(run = False), src_test(run = False) ] ] diff --git a/vice/core/singlezone/tests/sanitychecks.py b/vice/core/singlezone/tests/sanitychecks.py new file mode 100644 index 00000000..5d04661e --- /dev/null +++ b/vice/core/singlezone/tests/sanitychecks.py @@ -0,0 +1,157 @@ +r""" +This file runs various sanity checks on singlezone models, particularly for +helium. If helium is assigned the same yields as oxygen, then the helium +abundance above the primordial abundance should evolve the same as the oxygen +abundance. This also checks for numerical artifacts in starburst scenarios. +""" + +__all__ = ["test"] +from ...._globals import _VERSION_ERROR_ +from ....testing import moduletest +from ....testing import unittest +from ....testing import generator +from .... import yields +from ...outputs import output +from ...dataframe._builtin_dataframes import primordial +from ..singlezone import singlezone +import math +import sys +if sys.version_info[:2] == (2, 7): + strcomp = basestring +elif sys.version_info[:2] >= (3, 5): + strcomp = str +else: + _VERSION_ERROR_() +try: + ModuleNotFoundError +except NameError: + ModuleNotFoundError = ImportError +try: + import numpy as np + _OUTTIMES_ = np.linspace(0, 10, 1001) +except (ModuleNotFoundError, ImportError): + _OUTTIMES_ = [0.01 * _ for _ in range(1001)] + + +def ifrburst(t): + r""" + A simple infall-burst model for sanity checks on the helium abundance + """ + if 5 <= t < 5.01: + return 500 + else: + return 9.1 + +def sfrburst(t): + r""" + A simple starburst model for sanity checks on the helium abundance + """ + if t < 5: + return 100 + else: + return 100 + 50 * math.exp(-(t - 5) / 2) + + +class helium_smoothsfh_generator(generator): + + # Systematically generate sanity checks where helium is the same as oxygen + + def __init__(self, msg, **kwargs): + super().__init__(msg, **kwargs) + self._sz = singlezone(name = "test", dt = 0.01, **kwargs) + + @unittest + def __call__(self): + def test(): + self.setup_yields() + try: + out = self._sz.run(_OUTTIMES_, overwrite = True, capture = True) + except: + self.reset_yields() + return False + deltay = [_ - primordial["he"] for _ in out.history["y"]] + oxygen = out.history["z(o)"] + status = True + for i in range(len(deltay)): + if oxygen[i]: + percent_diff = abs((oxygen[i] - deltay[i]) / oxygen[i]) + status &= percent_diff < 1.e-3 + else: + status &= abs(deltay[i]) < 1.e-15 # floating point errors + if not status: break + self.reset_yields() + return status + return [self.msg, test] + + def setup_yields(self): + self._current_o_yields = [] + self._current_he_yields = [] + for channel in [yields.ccsne, yields.sneia, yields.agb]: + self._current_o_yields.append(channel.settings['o']) + self._current_he_yields.append(channel.settings['he']) + yields.ccsne.settings['o'] = 0.015 + yields.sneia.settings['o'] = 0 + yields.agb.settings['o'] = lambda m, z: 0 + yields.ccsne.settings['he'] = 0.015 + yields.sneia.settings['he'] = 0 + yields.agb.settings['he'] = lambda m, z: 0 + + def reset_yields(self): + # order of this list must match for-loop in setup_yields + channels = [yields.ccsne, yields.sneia, yields.agb] + for i in range(3): + channels[i].settings['o'] = self._current_o_yields[i] + channels[i].settings['he'] = self._current_he_yields[i] + + +class helium_burstysfh_generator(generator): + + # Systematically generate sanity checks to look for numerical artifacts in + # the helium abundance for bursty SFHs + + def __init__(self, msg, **kwargs): + super().__init__(msg, **kwargs) + self._sz = singlezone(name = "test", dt = 0.01, **kwargs) + + @unittest + def __call__(self): + def test(): + try: + out = self._sz.run(_OUTTIMES_, overwrite = True, capture = True) + except: + return False + helium = out.history["y"] + status = True + maxdiff = 0.1 + for i in range(1, len(helium) - 1): + # call it a numerical artifact if the helium abundance spikes + # with a >= 10% percent difference between the current value + # and *both* the values immediately before and after it + percent_diff_1 = abs((helium[i] - helium[i - 1]) / helium[i]) + percent_diff_2 = abs((helium[i] - helium[i + 1]) / helium[i]) + status &= percent_diff_1 < maxdiff and percent_diff_2 < maxdiff + if not status: break + return status + return [self.msg, test] + + +@moduletest +def test(): + trials = [] + kwargs = { + "elements": ["he", "o", "fe"], + "recycling": 0.4 + } + for mode in ["ifr", "sfr", "gas"]: + kwargs["mode"] = mode + trials.append(helium_smoothsfh_generator( + "sanity check :: helium smooth SFH [mode :: %s]" % (mode), + **kwargs)()) + for mode in ["ifr", "sfr", "gas"]: + kwargs["mode"] = mode + kwargs["func"] = ifrburst if mode == "ifr" else sfrburst + trials.append(helium_burstysfh_generator( + "sanity check :: helium bursty SFH [mode :: %s]" % (mode), + **kwargs)()) + return ["vice.core.singlezone sanity checks", trials] + diff --git a/vice/core/ssp/_crf.pyx b/vice/core/ssp/_crf.pyx index 0ac57615..b1e2b107 100644 --- a/vice/core/ssp/_crf.pyx +++ b/vice/core/ssp/_crf.pyx @@ -34,7 +34,7 @@ def cumulative_return_fraction(age, IMF = "kroupa", m_upper = 100, the birst metallicity of the stars. **Signature**: vice.cumulative_return_fraction(age, IMF = "kroupa", - m_upper = 100, m_lower = 0.08, postMS = 0.01) + m_upper = 100, m_lower = 0.08, postMS = 0.1) Parameters ---------- diff --git a/vice/src/io/singlezone.c b/vice/src/io/singlezone.c index 07ca742f..6e58d22c 100644 --- a/vice/src/io/singlezone.c +++ b/vice/src/io/singlezone.c @@ -214,7 +214,8 @@ extern void write_zone_history(SINGLEZONE sz, double mstar, for (i = 0; i < sz.n_elements; i++) { /* infall metallicity */ fprintf(sz.history_writer, "%e\t", - (*sz.elements[i]).Zin[sz.timestep]); + (*sz.elements[i]).Zin[sz.timestep] + + (*sz.elements[i]).primordial); } for (i = 0; i < sz.n_elements; i++) { /* outflow metallicity = enhancement factor x ISM metallicity */ diff --git a/vice/src/multizone/element.c b/vice/src/multizone/element.c index 8cd7d178..4162ee3d 100644 --- a/vice/src/multizone/element.c +++ b/vice/src/multizone/element.c @@ -22,84 +22,103 @@ */ extern void update_elements(MULTIZONE *mz) { + /* + * Change Note: version 1.3.1 + * + * See corresponding change note in src/singlezone/element.c as the same + * changes have been incorporated here. + */ + unsigned int i, j; - for (i = 0u; i < (*(*mz).mig).n_zones; i++) { - SINGLEZONE *sz = mz -> zones[i]; - for (j = 0u; j < (*(*mz).zones[i]).n_elements; j++) { - ELEMENT *e = sz -> elements[j]; + for (i = 0u; i < (*(*mz).zones[0]).n_elements; i++) { + + /* + * These enrichment channels which require tracer particles are written + * such that they can be called once for each element and updated + * in one foul swoop across all zones: + * + * Enrichment from SNe Ia + * Enrichment from AGB stars + * Re-enrichment from recycled stellar envelopes + */ + double *sneia = m_sneia_from_tracers(*mz, i); + double *agb = m_AGB_from_tracers(*mz, i); + double *recycled = recycled_mass(*mz, i); + + for (j = 0u; j < (*(*mz).mig).n_zones; j++) { + /* - * Instantaneous pieces that don't require tracer particles: + * These instantaneous pieces don't require tracer particles and + * can be taken straight from the birth zone: * * Enrichment from core collapse supernovae - * depletion from star formation - * depletion from outflows - * metal-rich infall + * Depletion from star formation + * Depletion from outflows + * Metal-rich infall (or anything present in primordial gas) */ + SINGLEZONE sz = *(*mz).zones[j]; + ELEMENT *e = mz -> zones[j] -> elements[i]; + + double dm = 0; + double m_cc = mdot_ccsne(sz, *e) * sz.dt; + double m_ia = sneia[j]; + double m_agb = agb[j]; + + /* + * Enrichment immediately lost to outflows. For the enrichment + * channels requiring tracer particles, this uses the entrainment + * fraction from the CURRENT zone as opposed to the BIRTH zone, + * a choice which is likely more physical since whether or not, e.g. + * a fluid element from a SN Ia or an AGB star is included in an + * outflow likely has more to do with its current location than + * where it was born. + */ e -> unretained = 0; - double m_cc = mdot_ccsne(*sz, *e) * (*sz).dt; - e -> mass += (*(*e).ccsne_yields).entrainment * m_cc; e -> unretained += (1 - (*(*e).ccsne_yields).entrainment) * m_cc; + e -> unretained += (1 - (*(*e).sneia_yields).entrainment) * m_ia; + e -> unretained += (1 - (*(*e).agb_grid).entrainment) * m_agb; - e -> mass -= ( - (*(*sz).ism).star_formation_rate * (*sz).dt * - (*e).mass / (*(*sz).ism).mass - ); + /* Enrichment entrained within the ISM */ + dm += (*(*e).ccsne_yields).entrainment * m_cc; + dm += (*(*e).sneia_yields).entrainment * m_ia; + dm += (*(*e).agb_grid).entrainment * m_agb; + + /* + * Subsequent terms in the enrichmen tequation - star formation and + * outflows proceed at the abundance by mass Z in the current zone. + */ + double Z = (*e).mass / (*sz.ism).mass; + dm += recycled[j]; + dm -= (*sz.ism).star_formation_rate * sz.dt * Z; if (strcmp((*e).symbol, "he")) { - e -> mass -= ( - (*(*sz).ism).enh[(*sz).timestep] * get_outflow_rate(*sz) * - (*sz).dt * (*e).mass / (*(*sz).ism).mass + dm -= ( + (*sz.ism).enh[sz.timestep] * get_outflow_rate(sz) * + sz.dt * Z ); } else { - e -> mass -= ( - get_outflow_rate(*sz) * (*sz).dt * (*e).mass / - (*(*sz).ism).mass - ); + /* Don't eject helium at an enhanced abundance */ + dm -= get_outflow_rate(sz) * sz.dt * Z; } - e -> mass += ( - (*(*sz).ism).infall_rate * (*sz).dt * (*e).Zin[(*sz).timestep] - ); - } - } + if ((*sz.ism).infall_rate > 0) { + /* + * Safeguard against the infall rate being set to NaN, see + * comment on same if-statement in src/singlezone/element.c. + */ + double Zin = (*e).Zin[sz.timestep] + (*e).primordial; + dm += (*sz.ism).infall_rate * (sz).dt * Zin; + } else {} - /* - * Non-instantaneous pieces that do require tracer particles: - * - * Enrichment from AGB stars - * Enrichment from SNe Ia - * Re-enrichment from recycling - */ - for (i = 0u; i < (*(*mz).zones[0]).n_elements; i++) { + e -> mass += dm; + update_element_mass_sanitycheck(e); - /* AGB stars taking into account entrainment in the current zone */ - double *agb = m_AGB_from_tracers(*mz, i); - for (j = 0u; j < (*(*mz).mig).n_zones; j++) { - ELEMENT *e = mz -> zones[j] -> elements[i]; - e -> mass += (*(*e).agb_grid).entrainment * agb[j]; - e -> unretained += (1 - (*(*e).agb_grid).entrainment) * agb[j]; } - free(agb); - /* SNe Ia taking into account entrainment in the current zone. */ - double *sneia = m_sneia_from_tracers(*mz, i); - for (j = 0u; j < (*(*mz).mig).n_zones; j++) { - ELEMENT *e = mz -> zones[j] -> elements[i]; - e -> mass += (*(*e).sneia_yields).entrainment * sneia[j]; - e -> unretained += (1 - - (*(*e).sneia_yields).entrainment) * sneia[j]; - } free(sneia); + free(agb); + free(recycled); - recycle_metals_from_tracers(mz, i); - - } - - /* sanity check each element in each zone */ - for (i = 0u; i < (*(*mz).mig).n_zones; i++) { - for (j = 0u; j < (*(*mz).zones[i]).n_elements; j++) { - update_element_mass_sanitycheck(mz -> zones[i] -> elements[j]); - } } } diff --git a/vice/src/multizone/ism.c b/vice/src/multizone/ism.c index 319edf1a..d3fcf6c0 100644 --- a/vice/src/multizone/ism.c +++ b/vice/src/multizone/ism.c @@ -27,6 +27,13 @@ */ extern unsigned short update_zone_evolution(MULTIZONE *mz) { + /* + * Change Note: version 1.3.1 + * + * See corresponding change note in src/singlezone/ism.c as the same + * changes have been incorporated here. + */ + /* * The relation between star formation rate, infall rate, gas supply, * timestep size, outflow rate, recycling rate, and star formation @@ -46,18 +53,6 @@ extern unsigned short update_zone_evolution(MULTIZONE *mz) { for (i = 0; i < (*(*mz).mig).n_zones; i++) { SINGLEZONE *sz = mz -> zones[i]; - /* - * Change Note: version 1.3.0 - * - * Primordial inflow added prior to updating parameters in infall mode - * as before, but now after updating in star formation and gas modes. - * In practice, this caused models to miss one timestep's worth of - * primordial inflow at the very beginning due to the temporary - * assignment of the infall rate to NaN. This change ensures that the - * infall rate will not be NaN by the time primordial_inflow is called - * after one timestep has passed. - */ - switch (checksum((*(*sz).ism).mode)) { case GAS: @@ -70,11 +65,9 @@ extern unsigned short update_zone_evolution(MULTIZONE *mz) { - mass_recycled[i]) / (*sz).dt + (*(*sz).ism).star_formation_rate + get_outflow_rate(*sz) ); - primordial_inflow(sz); break; case IFR: - primordial_inflow(sz); sz -> ism -> mass += ( ((*(*sz).ism).infall_rate - (*(*sz).ism).star_formation_rate - @@ -96,7 +89,6 @@ extern unsigned short update_zone_evolution(MULTIZONE *mz) { (*(*sz).ism).star_formation_rate + get_outflow_rate(*sz) ); sz -> ism -> mass += dMg; - primordial_inflow(sz); break; default: diff --git a/vice/src/multizone/multizone.c b/vice/src/multizone/multizone.c index 5e1bc797..63c3230d 100644 --- a/vice/src/multizone/multizone.c +++ b/vice/src/multizone/multizone.c @@ -3,6 +3,7 @@ */ #include +#include #include "../multizone.h" #include "../singlezone.h" #include "../tracer.h" @@ -193,8 +194,26 @@ extern void multizone_evolve_full(MULTIZONE *mz) { */ static unsigned short multizone_timestepper(MULTIZONE *mz) { - update_zone_evolution(mz); - update_elements(mz); + /* + * Change Note: version 1.3.1 + * + * See corresponding change note in the singlezone_timestepper function + * in src/singlezone/singlezone.c as the same changes have been + * incorporated here. + * + * Additionally, version 1.3.1 asserts that all multizone models must run + * in the same mode as a consequence of how this change is applied to + * multi-zone models. This is taken into account in the form of a + * Runtime Error raised in Python in vice/core/multizone/_multizone.pyx. + */ + + if (strcmp((*(*(*mz).zones[0]).ism).mode, "ifr")) { + update_zone_evolution(mz); + update_elements(mz); + } else { + update_elements(mz); + update_zone_evolution(mz); + } /* * Now each element and the ISM in each zone are at the next timestep. diff --git a/vice/src/multizone/recycling.c b/vice/src/multizone/recycling.c index f6031e2b..3fb62423 100644 --- a/vice/src/multizone/recycling.c +++ b/vice/src/multizone/recycling.c @@ -12,19 +12,27 @@ #include "../multizone.h" #include "recycling.h" + /* - * Re-enriches each zone in a multizone simulation. Zones with instantaneous - * recycling will behave as such, but zones with continuous recycling will - * produce tracer particles that re-enrich their current zone, even if that - * zone has instantaneous recycling. + * Compute the mass of the index'th element added back to the ISM by recycled + * stellar envelopes. Zones with instantaneous recycling will behave as such, + * but zones that produce tracer particles will re-enrich their current zone, + * even if their current has instantaneous recycling. * * Parameters * ========== - * mz: A pointer to the multizone object to re-enrich + * mz: The multizone object to re-enrich + * index: The element's index in each of mz's singlezone objects. + * + * Returns + * ======= + * A pointer containing an entry for each of the zones in the multizone model. + * Each element contains the mass in solar masses of the index'th element + * re-enriched to the ISM by recycled stellar envelopes. * * header: recycling.h */ -extern void recycle_metals_from_tracers(MULTIZONE *mz, unsigned int index) { +extern double *recycled_mass(MULTIZONE mz, unsigned int index) { /* * Look at each tracer particle and allow each that was born in a zone @@ -36,44 +44,53 @@ extern void recycle_metals_from_tracers(MULTIZONE *mz, unsigned int index) { */ unsigned long i; - for (i = 0l; i < (*(*mz).mig).tracer_count; i++) { - TRACER *t = mz -> mig -> tracers[i]; - SSP *ssp = mz -> zones[(*t).zone_origin] -> ssp; + double *recycled = (double *) malloc ((*mz.mig).n_zones * sizeof(double)); + for (i = 0ul; i < (*mz.mig).n_zones; i++) recycled[i] = 0; + for (i = 0ul; i < (*mz.mig).tracer_count; i++) { + TRACER *t = mz.mig -> tracers[i]; + SSP *ssp = mz.zones[(*t).zone_origin] -> ssp; if ((*ssp).continuous) { - /* ------------------- Continuous recycling ------------------- */ - unsigned long n = (*(*mz).zones[0]).timestep - (*t).timestep_origin; - /* The metallicity by mass of this element in the tracer */ + /* ------------------- Continuous recycling ------------------- + * + * The metallicity by mass of this element in the tracer particle + * and its age in units of the timestep size. + */ double Z = ( - (*(*(*mz).zones[(*t).zone_origin]).elements[index]).Z[( + (*(*mz.zones[(*t).zone_origin]).elements[index]).Z[( *t).timestep_origin] ); - mz -> zones[(*t).zone_current] -> elements[index] -> mass += ( - Z * (*t).mass * ((*ssp).crf[n + 1l] - (*ssp).crf[n]) + unsigned long n = (*mz.zones[0]).timestep - (*t).timestep_origin; + recycled[(*t).zone_current] += Z * (*t).mass * ( + ((*ssp).crf[n + 1ul] - (*ssp).crf[n]) ); + // mz -> zones[(*t).zone_current] -> elements[index] -> mass += ( + // Z * (*t).mass * ((*ssp).crf[n + 1l] - (*ssp).crf[n]) + // ); } else {} } - unsigned int j; - for (j = 0; j < (*(*mz).mig).n_zones; j++) { - SSP *ssp = mz -> zones[j] -> ssp; + for (i = 0ul; i < (*mz.mig).n_zones; i++) { + SSP *ssp = mz.zones[i] -> ssp; if (!(*ssp).continuous) { /* ------------------ Instantaneous recycling ------------------ */ - mz -> zones[j] -> elements[index] -> mass += ( - (*(*(*mz).zones[j]).ism).star_formation_rate * - (*(*mz).zones[j]).dt * - (*(*(*mz).zones[j]).ssp).R0 * - (*(*(*mz).zones[j]).elements[index]).mass / - (*(*(*mz).zones[j]).ism).mass + recycled[i] += ( + (*(*mz.zones[i]).ism).star_formation_rate * + (*mz.zones[i]).dt * + (*(*mz.zones[i]).ssp).R0 * + (*(*mz.zones[i]).elements[index]).mass / + (*(*mz.zones[i]).ism).mass ); - } else {} - + } } + return recycled; + } + /* * Determine the amount of ISM gas recycled from stars in each zone in a * multizone simulation. Just as is the case with re-enrichment of metals, diff --git a/vice/src/multizone/recycling.h b/vice/src/multizone/recycling.h index 20a9b3a7..236c0199 100644 --- a/vice/src/multizone/recycling.h +++ b/vice/src/multizone/recycling.h @@ -9,18 +9,25 @@ extern "C" { #include "../objects.h" /* - * Re-enriches each zone in a multizone simulation. Zones with instantaneous - * recycling will behave as such, but zones with continuous recycling will - * produce tracer particles that re-enrich their current zone, even if that - * zone has instantaneous recycling. + * Compute the mass of the index'th element added back to the ISM by recycled + * stellar envelopes. Zones with instantaneous recycling will behave as such, + * but zones that produce tracer particles will re-enrich their current zone, + * even if their current has instantaneous recycling. * * Parameters * ========== * mz: A pointer to the multizone object to re-enrich + * index: The element's index in each of mz's singlezone objects. + * + * Returns + * ======= + * A pointer containing an entry for each of the zones in the multizone model. + * Each element contains the mass in solar masses of the index'th element + * re-enriched to the ISM by recycled stellar envelopes. * * source: recycling.c */ -extern void recycle_metals_from_tracers(MULTIZONE *mz, unsigned int index); +extern double *recycled_mass(MULTIZONE mz, unsigned int index); /* * Determine the amount of ISM gas recycled from stars in each zone in a diff --git a/vice/src/multizone/tests/recycling.c b/vice/src/multizone/tests/recycling.c index 7cf13067..0c8a381c 100644 --- a/vice/src/multizone/tests/recycling.c +++ b/vice/src/multizone/tests/recycling.c @@ -56,7 +56,11 @@ extern unsigned short no_migration_test_recycle_metals_from_tracers( unsigned short status = 1u; for (j = 0u; j < (*(*mz).zones[0]).n_elements; j++) { /* This must only be called once per element -> outermost for-loop */ - recycle_metals_from_tracers(mz, j); + double *recycled = recycled_mass(*mz, j); + for (i = 0u; i < (*(*mz).mig).n_zones; i++) { + mz -> zones[i] -> elements[j] -> mass += recycled[i]; + } + free(recycled); for (i = 0u; i < (*(*mz).mig).n_zones; i++) { actual[i][j] *= -1; actual[i][j] += (*(*(*mz).zones[i]).elements[j]).mass; @@ -123,7 +127,11 @@ extern unsigned short separation_test_recycle_metals_from_tracers( unsigned short status = 1u; for (j = 0u; j < (*(*mz).zones[0]).n_elements; j++) { /* This must be called only once per element -> outermost for-loop */ - recycle_metals_from_tracers(mz, j); + double *actual = recycled_mass(*mz, j); + for (i = 0u; i < (*(*mz).mig).n_zones; i++) { + mz -> zones[i] -> elements[j] -> mass += actual[i]; + } + free(actual); for (i = 0u; i < (*(*mz).mig).n_zones; i++) { recycled[i][j] *= -1; recycled[i][j] += (*(*(*mz).zones[i]).elements[j]).mass; diff --git a/vice/src/singlezone/element.c b/vice/src/singlezone/element.c index dc98203d..05434a72 100644 --- a/vice/src/singlezone/element.c +++ b/vice/src/singlezone/element.c @@ -56,40 +56,69 @@ extern unsigned short malloc_Z(ELEMENT *e, unsigned long n_timesteps) { */ extern void update_element_mass(SINGLEZONE sz, ELEMENT *e) { + /* + * Change Note: version 1.3.1 + * + * Rather than updating the element mass directly, one single value for + * the change is computed, and the total mass incremented at the end. + * This ensures that changes to the mass do not impact subsequent updates. + * Additionally, the increase in mass due to a species being present in + * primordial gas has moved to this function from the update_gas_evolution + * function in ism.c. This allows the element's mass to updated in one + * call, rather than in multiple places. + * + * See also changes notes in ism.c, singlezone.c. + */ + /* * Pull the amount of mass produced by each enrichment channel, then add * the retained part to the ISM mass and the unretained part to the * instantaneous mass outflow. */ + double dm = 0; double m_cc = mdot_ccsne(sz, *e) * sz.dt; double m_ia = mdot_sneia(sz, *e) * sz.dt; double m_agb = m_AGB(sz, *e); - e -> mass += (*(*e).ccsne_yields).entrainment * m_cc; - e -> mass += (*(*e).sneia_yields).entrainment * m_ia; - e -> mass += (*(*e).agb_grid).entrainment * m_agb; - + /* enrichment immediately lost to outflows */ e -> unretained = 0; e -> unretained += (1 - (*(*e).ccsne_yields).entrainment) * m_cc; e -> unretained += (1 - (*(*e).sneia_yields).entrainment) * m_ia; e -> unretained += (1 - (*(*e).agb_grid).entrainment) * m_agb; + /* enrichment entrained within the ISM */ + dm += (*(*e).ccsne_yields).entrainment * m_cc; + dm += (*(*e).sneia_yields).entrainment * m_ia; + dm += (*(*e).agb_grid).entrainment * m_agb; /* - * Take care of subsequent terms in the enrichment equation. + * Subsequent terms in the enrichment equation - star formation and + * outflows proceed at the abundance by mass in the ISM Z. */ - e -> mass += mass_recycled(sz, e); - e -> mass -= ((*sz.ism).star_formation_rate * sz.dt * - (*e).mass / (*sz.ism).mass); - /* don't eject helium at an enhanced metallicity */ + double Z = (*e).mass / (*sz.ism).mass; + dm += mass_recycled(sz, e); + dm -= (*sz.ism).star_formation_rate * sz.dt * Z; if (strcmp((*e).symbol, "he")) { - e -> mass -= ((*sz.ism).enh[sz.timestep] * get_outflow_rate(sz) * - sz.dt / (*sz.ism).mass * (*e).mass); + dm -= (*sz.ism).enh[sz.timestep] * get_outflow_rate(sz) * sz.dt * Z; } else { - e -> mass -= get_outflow_rate(sz) * sz.dt / (*sz.ism).mass * (*e).mass; + /* Don't eject helium at an enhanced metallicity */ + dm -= get_outflow_rate(sz) * sz.dt * Z; } - e -> mass += (*sz.ism).infall_rate * sz.dt * (*e).Zin[sz.timestep]; + if ((*sz.ism).infall_rate > 0) { + /* + * Seemingly unnecessary, this if statement is a safeguard against + * cases where the infall rate has been temporarily set to NaN, as in + * the first timestep in gas or star formation modes where the infall + * rate is not yet known. This is however taken into account by + * updating the gas supply before the elements when NOT running in + * infall mode, and vice versa when in infall mode. + */ + double Zin = (*e).Zin[sz.timestep] + (*e).primordial; + dm += (*sz.ism).infall_rate * sz.dt * Zin; + } else {} + + e -> mass += dm; update_element_mass_sanitycheck(e); } diff --git a/vice/src/singlezone/ism.c b/vice/src/singlezone/ism.c index 496238c7..c84f739e 100644 --- a/vice/src/singlezone/ism.c +++ b/vice/src/singlezone/ism.c @@ -103,6 +103,18 @@ extern unsigned short setup_gas_evolution(SINGLEZONE *sz) { */ extern unsigned short update_gas_evolution(SINGLEZONE *sz) { + /* + * Change Note: version 1.3.1 + * + * Primordial inflow is moved from this function to update_element_mass + * in element.c. In practice, the previous implementation led to + * underestimated helium production by adding new helium to the ISM, + * causing more to be ejected due to an overestimed abundance in the gas + * phase. + * + * See also change notes in singlezone.c, element.c. + */ + /* * The relation between star formation rate, infall rate, gas supply, * timestep size, outflow rate, recycling rate, and star formation @@ -116,18 +128,6 @@ extern unsigned short update_gas_evolution(SINGLEZONE *sz) { * gas supply so that there isn't a 1-timestep delay or advance in the * amount of helium added */ - - /* - * Change Note: version 1.3.0 - * - * Primordial inflow added prior to updating parameters in infall mode as - * before, but now after updating in star formation and gas modes. In - * practice, this caused models to miss one timestep's worth of primordial - * inflow at the very beginning due to the temporary assignment of the - * infall rate to NaN. This change ensures that the infall rate will not be - * NaN by the time primordial_inflow is called after one timestep has - * passed. - */ switch (checksum((*(*sz).ism).mode)) { case GAS: @@ -139,11 +139,9 @@ extern unsigned short update_gas_evolution(SINGLEZONE *sz) { mass_recycled(*sz, NULL)) / (*sz).dt + (*(*sz).ism).star_formation_rate + get_outflow_rate(*sz) ); - primordial_inflow(sz); break; case IFR: - primordial_inflow(sz); sz -> ism -> mass += ( ((*(*sz).ism).infall_rate - (*(*sz).ism).star_formation_rate - get_outflow_rate(*sz)) * (*sz).dt + mass_recycled(*sz, NULL) @@ -163,7 +161,6 @@ extern unsigned short update_gas_evolution(SINGLEZONE *sz) { (*(*sz).ism).star_formation_rate + get_outflow_rate(*sz) ); sz -> ism -> mass += dMg; - primordial_inflow(sz); break; default: @@ -313,30 +310,6 @@ extern void update_gas_evolution_sanitycheck(SINGLEZONE *sz) { } -/* - * Takes into account each element's primordial abundance in the inflow - * - * Parameters - * ========== - * sz: A pointer to the singlezone object for this simulation - * - * header: ism.h - */ -extern void primordial_inflow(SINGLEZONE *sz) { - - if (!isnan((*(*sz).ism).infall_rate)) { - unsigned int i; - for (i = 0; i < (*sz).n_elements; i++) { - sz -> elements[i] -> mass += ( - (*(*sz).ism).infall_rate * (*sz).dt * - (*(*sz).elements[i]).primordial - ); - } - } else {} - -} - - /* * Determine the ISM mass outflow rate in a singlezone simulation. * diff --git a/vice/src/singlezone/ism.h b/vice/src/singlezone/ism.h index 8eeb6d52..9c1e7fe3 100644 --- a/vice/src/singlezone/ism.h +++ b/vice/src/singlezone/ism.h @@ -85,17 +85,6 @@ extern double get_ism_mass_SFRmode(SINGLEZONE sz, unsigned short setup); */ extern void update_gas_evolution_sanitycheck(SINGLEZONE *sz); -/* - * Takes into account each element's primordial abundance in the inflow - * - * Parameters - * ========== - * sz: A pointer to the singlezone object for this simulation - * - * source: ism.c - */ -extern void primordial_inflow(SINGLEZONE *sz); - /* * Determine the ISM mass outflow rate in a singlezone simulation. * diff --git a/vice/src/singlezone/singlezone.c b/vice/src/singlezone/singlezone.c index 33d8e287..29f7e727 100644 --- a/vice/src/singlezone/singlezone.c +++ b/vice/src/singlezone/singlezone.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include "../singlezone.h" @@ -110,18 +111,33 @@ extern void singlezone_evolve_no_setup_no_clean(SINGLEZONE *sz) { */ static unsigned short singlezone_timestepper(SINGLEZONE *sz) { + /* + * Change Note: version 1.3.1 + * + * update_gas_evolution is called before updating element masses in gas + * and star formation modes, but after updating element masses in infall + * mode. In practice this ensures that there are no timesteps worth of + * accretion of primordial gas missed and that there are no numerical + * artifacts if there are sudden changes in the star formation rate. + * This is largely in response to moving the addition of mass due to + * metal-rich infall to the update_element_mass function. + * + * See also change notes in ism.c, element.c. + */ + /* * Timestep number and current time get moved LAST. This is taken into * account in each of the following subroutines. */ unsigned int i; - update_gas_evolution(sz); + if (strcmp((*(*sz).ism).mode, "ifr")) update_gas_evolution(sz); for (i = 0; i < (*sz).n_elements; i++) { update_element_mass(*sz, (*sz).elements[i]); /* Now the ISM and this element are at the next timestep */ sz -> elements[i] -> Z[(*sz).timestep + 1l] = ( (*(*sz).elements[i]).mass / (*(*sz).ism).mass); } + if (!strcmp((*(*sz).ism).mode, "ifr")) update_gas_evolution(sz); update_MDF(sz); sz -> current_time += (*sz).dt; diff --git a/vice/src/singlezone/tests/cases/_zero_age_ssp.pyx b/vice/src/singlezone/tests/cases/_zero_age_ssp.pyx index a131acaf..90ce4707 100644 --- a/vice/src/singlezone/tests/cases/_zero_age_ssp.pyx +++ b/vice/src/singlezone/tests/cases/_zero_age_ssp.pyx @@ -35,7 +35,7 @@ def tau_star(t): The attribute tau_star as a function of time for the fiducial zero age SSP edge-case test. """ - if t > _TIMES_[-1]: + if t == _TIMES_[-1]: return 2 else: return float("inf") diff --git a/vice/src/singlezone/tests/ism.c b/vice/src/singlezone/tests/ism.c index ef747ba7..b96f86b6 100644 --- a/vice/src/singlezone/tests/ism.c +++ b/vice/src/singlezone/tests/ism.c @@ -98,17 +98,27 @@ extern unsigned short max_age_ssp_test_update_gas_evolution(SINGLEZONE *sz) { */ extern unsigned short zero_age_ssp_test_update_gas_evolution(SINGLEZONE *sz) { - unsigned short status = (*(*sz).ism).star_formation_rate > 0; + unsigned short status = (*(*sz).ism).star_formation_rate == 0; + status &= (*(*sz).ism).star_formation_history[(*sz).timestep - 1ul] > 0; if (status) { /* * Recalculate the ISM mass and compare based on a maximum percent - * difference to account for round-off error. With star formation at - * the timestep immediately following the end of the simulation, there - * is only the infall. + * difference to account for round-off error. There is one timestep's + * worth of star formation and outflows that must be taken into + * account since the episode of star formation isn't at the exact + * last timestep in detail. */ double ism_mass = (INITIAL_ISM_MASS + (*sz).current_time * (*(*sz).ism).infall_rate ); + ism_mass -= ( + (*(*sz).ism).star_formation_history[(*sz).timestep - 1ul] * + (1 - (*(*sz).ssp).crf[1]) * (*sz).dt + ); + ism_mass -= ( + (*(*sz).ism).star_formation_history[(*sz).timestep - 1ul] * + (*(*sz).ism).eta[(*sz).timestep - 1ul] * (*sz).dt + ); double percent_difference = absval( ((*(*sz).ism).mass - ism_mass) / (*(*sz).ism).mass ); diff --git a/vice/src/singlezone/tests/recycling.c b/vice/src/singlezone/tests/recycling.c index 6c15b705..01077f36 100644 --- a/vice/src/singlezone/tests/recycling.c +++ b/vice/src/singlezone/tests/recycling.c @@ -83,21 +83,18 @@ extern unsigned short max_age_ssp_test_mass_recycled(SINGLEZONE *sz) { extern unsigned short zero_age_ssp_test_mass_recycled(SINGLEZONE *sz) { unsigned short i, status = 1u; + double sfr = (*(*sz).ism).star_formation_history[(*sz).timestep - 1ul]; for (i = 0u; i < (*sz).n_elements; i++) { - double recycled = ( - (*(*sz).ism).star_formation_rate * (*sz).dt * - (*(*sz).elements[i]).Z[(*sz).timestep] * - (*(*sz).ssp).crf[1] - ); - double percent_difference = absval( - (recycled - mass_recycled(*sz, (*sz).elements[i])) / - mass_recycled(*sz, (*sz).elements[i]) - ); - status &= percent_difference < 1e-12; + /* + * The only stellar population to have formed is zero metallicity, so + * there shouldn't be any recycled metals... + */ + status &= mass_recycled(*sz, (*sz).elements[i]) == 0; if (!status) break; } + /* ... but there is recycled gas. */ status &= mass_recycled(*sz, NULL) == ( - (*(*sz).ism).star_formation_rate * (*sz).dt * (*(*sz).ssp).crf[1] + sfr * (*sz).dt * ((*(*sz).ssp).crf[2] - (*(*sz).ssp).crf[1]) ); return status; diff --git a/vice/src/singlezone/tests/singlezone.c b/vice/src/singlezone/tests/singlezone.c index cafd06bb..aefe9ae5 100644 --- a/vice/src/singlezone/tests/singlezone.c +++ b/vice/src/singlezone/tests/singlezone.c @@ -4,6 +4,7 @@ */ #include "../singlezone.h" +#include "../../utils.h" /* * Performs the quiescence edge-case test on the singlezone_stellar_mass @@ -67,11 +68,13 @@ extern unsigned short max_age_ssp_test_singlezone_stellar_mass(SINGLEZONE *sz) { */ extern unsigned short zero_age_ssp_test_singlezone_stellar_mass(SINGLEZONE *sz) { - /* - * The stellar mass calculation doesn't take into account stars currently - * formation, so this should be zero. - */ - return singlezone_stellar_mass(*sz) == 0; + /* In detail, the single episode of star formation is one timestep ago. */ + double mass = (*(*sz).ism).star_formation_history[(*sz).timestep - 1ul]; + mass *= (*sz).dt; + mass *= (1 - (*(*sz).ssp).crf[1]); + double percent_difference = absval( + singlezone_stellar_mass(*sz) - mass) / mass; + return percent_difference < 1e-12; } diff --git a/vice/src/yields/ccsne.c b/vice/src/yields/ccsne.c index cc09406b..4e729cfd 100644 --- a/vice/src/yields/ccsne.c +++ b/vice/src/yields/ccsne.c @@ -12,6 +12,7 @@ #include "../utils.h" #include "../ccsne.h" #include "../stats.h" +#include "../ssp.h" #include "ccsne.h" /* ---------- static function comment headers not duplicated here ---------- */ @@ -234,9 +235,21 @@ static double interpolate_yield(double m) { /* * The corrective term to subtract that accounts for initial abundances - * in calculating net yields + * in calculating net yields. + * + * Change Note: version 1.3.1 + * ========================== + * Prior versions did not subtract the remnant mass from the initial + * mass. This is a small correction for metals, but it is more + * noticeable for helium due to its high abundances. + * + * In detail this remnant mass is always 1.44 Msun at the mass range of + * interest here (M > * Msun progenitors), but we call the function + * anyway in the interest of readability since this is not a + * rate-limiting addition to this calculation and is more resistent to + * future bugs if the remnant mass parametrization changes. */ - double initial = Z_PROGENITOR * m; + double initial = Z_PROGENITOR * (m - Kalirai08_remnant_mass(m)); if (WEIGHT_INITIAL) initial *= callback_1arg_evaluate( *EXPLODABILITY, m); diff --git a/vice/toolkit/interpolation/interp_scheme_2d.py b/vice/toolkit/interpolation/interp_scheme_2d.py index b6e51a6f..764eb373 100644 --- a/vice/toolkit/interpolation/interp_scheme_2d.py +++ b/vice/toolkit/interpolation/interp_scheme_2d.py @@ -17,7 +17,7 @@ class interp_scheme_2d(c_interp_scheme_2d): Parameters ---------- - xccords : array-like + xcoords : array-like The attribute ``xcoords``. See below. ycoords : array-like The attribute ``ycoords``. See below. diff --git a/vice/yields/ccsne/_yield_integrator.pyx b/vice/yields/ccsne/_yield_integrator.pyx index 89a07331..56b69b3b 100644 --- a/vice/yields/ccsne/_yield_integrator.pyx +++ b/vice/yields/ccsne/_yield_integrator.pyx @@ -258,7 +258,8 @@ def integrate(element, study = "LC18", MoverH = 0, rotation = 0, This function evaluates the solution to the following equation: .. math:: y_x^\text{CC} = \frac{ - \int_8^u (E(m)m_x + w_x - Z_{x,\text{prog}}m) \frac{dN}{dm} dm + \int_8^u (E(m)m_x + w_x - Z_{x,\text{prog}}(m - m_\text{rem}(m))) + \frac{dN}{dm} dm }{ \int_l^u m \frac{dN}{dm} dm } @@ -266,11 +267,20 @@ def integrate(element, study = "LC18", MoverH = 0, rotation = 0, where :math:`E(m)` is the stellar explodability for progenitors of initial mass :math:`m`, :math:`m_x` is the mass of the element :math:`x` produced in the explosion, :math:`w_x` is the mass of the element :math:`x` ejected - in the wind, :math:`dN/dm` is the assumed stellar IMF, and - :math:`Z_{x,\text{prog}}` is the abundance by mass of the element :math:`x` - in the CCSN progenitor stars, whose values are stored in VICE's internal - data. If the keyword arg ``net = False``, :math:`Z_{x,\text{prog}}` is - simply set to zero to calculate a gross yield. + in the wind, :math:`dN/dm` is the assumed stellar IMF, :math:`m_\text{rem}` + is the mass of the remnant left behind by a star of initial mass :math:`m`, + and :math:`Z_{x,\text{prog}}` is the abundance by mass of the element + :math:`x` in the CCSN progenitor stars, whose values are stored in VICE's + internal data. If the keyword arg ``net = False``, :math:`Z_{x,\text{prog}}` + is simply set to zero to calculate a gross yield. Remnant masses are + computed according to the parametrization in Weinberg, Andrews & + Freudenburg (2017 [11]_; based on Kalirai et al. 2008 [12]_) where + :math:`m \geq 8 M_\odot` stars leave behind a 1.44 :math:`M_\odot` remnant. + Although there is debate surrounding the details of the initial-final + remnant mass relation, Weinberg, Andrews & Freudenburg (2017) demonstrate + that the details of how stellar envelopes are returned to the ISM is a + small correction in chemical evolution models, indicating that these + effects should not significantly impact conclusions. If a study does not report wind yields, or doesn't separate them from the explosive yields (i.e. anything other than LC18 or S16/* yield sets), then @@ -290,6 +300,15 @@ def integrate(element, study = "LC18", MoverH = 0, rotation = 0, which VICE applies a treatment of radioactive isotopes in its built-in tables. + .. versionadded:: 1.3.1 + Prior versions did not subtract the remnant mass from the initial + mass of the star for calculating net yields. This is a small correction + for metals but is more noticeable for helium. In this version, only the + simplified remnant mass model is adopted whereby massive stars of all + masses produce a 1.44 :math:`M_\odot` white dwarf. We plan to expand + upon these options for remnant mass models in future versions. + + Example Code ------------ >>> y, err = vice.yields.ccsne.fractional("o") @@ -312,6 +331,8 @@ def integrate(element, study = "LC18", MoverH = 0, rotation = 0, .. [9] Salpeter (1955), ApJ, 121, 161 .. [10] Press, Teukolsky, Vetterling & Flannery (2007), Numerical Recipes, Cambridge University Press + .. [11] Weinberg, Andrews & Freudenburg (2017), ApJ, 837, 183 + .. [12] Kalirai et al. (2008), ApJ, 676, 594 """ # Type checking errors diff --git a/vice/yields/sneia/gronow21/raw/table1.dat b/vice/yields/sneia/gronow21/raw/table1.dat index 504d0bd5..9cdc21f2 100644 --- a/vice/yields/sneia/gronow21/raw/table1.dat +++ b/vice/yields/sneia/gronow21/raw/table1.dat @@ -1,68 +1,68 @@ -12C 3.43e-03 1.26e-02 3.43e-03 1.26e-02 3.33e-03 1.21e-02 -13C 1.81e-09 2.42e-07 1.80e-09 2.32e-07 1.19e-09 9.05e-07 -14N 6.43e-07 9.97e-06 1.73e-06 9.67e-06 3.67e-05 1.29e-05 -15N 2.33e-07 2.11e-08 2.47e-07 2.06e-08 6.49e-07 2.62e-08 -16O 2.51e-03 1.44e-01 2.52e-03 1.44e-01 2.83e-03 1.46e-01 -17O 5.55e-08 3.48e-06 5.73e-08 3.40e-06 9.40e-08 4.32e-06 -18O 2.69e-07 4.71e-08 2.93e-07 4.54e-08 1.04e-06 6.96e-08 -19F 2.68e-07 6.87e-10 2.83e-07 7.22e-10 7.35e-07 4.97e-09 -20Ne 1.58e-03 6.42e-03 1.58e-03 6.42e-03 1.70e-03 5.70e-03 -21Ne 8.07e-07 2.38e-06 8.34e-07 2.29e-06 1.67e-06 7.77e-06 -22Ne 9.42e-07 1.47e-04 1.00e-06 1.43e-04 2.60e-06 8.18e-04 -23Na 1.03e-05 7.12e-05 1.03e-05 7.01e-05 1.06e-05 1.73e-04 -24Mg 2.04e-03 1.26e-02 2.04e-03 1.30e-02 2.16e-03 5.77e-03 -25Mg 3.46e-05 1.07e-04 3.49e-05 1.05e-04 4.90e-05 3.82e-04 -26Mg 3.56e-05 1.34e-04 3.56e-05 1.31e-04 3.71e-05 5.19e-04 -27Al 8.23e-05 5.28e-04 8.22e-05 5.31e-04 8.48e-05 6.76e-04 -28Si 4.15e-03 2.57e-01 4.16e-03 2.57e-01 4.38e-03 2.54e-01 -29Si 5.74e-05 7.62e-04 5.71e-05 7.54e-04 5.47e-05 2.56e-03 -30Si 7.15e-05 1.06e-03 7.14e-05 1.05e-03 7.29e-05 5.61e-03 -31P 6.62e-05 5.29e-04 6.62e-05 5.22e-04 6.89e-05 1.46e-03 -32S 2.34e-03 1.45e-01 2.35e-03 1.45e-01 2.59e-03 1.23e-01 -33S 1.33e-05 4.07e-04 1.33e-05 4.01e-04 1.58e-05 7.46e-04 -34S 1.14e-05 2.10e-03 1.14e-05 2.05e-03 1.32e-05 9.81e-03 -36S 6.46e-10 6.35e-08 3.18e-09 6.99e-08 3.24e-08 6.19e-06 -35Cl 4.61e-05 1.31e-04 4.63e-05 1.28e-04 5.50e-05 3.45e-04 -37Cl 6.60e-07 2.79e-05 6.76e-07 2.73e-05 1.22e-06 5.40e-05 -36Ar 1.06e-03 2.53e-02 1.07e-03 2.52e-02 1.23e-03 1.81e-02 -38Ar 2.00e-06 8.73e-04 2.05e-06 8.44e-04 3.66e-06 3.96e-03 -40Ar 4.72e-10 6.21e-09 4.13e-09 1.03e-08 3.25e-08 5.95e-07 -39K 9.16e-05 6.68e-05 9.23e-05 6.53e-05 1.20e-04 1.48e-04 -41K 5.60e-06 4.64e-06 5.56e-06 4.54e-06 4.82e-06 8.14e-06 -40Ca 3.13e-03 2.15e-02 3.13e-03 2.15e-02 3.03e-03 1.46e-02 -42Ca 6.36e-06 2.25e-05 6.42e-06 2.16e-05 8.27e-06 9.31e-05 -43Ca 1.78e-05 7.20e-08 1.79e-05 7.15e-08 2.00e-05 5.33e-07 -44Ca 2.26e-04 1.30e-05 2.25e-04 1.30e-05 1.91e-04 1.01e-05 -46Ca 1.56e-10 2.64e-10 1.50e-09 2.35e-09 1.23e-08 2.82e-07 -48Ca 2.86e-11 3.09e-11 2.73e-10 3.00e-10 5.21e-09 2.60e-08 -45Sc 1.13e-06 2.23e-07 1.13e-06 2.23e-07 9.56e-07 7.69e-07 -46Ti 9.30e-07 8.28e-06 9.34e-07 7.99e-06 1.07e-06 3.04e-05 -47Ti 7.18e-06 3.23e-07 7.14e-06 3.17e-07 5.88e-06 1.80e-06 -48Ti 8.33e-06 3.21e-04 8.23e-06 3.22e-04 6.14e-06 2.17e-04 -49Ti 2.86e-07 1.87e-05 2.83e-07 1.86e-05 2.20e-07 2.56e-05 -50Ti 1.25e-10 7.16e-10 1.28e-09 4.64e-09 4.33e-08 7.48e-07 -50V 1.28e-10 4.15e-09 1.77e-10 5.15e-09 3.84e-09 1.98e-07 -51V 2.57e-07 4.51e-05 2.56e-07 4.46e-05 2.47e-07 9.21e-05 -50Cr 1.30e-07 1.39e-04 1.30e-07 1.37e-04 1.29e-07 6.93e-04 -52Cr 8.65e-07 6.20e-03 8.78e-07 6.21e-03 1.35e-06 4.87e-03 -53Cr 2.90e-08 4.66e-04 3.19e-08 4.62e-04 1.55e-07 8.24e-04 -54Cr 2.74e-10 2.17e-08 2.82e-09 3.62e-08 1.19e-07 1.42e-06 -55Mn 1.09e-07 2.19e-03 1.28e-07 2.17e-03 8.88e-07 4.61e-03 -54Fe 2.20e-08 1.34e-02 7.53e-08 1.31e-02 1.87e-06 5.41e-02 -56Fe 8.98e-07 1.40e-01 1.75e-06 1.40e-01 3.40e-05 1.17e-01 -57Fe 9.69e-08 1.22e-03 2.00e-07 1.22e-03 6.39e-06 2.21e-03 -58Fe 8.95e-09 3.13e-08 9.77e-08 2.65e-07 7.06e-06 9.47e-06 -59Co 3.05e-08 1.21e-06 2.12e-07 1.57e-06 8.03e-06 2.77e-05 -58Ni 4.26e-08 1.15e-03 1.89e-07 1.13e-03 9.23e-06 4.60e-03 -60Ni 1.17e-07 8.42e-06 5.49e-07 1.37e-05 6.29e-06 2.15e-04 -61Ni 3.38e-08 2.36e-07 2.13e-07 7.28e-07 2.13e-06 2.60e-05 -62Ni 4.93e-08 1.36e-06 3.73e-07 4.28e-06 2.71e-06 1.43e-04 -64Ni 1.13e-09 1.29e-08 1.16e-08 1.25e-07 2.08e-07 1.17e-05 -63Cu 7.17e-09 4.58e-08 4.31e-08 4.49e-07 5.17e-07 1.06e-05 -64Zn 1.08e-08 9.90e-08 2.24e-08 7.80e-07 1.27e-07 2.13e-06 -66Zn 4.87e-09 2.01e-07 3.44e-08 1.78e-06 1.91e-07 1.94e-05 -67Zn 8.20e-10 2.89e-09 6.37e-09 2.79e-08 2.46e-08 1.70e-06 -68Zn 7.00e-10 1.00e-08 5.59e-09 9.69e-08 3.67e-08 3.47e-06 -70Zn 6.84e-12 9.76e-11 7.75e-11 9.44e-10 7.45e-09 7.57e-08 -69Ga 7.03e-11 5.99e-09 6.65e-10 5.83e-08 1.43e-08 5.47e-07 -71Ga 3.99e-11 7.92e-10 4.02e-10 7.54e-09 9.63e-09 2.25e-07 +12C 3.43e-03 1.26e-02 3.43e-03 1.26e-02 3.33e-03 1.21e-02 +13C 1.81e-09 2.42e-07 1.80e-09 2.32e-07 1.19e-09 9.05e-07 +14N 6.43e-07 9.97e-06 1.73e-06 9.67e-06 3.67e-05 1.29e-05 +15N 2.33e-07 2.11e-08 2.47e-07 2.06e-08 6.49e-07 2.62e-08 +16O 2.51e-03 1.44e-01 2.52e-03 1.44e-01 2.83e-03 1.46e-01 +17O 5.55e-08 3.48e-06 5.73e-08 3.40e-06 9.40e-08 4.32e-06 +18O 2.69e-07 4.71e-08 2.93e-07 4.54e-08 1.04e-06 6.96e-08 +19F 2.68e-07 6.87e-10 2.83e-07 7.22e-10 7.35e-07 4.97e-09 +20Ne 1.58e-03 6.42e-03 1.58e-03 6.42e-03 1.70e-03 5.70e-03 +21Ne 8.07e-07 2.38e-06 8.34e-07 2.29e-06 1.67e-06 7.77e-06 +22Ne 9.42e-07 1.47e-04 1.00e-06 1.43e-04 2.60e-06 8.18e-04 +23Na 1.03e-05 7.12e-05 1.03e-05 7.01e-05 1.06e-05 1.73e-04 +24Mg 2.04e-03 1.26e-02 2.04e-03 1.30e-02 2.16e-03 5.77e-03 +25Mg 3.46e-05 1.07e-04 3.49e-05 1.05e-04 4.90e-05 3.82e-04 +26Mg 3.56e-05 1.34e-04 3.56e-05 1.31e-04 3.71e-05 5.19e-04 +27Al 8.23e-05 5.28e-04 8.22e-05 5.31e-04 8.48e-05 6.76e-04 +28Si 4.15e-03 2.57e-01 4.16e-03 2.57e-01 4.38e-03 2.54e-01 +29Si 5.74e-05 7.62e-04 5.71e-05 7.54e-04 5.47e-05 2.56e-03 +30Si 7.15e-05 1.06e-03 7.14e-05 1.05e-03 7.29e-05 5.61e-03 +31P 6.62e-05 5.29e-04 6.62e-05 5.22e-04 6.89e-05 1.46e-03 +32S 2.34e-03 1.45e-01 2.35e-03 1.45e-01 2.59e-03 1.23e-01 +33S 1.33e-05 4.07e-04 1.33e-05 4.01e-04 1.58e-05 7.46e-04 +34S 1.14e-05 2.10e-03 1.14e-05 2.05e-03 1.32e-05 9.81e-03 +36S 6.46e-10 6.35e-08 3.18e-09 6.99e-08 3.24e-08 6.19e-06 +35Cl 4.61e-05 1.31e-04 4.63e-05 1.28e-04 5.50e-05 3.45e-04 +37Cl 6.60e-07 2.79e-05 6.76e-07 2.73e-05 1.22e-06 5.40e-05 +36Ar 1.06e-03 2.53e-02 1.07e-03 2.52e-02 1.23e-03 1.81e-02 +38Ar 2.00e-06 8.73e-04 2.05e-06 8.44e-04 3.66e-06 3.96e-03 +40Ar 4.72e-10 6.21e-09 4.13e-09 1.03e-08 3.25e-08 5.95e-07 +39K 9.16e-05 6.68e-05 9.23e-05 6.53e-05 1.20e-04 1.48e-04 +41K 5.60e-06 4.64e-06 5.56e-06 4.54e-06 4.82e-06 8.14e-06 +40Ca 3.13e-03 2.15e-02 3.13e-03 2.15e-02 3.03e-03 1.46e-02 +42Ca 6.36e-06 2.25e-05 6.42e-06 2.16e-05 8.27e-06 9.31e-05 +43Ca 1.78e-05 7.20e-08 1.79e-05 7.15e-08 2.00e-05 5.33e-07 +44Ca 2.26e-04 1.30e-05 2.25e-04 1.30e-05 1.91e-04 1.01e-05 +46Ca 1.56e-10 2.64e-10 1.50e-09 2.35e-09 1.23e-08 2.82e-07 +48Ca 2.86e-11 3.09e-11 2.73e-10 3.00e-10 5.21e-09 2.60e-08 +45Sc 1.13e-06 2.23e-07 1.13e-06 2.23e-07 9.56e-07 7.69e-07 +46Ti 9.30e-07 8.28e-06 9.34e-07 7.99e-06 1.07e-06 3.04e-05 +47Ti 7.18e-06 3.23e-07 7.14e-06 3.17e-07 5.88e-06 1.80e-06 +48Ti 8.33e-06 3.21e-04 8.23e-06 3.22e-04 6.14e-06 2.17e-04 +49Ti 2.86e-07 1.87e-05 2.83e-07 1.86e-05 2.20e-07 2.56e-05 +50Ti 1.25e-10 7.16e-10 1.28e-09 4.64e-09 4.33e-08 7.48e-07 +50V 1.28e-10 4.15e-09 1.77e-10 5.15e-09 3.84e-09 1.98e-07 +51V 2.57e-07 4.51e-05 2.56e-07 4.46e-05 2.47e-07 9.21e-05 +50Cr 1.30e-07 1.39e-04 1.30e-07 1.37e-04 1.29e-07 6.93e-04 +52Cr 8.65e-07 6.20e-03 8.78e-07 6.21e-03 1.35e-06 4.87e-03 +53Cr 2.90e-08 4.66e-04 3.19e-08 4.62e-04 1.55e-07 8.24e-04 +54Cr 2.74e-10 2.17e-08 2.82e-09 3.62e-08 1.19e-07 1.42e-06 +55Mn 1.09e-07 2.19e-03 1.28e-07 2.17e-03 8.88e-07 4.61e-03 +54Fe 2.20e-08 1.34e-02 7.53e-08 1.31e-02 1.87e-06 5.41e-02 +56Fe 8.98e-07 1.40e-01 1.75e-06 1.40e-01 3.40e-05 1.17e-01 +57Fe 9.69e-08 1.22e-03 2.00e-07 1.22e-03 6.39e-06 2.21e-03 +58Fe 8.95e-09 3.13e-08 9.77e-08 2.65e-07 7.06e-06 9.47e-06 +59Co 3.05e-08 1.21e-06 2.12e-07 1.57e-06 8.03e-06 2.77e-05 +58Ni 4.26e-08 1.15e-03 1.89e-07 1.13e-03 9.23e-06 4.60e-03 +60Ni 1.17e-07 8.42e-06 5.49e-07 1.37e-05 6.29e-06 2.15e-04 +61Ni 3.38e-08 2.36e-07 2.13e-07 7.28e-07 2.13e-06 2.60e-05 +62Ni 4.93e-08 1.36e-06 3.73e-07 4.28e-06 2.71e-06 1.43e-04 +64Ni 1.13e-09 1.29e-08 1.16e-08 1.25e-07 2.08e-07 1.17e-05 +63Cu 7.17e-09 4.58e-08 4.31e-08 4.49e-07 5.17e-07 1.06e-05 +64Zn 1.08e-08 9.90e-08 2.24e-08 7.80e-07 1.27e-07 2.13e-06 +66Zn 4.87e-09 2.01e-07 3.44e-08 1.78e-06 1.91e-07 1.94e-05 +67Zn 8.20e-10 2.89e-09 6.37e-09 2.79e-08 2.46e-08 1.70e-06 +68Zn 7.00e-10 1.00e-08 5.59e-09 9.69e-08 3.67e-08 3.47e-06 +70Zn 6.84e-12 9.76e-11 7.75e-11 9.44e-10 7.45e-09 7.57e-08 +69Ga 7.03e-11 5.99e-09 6.65e-10 5.83e-08 1.43e-08 5.47e-07 +71Ga 3.99e-11 7.92e-10 4.02e-10 7.54e-09 9.63e-09 2.25e-07 diff --git a/vice/yields/sneia/gronow21/raw/table10.dat b/vice/yields/sneia/gronow21/raw/table10.dat index 82fcce91..7a09a582 100644 --- a/vice/yields/sneia/gronow21/raw/table10.dat +++ b/vice/yields/sneia/gronow21/raw/table10.dat @@ -1,68 +1,68 @@ -12C 7.39e-06 2.46e-06 7.25e-06 2.47e-06 7.52e-06 1.12e-06 -13C 4.23e-09 2.49e-12 4.21e-09 2.57e-12 3.65e-09 1.12e-12 -14N 1.25e-07 3.04e-12 1.16e-06 3.13e-12 3.46e-05 1.88e-11 -15N 3.15e-10 2.12e-12 3.27e-10 2.13e-12 8.11e-10 4.36e-11 -16O 3.02e-03 2.70e-03 3.02e-03 2.70e-03 3.24e-03 2.75e-03 -17O 1.98e-10 4.28e-16 1.57e-09 4.26e-16 4.56e-08 6.50e-16 -18O 1.61e-09 1.60e-17 8.88e-09 1.59e-17 2.43e-07 1.62e-11 -19F 2.39e-10 1.53e-19 3.53e-10 1.54e-19 4.14e-09 9.82e-15 -20Ne 1.74e-06 1.05e-07 1.98e-06 1.03e-07 9.96e-06 1.16e-07 -21Ne 1.17e-08 5.33e-13 1.23e-08 5.27e-13 2.91e-08 9.70e-13 -22Ne 1.53e-08 5.44e-13 3.33e-08 5.57e-13 6.18e-07 1.84e-10 -23Na 1.61e-09 1.12e-10 7.83e-09 1.10e-10 2.09e-07 3.51e-10 -24Mg 2.27e-04 1.02e-04 2.32e-04 1.06e-04 2.53e-04 4.12e-05 -25Mg 7.32e-07 1.50e-08 7.62e-07 1.57e-08 1.68e-06 1.00e-08 -26Mg 8.44e-07 1.08e-08 8.66e-07 1.12e-08 1.59e-06 2.23e-08 -27Al 2.11e-06 1.68e-06 2.16e-06 1.73e-06 2.67e-06 1.94e-06 -28Si 3.68e-02 7.28e-02 3.68e-02 7.28e-02 3.75e-02 7.29e-02 -29Si 3.33e-05 1.07e-05 3.36e-05 1.08e-05 3.61e-05 2.40e-05 -30Si 5.15e-05 1.10e-05 5.22e-05 1.10e-05 5.60e-05 6.55e-05 -31P 2.31e-05 9.49e-06 2.31e-05 9.43e-06 2.45e-05 3.10e-05 -32S 1.59e-02 5.55e-02 1.59e-02 5.56e-02 1.61e-02 4.85e-02 -33S 1.58e-05 1.02e-05 1.58e-05 1.00e-05 1.67e-05 2.77e-05 -34S 1.50e-04 6.91e-05 1.50e-04 6.76e-05 1.51e-04 3.53e-04 -36S 3.34e-10 3.68e-10 4.01e-10 3.63e-10 1.35e-09 4.22e-09 -35Cl 8.94e-06 3.81e-06 8.89e-06 3.74e-06 8.95e-06 1.19e-05 -37Cl 1.63e-06 1.67e-06 1.62e-06 1.64e-06 1.68e-06 4.14e-06 -36Ar 2.79e-03 1.28e-02 2.79e-03 1.28e-02 2.82e-03 1.05e-02 -38Ar 4.40e-05 3.90e-05 4.37e-05 3.77e-05 4.51e-05 1.96e-04 -40Ar 3.76e-11 5.19e-11 4.70e-11 5.00e-11 3.35e-10 2.82e-10 -39K 9.96e-06 4.57e-06 1.00e-05 4.49e-06 1.29e-05 1.17e-05 -41K 3.19e-07 4.10e-07 3.21e-07 4.03e-07 4.79e-07 8.57e-07 -40Ca 3.43e-03 1.42e-02 3.43e-03 1.42e-02 3.48e-03 1.14e-02 -42Ca 8.96e-07 1.15e-06 8.95e-07 1.11e-06 1.26e-06 4.89e-06 -43Ca 4.65e-06 4.09e-07 4.62e-06 4.11e-07 4.55e-06 1.09e-07 -44Ca 2.68e-04 2.04e-05 2.68e-04 2.04e-05 2.78e-04 1.25e-05 -46Ca 1.38e-13 3.20e-14 1.57e-12 2.73e-14 3.94e-11 5.58e-12 -48Ca 6.10e-12 3.16e-15 6.11e-11 3.86e-19 1.83e-09 9.46e-15 -45Sc 2.59e-07 5.86e-08 2.60e-07 5.80e-08 4.16e-07 1.06e-07 -46Ti 9.78e-06 5.98e-07 9.66e-06 5.80e-07 6.51e-06 3.16e-06 -47Ti 1.72e-05 7.81e-07 1.71e-05 7.80e-07 1.66e-05 5.36e-07 -48Ti 5.30e-04 4.14e-04 5.32e-04 4.14e-04 5.97e-04 3.00e-04 -49Ti 9.15e-06 2.01e-05 9.20e-06 1.99e-05 1.12e-05 3.18e-05 -50Ti 1.23e-11 2.15e-10 1.10e-10 8.78e-11 2.11e-09 1.79e-08 -50V 3.23e-11 3.83e-11 3.89e-11 4.36e-11 3.28e-10 8.07e-10 -51V 8.52e-05 4.91e-05 8.50e-05 4.86e-05 7.96e-05 1.05e-04 -50Cr 1.03e-04 7.59e-05 1.03e-04 7.44e-05 8.37e-05 3.89e-04 -52Cr 1.97e-03 9.27e-03 1.97e-03 9.28e-03 2.06e-03 7.22e-03 -53Cr 5.50e-05 6.23e-04 5.53e-05 6.19e-04 6.65e-05 1.07e-03 -54Cr 1.74e-09 1.14e-08 1.95e-09 1.72e-09 1.44e-08 2.51e-07 -55Mn 2.52e-04 3.16e-03 2.53e-04 3.13e-03 2.78e-04 7.24e-03 -54Fe 9.41e-04 1.05e-02 9.48e-04 1.03e-02 1.17e-03 4.89e-02 -56Fe 3.95e-02 7.45e-01 3.95e-02 7.45e-01 3.90e-02 6.52e-01 -57Fe 1.37e-03 1.41e-02 1.37e-03 1.40e-02 1.50e-03 2.49e-02 -58Fe 4.72e-10 1.44e-07 1.60e-09 7.18e-10 3.52e-08 6.49e-07 -59Co 4.51e-04 5.19e-04 4.47e-04 5.14e-04 3.19e-04 1.18e-03 -58Ni 5.86e-04 1.39e-02 5.86e-04 1.36e-02 5.58e-04 6.84e-02 -60Ni 2.07e-03 1.16e-02 2.07e-03 1.16e-02 2.02e-03 6.70e-03 -61Ni 1.41e-04 3.81e-04 1.41e-04 3.80e-04 1.44e-04 4.02e-04 -62Ni 9.91e-05 2.25e-03 9.90e-05 2.22e-03 9.61e-05 6.05e-03 -64Ni 1.65e-11 2.03e-07 1.65e-10 1.07e-11 4.92e-09 8.11e-09 -63Cu 1.39e-05 8.70e-07 1.39e-05 8.56e-07 1.60e-05 3.90e-06 -64Zn 2.16e-04 3.69e-05 2.16e-04 3.72e-05 2.26e-04 1.27e-05 -66Zn 1.44e-05 4.25e-05 1.45e-05 4.20e-05 1.63e-05 7.98e-05 -67Zn 3.23e-07 2.45e-08 3.40e-07 2.37e-08 5.96e-07 7.59e-08 -68Zn 1.38e-07 1.02e-08 2.05e-07 9.21e-09 4.85e-07 8.51e-08 -70Zn 2.69e-13 4.07e-11 2.68e-12 9.93e-16 7.94e-11 2.10e-12 -69Ga 6.90e-09 3.71e-12 1.34e-08 2.28e-11 2.27e-08 2.98e-10 -71Ga 3.88e-10 1.60e-12 9.89e-10 7.60e-13 1.84e-09 3.99e-11 +12C 7.39e-06 2.46e-06 7.25e-06 2.47e-06 7.52e-06 1.12e-06 +13C 4.23e-09 2.49e-12 4.21e-09 2.57e-12 3.65e-09 1.12e-12 +14N 1.25e-07 3.04e-12 1.16e-06 3.13e-12 3.46e-05 1.88e-11 +15N 3.15e-10 2.12e-12 3.27e-10 2.13e-12 8.11e-10 4.36e-11 +16O 3.02e-03 2.70e-03 3.02e-03 2.70e-03 3.24e-03 2.75e-03 +17O 1.98e-10 4.28e-16 1.57e-09 4.26e-16 4.56e-08 6.50e-16 +18O 1.61e-09 1.60e-17 8.88e-09 1.59e-17 2.43e-07 1.62e-11 +19F 2.39e-10 1.53e-19 3.53e-10 1.54e-19 4.14e-09 9.82e-15 +20Ne 1.74e-06 1.05e-07 1.98e-06 1.03e-07 9.96e-06 1.16e-07 +21Ne 1.17e-08 5.33e-13 1.23e-08 5.27e-13 2.91e-08 9.70e-13 +22Ne 1.53e-08 5.44e-13 3.33e-08 5.57e-13 6.18e-07 1.84e-10 +23Na 1.61e-09 1.12e-10 7.83e-09 1.10e-10 2.09e-07 3.51e-10 +24Mg 2.27e-04 1.02e-04 2.32e-04 1.06e-04 2.53e-04 4.12e-05 +25Mg 7.32e-07 1.50e-08 7.62e-07 1.57e-08 1.68e-06 1.00e-08 +26Mg 8.44e-07 1.08e-08 8.66e-07 1.12e-08 1.59e-06 2.23e-08 +27Al 2.11e-06 1.68e-06 2.16e-06 1.73e-06 2.67e-06 1.94e-06 +28Si 3.68e-02 7.28e-02 3.68e-02 7.28e-02 3.75e-02 7.29e-02 +29Si 3.33e-05 1.07e-05 3.36e-05 1.08e-05 3.61e-05 2.40e-05 +30Si 5.15e-05 1.10e-05 5.22e-05 1.10e-05 5.60e-05 6.55e-05 +31P 2.31e-05 9.49e-06 2.31e-05 9.43e-06 2.45e-05 3.10e-05 +32S 1.59e-02 5.55e-02 1.59e-02 5.56e-02 1.61e-02 4.85e-02 +33S 1.58e-05 1.02e-05 1.58e-05 1.00e-05 1.67e-05 2.77e-05 +34S 1.50e-04 6.91e-05 1.50e-04 6.76e-05 1.51e-04 3.53e-04 +36S 3.34e-10 3.68e-10 4.01e-10 3.63e-10 1.35e-09 4.22e-09 +35Cl 8.94e-06 3.81e-06 8.89e-06 3.74e-06 8.95e-06 1.19e-05 +37Cl 1.63e-06 1.67e-06 1.62e-06 1.64e-06 1.68e-06 4.14e-06 +36Ar 2.79e-03 1.28e-02 2.79e-03 1.28e-02 2.82e-03 1.05e-02 +38Ar 4.40e-05 3.90e-05 4.37e-05 3.77e-05 4.51e-05 1.96e-04 +40Ar 3.76e-11 5.19e-11 4.70e-11 5.00e-11 3.35e-10 2.82e-10 +39K 9.96e-06 4.57e-06 1.00e-05 4.49e-06 1.29e-05 1.17e-05 +41K 3.19e-07 4.10e-07 3.21e-07 4.03e-07 4.79e-07 8.57e-07 +40Ca 3.43e-03 1.42e-02 3.43e-03 1.42e-02 3.48e-03 1.14e-02 +42Ca 8.96e-07 1.15e-06 8.95e-07 1.11e-06 1.26e-06 4.89e-06 +43Ca 4.65e-06 4.09e-07 4.62e-06 4.11e-07 4.55e-06 1.09e-07 +44Ca 2.68e-04 2.04e-05 2.68e-04 2.04e-05 2.78e-04 1.25e-05 +46Ca 1.38e-13 3.20e-14 1.57e-12 2.73e-14 3.94e-11 5.58e-12 +48Ca 6.10e-12 3.16e-15 6.11e-11 3.86e-19 1.83e-09 9.46e-15 +45Sc 2.59e-07 5.86e-08 2.60e-07 5.80e-08 4.16e-07 1.06e-07 +46Ti 9.78e-06 5.98e-07 9.66e-06 5.80e-07 6.51e-06 3.16e-06 +47Ti 1.72e-05 7.81e-07 1.71e-05 7.80e-07 1.66e-05 5.36e-07 +48Ti 5.30e-04 4.14e-04 5.32e-04 4.14e-04 5.97e-04 3.00e-04 +49Ti 9.15e-06 2.01e-05 9.20e-06 1.99e-05 1.12e-05 3.18e-05 +50Ti 1.23e-11 2.15e-10 1.10e-10 8.78e-11 2.11e-09 1.79e-08 +50V 3.23e-11 3.83e-11 3.89e-11 4.36e-11 3.28e-10 8.07e-10 +51V 8.52e-05 4.91e-05 8.50e-05 4.86e-05 7.96e-05 1.05e-04 +50Cr 1.03e-04 7.59e-05 1.03e-04 7.44e-05 8.37e-05 3.89e-04 +52Cr 1.97e-03 9.27e-03 1.97e-03 9.28e-03 2.06e-03 7.22e-03 +53Cr 5.50e-05 6.23e-04 5.53e-05 6.19e-04 6.65e-05 1.07e-03 +54Cr 1.74e-09 1.14e-08 1.95e-09 1.72e-09 1.44e-08 2.51e-07 +55Mn 2.52e-04 3.16e-03 2.53e-04 3.13e-03 2.78e-04 7.24e-03 +54Fe 9.41e-04 1.05e-02 9.48e-04 1.03e-02 1.17e-03 4.89e-02 +56Fe 3.95e-02 7.45e-01 3.95e-02 7.45e-01 3.90e-02 6.52e-01 +57Fe 1.37e-03 1.41e-02 1.37e-03 1.40e-02 1.50e-03 2.49e-02 +58Fe 4.72e-10 1.44e-07 1.60e-09 7.18e-10 3.52e-08 6.49e-07 +59Co 4.51e-04 5.19e-04 4.47e-04 5.14e-04 3.19e-04 1.18e-03 +58Ni 5.86e-04 1.39e-02 5.86e-04 1.36e-02 5.58e-04 6.84e-02 +60Ni 2.07e-03 1.16e-02 2.07e-03 1.16e-02 2.02e-03 6.70e-03 +61Ni 1.41e-04 3.81e-04 1.41e-04 3.80e-04 1.44e-04 4.02e-04 +62Ni 9.91e-05 2.25e-03 9.90e-05 2.22e-03 9.61e-05 6.05e-03 +64Ni 1.65e-11 2.03e-07 1.65e-10 1.07e-11 4.92e-09 8.11e-09 +63Cu 1.39e-05 8.70e-07 1.39e-05 8.56e-07 1.60e-05 3.90e-06 +64Zn 2.16e-04 3.69e-05 2.16e-04 3.72e-05 2.26e-04 1.27e-05 +66Zn 1.44e-05 4.25e-05 1.45e-05 4.20e-05 1.63e-05 7.98e-05 +67Zn 3.23e-07 2.45e-08 3.40e-07 2.37e-08 5.96e-07 7.59e-08 +68Zn 1.38e-07 1.02e-08 2.05e-07 9.21e-09 4.85e-07 8.51e-08 +70Zn 2.69e-13 4.07e-11 2.68e-12 9.93e-16 7.94e-11 2.10e-12 +69Ga 6.90e-09 3.71e-12 1.34e-08 2.28e-11 2.27e-08 2.98e-10 +71Ga 3.88e-10 1.60e-12 9.89e-10 7.60e-13 1.84e-09 3.99e-11 diff --git a/vice/yields/sneia/gronow21/raw/table11.dat b/vice/yields/sneia/gronow21/raw/table11.dat index 69395d7f..60a06b83 100644 --- a/vice/yields/sneia/gronow21/raw/table11.dat +++ b/vice/yields/sneia/gronow21/raw/table11.dat @@ -1,68 +1,68 @@ -12C 5.24e-06 3.11e-06 5.27e-06 3.12e-06 5.65e-06 1.23e-06 -13C 1.01e-09 3.17e-12 1.00e-09 3.27e-12 8.18e-10 1.04e-12 -14N 1.38e-07 7.05e-13 1.20e-06 7.21e-13 3.54e-05 4.99e-11 -15N 2.43e-09 1.14e-12 2.56e-09 1.15e-12 6.49e-09 1.37e-10 -16O 3.74e-03 7.48e-04 3.74e-03 7.47e-04 4.02e-03 7.62e-04 -17O 1.96e-10 1.02e-16 1.60e-09 1.02e-16 4.67e-08 5.95e-16 -18O 4.18e-09 3.96e-18 1.18e-08 3.96e-18 2.56e-07 6.23e-11 -19F 8.08e-10 9.86e-20 9.57e-10 9.97e-20 5.73e-09 3.40e-14 -20Ne 7.67e-07 4.48e-08 1.02e-06 4.43e-08 9.37e-06 3.90e-08 -21Ne 7.03e-09 1.52e-13 7.80e-09 1.51e-13 3.29e-08 2.64e-13 -22Ne 1.11e-08 1.74e-13 2.98e-08 1.77e-13 6.33e-07 6.86e-10 -23Na 2.98e-09 3.96e-11 9.36e-09 3.91e-11 2.15e-07 3.04e-10 -24Mg 2.98e-04 2.07e-05 3.03e-04 2.15e-05 3.40e-04 9.17e-06 -25Mg 2.44e-07 2.90e-09 2.72e-07 3.04e-09 1.19e-06 1.83e-09 -26Mg 3.30e-07 1.89e-09 3.59e-07 1.97e-09 1.31e-06 3.77e-09 -27Al 2.51e-06 3.15e-07 2.57e-06 3.23e-07 3.20e-06 3.61e-07 -28Si 5.55e-02 4.54e-02 5.55e-02 4.54e-02 5.62e-02 4.43e-02 -29Si 4.59e-05 3.15e-06 4.62e-05 3.18e-06 5.07e-05 7.57e-06 -30Si 6.09e-05 2.80e-06 6.15e-05 2.88e-06 6.96e-05 1.62e-05 -31P 3.60e-05 3.34e-06 3.62e-05 3.33e-06 3.94e-05 1.03e-05 -32S 2.45e-02 3.76e-02 2.45e-02 3.76e-02 2.45e-02 3.35e-02 -33S 2.65e-05 3.98e-06 2.65e-05 3.94e-06 2.85e-05 1.06e-05 -34S 1.80e-04 2.18e-05 1.80e-04 2.15e-05 1.96e-04 1.15e-04 -36S 4.31e-10 8.10e-11 4.67e-10 8.51e-11 1.50e-09 7.47e-10 -35Cl 1.00e-05 1.85e-06 1.00e-05 1.83e-06 1.15e-05 4.61e-06 -37Cl 3.57e-06 8.73e-07 3.57e-06 8.62e-07 3.95e-06 1.94e-06 -36Ar 4.34e-03 9.35e-03 4.34e-03 9.36e-03 4.35e-03 7.97e-03 -38Ar 7.81e-05 1.57e-05 7.81e-05 1.52e-05 8.93e-05 7.88e-05 -40Ar 7.68e-11 1.97e-11 8.59e-11 1.92e-11 3.92e-10 9.32e-11 -39K 1.51e-05 2.95e-06 1.52e-05 2.92e-06 1.98e-05 5.22e-06 -41K 9.97e-07 2.58e-07 1.00e-06 2.55e-07 1.30e-06 4.85e-07 -40Ca 5.72e-03 1.09e-02 5.72e-03 1.09e-02 5.85e-03 9.10e-03 -42Ca 2.19e-06 6.32e-07 2.20e-06 6.16e-07 2.93e-06 2.14e-06 -43Ca 2.60e-06 5.40e-07 2.59e-06 5.43e-07 2.42e-06 1.29e-07 -44Ca 1.53e-04 2.05e-05 1.53e-04 2.05e-05 1.74e-04 1.15e-05 -46Ca 1.45e-13 2.14e-15 1.40e-12 6.86e-15 4.08e-11 4.18e-13 -48Ca 6.27e-12 3.32e-21 6.27e-11 1.37e-19 1.88e-09 7.17e-15 -45Sc 4.64e-07 4.56e-08 4.68e-07 4.52e-08 7.37e-07 8.50e-08 -46Ti 2.95e-06 3.22e-07 2.96e-06 3.14e-07 3.55e-06 1.59e-06 -47Ti 5.71e-06 9.79e-07 5.72e-06 9.79e-07 6.56e-06 5.31e-07 -48Ti 7.17e-04 3.52e-04 7.19e-04 3.53e-04 8.03e-04 2.57e-04 -49Ti 1.39e-05 1.63e-05 1.40e-05 1.62e-05 1.67e-05 2.68e-05 -50Ti 1.32e-11 1.44e-12 7.86e-11 2.04e-11 2.30e-09 1.32e-08 -50V 5.28e-11 1.14e-11 6.52e-11 1.50e-11 6.19e-10 2.61e-10 -51V 3.15e-05 4.01e-05 3.16e-05 3.97e-05 3.63e-05 8.80e-05 -50Cr 4.09e-05 5.39e-05 4.10e-05 5.29e-05 4.57e-05 2.66e-04 -52Cr 2.04e-03 7.80e-03 2.05e-03 7.81e-03 2.24e-03 6.11e-03 -53Cr 7.19e-05 5.16e-04 7.21e-05 5.13e-04 8.16e-05 8.97e-04 -54Cr 4.45e-09 7.59e-10 4.77e-09 1.14e-09 2.32e-08 1.71e-07 -55Mn 2.14e-04 2.63e-03 2.15e-04 2.61e-03 2.32e-04 6.14e-03 -54Fe 1.48e-03 7.96e-03 1.49e-03 7.82e-03 1.77e-03 3.78e-02 -56Fe 1.24e-02 8.47e-01 1.24e-02 8.48e-01 1.14e-02 7.46e-01 -57Fe 3.04e-04 1.77e-02 3.04e-04 1.76e-02 3.00e-04 3.35e-02 -58Fe 1.15e-09 2.69e-10 2.46e-09 4.32e-10 3.98e-08 4.95e-07 -59Co 5.17e-05 7.12e-04 5.10e-05 7.06e-04 3.47e-05 2.05e-03 -58Ni 1.91e-04 1.83e-02 1.91e-04 1.79e-02 2.11e-04 8.08e-02 -60Ni 2.72e-04 1.54e-02 2.71e-04 1.54e-02 2.42e-04 8.87e-03 -61Ni 2.01e-05 5.15e-04 2.00e-05 5.14e-04 1.78e-05 5.10e-04 -62Ni 2.09e-05 3.08e-03 2.10e-05 3.04e-03 2.27e-05 7.57e-03 -64Ni 1.73e-11 1.23e-13 1.72e-10 1.22e-12 5.06e-09 1.28e-09 -63Cu 7.84e-06 1.22e-06 7.82e-06 1.20e-06 7.33e-06 5.23e-06 -64Zn 3.52e-05 4.88e-05 3.49e-05 4.92e-05 2.72e-05 1.69e-05 -66Zn 2.86e-06 5.82e-05 2.86e-06 5.75e-05 2.69e-06 1.01e-04 -67Zn 1.76e-07 3.39e-08 1.80e-07 3.34e-08 1.95e-07 9.78e-08 -68Zn 8.39e-08 1.34e-08 1.09e-07 1.31e-08 1.30e-07 1.00e-07 -70Zn 2.98e-13 4.12e-19 2.94e-12 4.02e-18 8.27e-11 1.07e-15 -69Ga 3.50e-09 5.02e-13 6.67e-09 3.00e-12 7.07e-09 2.14e-11 -71Ga 2.93e-10 3.84e-14 7.98e-10 1.26e-13 1.31e-09 1.23e-12 +12C 5.24e-06 3.11e-06 5.27e-06 3.12e-06 5.65e-06 1.23e-06 +13C 1.01e-09 3.17e-12 1.00e-09 3.27e-12 8.18e-10 1.04e-12 +14N 1.38e-07 7.05e-13 1.20e-06 7.21e-13 3.54e-05 4.99e-11 +15N 2.43e-09 1.14e-12 2.56e-09 1.15e-12 6.49e-09 1.37e-10 +16O 3.74e-03 7.48e-04 3.74e-03 7.47e-04 4.02e-03 7.62e-04 +17O 1.96e-10 1.02e-16 1.60e-09 1.02e-16 4.67e-08 5.95e-16 +18O 4.18e-09 3.96e-18 1.18e-08 3.96e-18 2.56e-07 6.23e-11 +19F 8.08e-10 9.86e-20 9.57e-10 9.97e-20 5.73e-09 3.40e-14 +20Ne 7.67e-07 4.48e-08 1.02e-06 4.43e-08 9.37e-06 3.90e-08 +21Ne 7.03e-09 1.52e-13 7.80e-09 1.51e-13 3.29e-08 2.64e-13 +22Ne 1.11e-08 1.74e-13 2.98e-08 1.77e-13 6.33e-07 6.86e-10 +23Na 2.98e-09 3.96e-11 9.36e-09 3.91e-11 2.15e-07 3.04e-10 +24Mg 2.98e-04 2.07e-05 3.03e-04 2.15e-05 3.40e-04 9.17e-06 +25Mg 2.44e-07 2.90e-09 2.72e-07 3.04e-09 1.19e-06 1.83e-09 +26Mg 3.30e-07 1.89e-09 3.59e-07 1.97e-09 1.31e-06 3.77e-09 +27Al 2.51e-06 3.15e-07 2.57e-06 3.23e-07 3.20e-06 3.61e-07 +28Si 5.55e-02 4.54e-02 5.55e-02 4.54e-02 5.62e-02 4.43e-02 +29Si 4.59e-05 3.15e-06 4.62e-05 3.18e-06 5.07e-05 7.57e-06 +30Si 6.09e-05 2.80e-06 6.15e-05 2.88e-06 6.96e-05 1.62e-05 +31P 3.60e-05 3.34e-06 3.62e-05 3.33e-06 3.94e-05 1.03e-05 +32S 2.45e-02 3.76e-02 2.45e-02 3.76e-02 2.45e-02 3.35e-02 +33S 2.65e-05 3.98e-06 2.65e-05 3.94e-06 2.85e-05 1.06e-05 +34S 1.80e-04 2.18e-05 1.80e-04 2.15e-05 1.96e-04 1.15e-04 +36S 4.31e-10 8.10e-11 4.67e-10 8.51e-11 1.50e-09 7.47e-10 +35Cl 1.00e-05 1.85e-06 1.00e-05 1.83e-06 1.15e-05 4.61e-06 +37Cl 3.57e-06 8.73e-07 3.57e-06 8.62e-07 3.95e-06 1.94e-06 +36Ar 4.34e-03 9.35e-03 4.34e-03 9.36e-03 4.35e-03 7.97e-03 +38Ar 7.81e-05 1.57e-05 7.81e-05 1.52e-05 8.93e-05 7.88e-05 +40Ar 7.68e-11 1.97e-11 8.59e-11 1.92e-11 3.92e-10 9.32e-11 +39K 1.51e-05 2.95e-06 1.52e-05 2.92e-06 1.98e-05 5.22e-06 +41K 9.97e-07 2.58e-07 1.00e-06 2.55e-07 1.30e-06 4.85e-07 +40Ca 5.72e-03 1.09e-02 5.72e-03 1.09e-02 5.85e-03 9.10e-03 +42Ca 2.19e-06 6.32e-07 2.20e-06 6.16e-07 2.93e-06 2.14e-06 +43Ca 2.60e-06 5.40e-07 2.59e-06 5.43e-07 2.42e-06 1.29e-07 +44Ca 1.53e-04 2.05e-05 1.53e-04 2.05e-05 1.74e-04 1.15e-05 +46Ca 1.45e-13 2.14e-15 1.40e-12 6.86e-15 4.08e-11 4.18e-13 +48Ca 6.27e-12 3.32e-21 6.27e-11 1.37e-19 1.88e-09 7.17e-15 +45Sc 4.64e-07 4.56e-08 4.68e-07 4.52e-08 7.37e-07 8.50e-08 +46Ti 2.95e-06 3.22e-07 2.96e-06 3.14e-07 3.55e-06 1.59e-06 +47Ti 5.71e-06 9.79e-07 5.72e-06 9.79e-07 6.56e-06 5.31e-07 +48Ti 7.17e-04 3.52e-04 7.19e-04 3.53e-04 8.03e-04 2.57e-04 +49Ti 1.39e-05 1.63e-05 1.40e-05 1.62e-05 1.67e-05 2.68e-05 +50Ti 1.32e-11 1.44e-12 7.86e-11 2.04e-11 2.30e-09 1.32e-08 +50V 5.28e-11 1.14e-11 6.52e-11 1.50e-11 6.19e-10 2.61e-10 +51V 3.15e-05 4.01e-05 3.16e-05 3.97e-05 3.63e-05 8.80e-05 +50Cr 4.09e-05 5.39e-05 4.10e-05 5.29e-05 4.57e-05 2.66e-04 +52Cr 2.04e-03 7.80e-03 2.05e-03 7.81e-03 2.24e-03 6.11e-03 +53Cr 7.19e-05 5.16e-04 7.21e-05 5.13e-04 8.16e-05 8.97e-04 +54Cr 4.45e-09 7.59e-10 4.77e-09 1.14e-09 2.32e-08 1.71e-07 +55Mn 2.14e-04 2.63e-03 2.15e-04 2.61e-03 2.32e-04 6.14e-03 +54Fe 1.48e-03 7.96e-03 1.49e-03 7.82e-03 1.77e-03 3.78e-02 +56Fe 1.24e-02 8.47e-01 1.24e-02 8.48e-01 1.14e-02 7.46e-01 +57Fe 3.04e-04 1.77e-02 3.04e-04 1.76e-02 3.00e-04 3.35e-02 +58Fe 1.15e-09 2.69e-10 2.46e-09 4.32e-10 3.98e-08 4.95e-07 +59Co 5.17e-05 7.12e-04 5.10e-05 7.06e-04 3.47e-05 2.05e-03 +58Ni 1.91e-04 1.83e-02 1.91e-04 1.79e-02 2.11e-04 8.08e-02 +60Ni 2.72e-04 1.54e-02 2.71e-04 1.54e-02 2.42e-04 8.87e-03 +61Ni 2.01e-05 5.15e-04 2.00e-05 5.14e-04 1.78e-05 5.10e-04 +62Ni 2.09e-05 3.08e-03 2.10e-05 3.04e-03 2.27e-05 7.57e-03 +64Ni 1.73e-11 1.23e-13 1.72e-10 1.22e-12 5.06e-09 1.28e-09 +63Cu 7.84e-06 1.22e-06 7.82e-06 1.20e-06 7.33e-06 5.23e-06 +64Zn 3.52e-05 4.88e-05 3.49e-05 4.92e-05 2.72e-05 1.69e-05 +66Zn 2.86e-06 5.82e-05 2.86e-06 5.75e-05 2.69e-06 1.01e-04 +67Zn 1.76e-07 3.39e-08 1.80e-07 3.34e-08 1.95e-07 9.78e-08 +68Zn 8.39e-08 1.34e-08 1.09e-07 1.31e-08 1.30e-07 1.00e-07 +70Zn 2.98e-13 4.12e-19 2.94e-12 4.02e-18 8.27e-11 1.07e-15 +69Ga 3.50e-09 5.02e-13 6.67e-09 3.00e-12 7.07e-09 2.14e-11 +71Ga 2.93e-10 3.84e-14 7.98e-10 1.26e-13 1.31e-09 1.23e-12 diff --git a/vice/yields/sneia/gronow21/raw/table12.dat b/vice/yields/sneia/gronow21/raw/table12.dat index 366811dd..45e1f915 100644 --- a/vice/yields/sneia/gronow21/raw/table12.dat +++ b/vice/yields/sneia/gronow21/raw/table12.dat @@ -1,39 +1,39 @@ -14C 7.29e-08 4.85e-06 7.43e-08 4.62e-06 9.15e-08 8.76e-06 -22Na 5.45e-07 2.50e-08 5.75e-07 2.50e-08 1.44e-06 1.74e-08 -26Al 1.13e-05 1.37e-05 1.14e-05 1.37e-05 1.53e-05 5.47e-06 -32Si 8.10e-10 7.80e-10 1.39e-09 1.05e-09 2.34e-09 8.25e-08 -32P 7.78e-09 2.23e-07 8.35e-09 2.19e-07 1.27e-08 3.92e-06 -33P 1.94e-09 1.65e-07 2.43e-09 1.64e-07 1.25e-08 2.53e-06 -35S 1.95e-09 1.61e-07 2.68e-09 1.55e-07 1.51e-08 5.73e-06 -36Cl 4.68e-09 6.97e-07 4.80e-09 6.76e-07 8.63e-09 5.33e-06 -37Ar 6.59e-07 2.73e-05 6.69e-07 2.68e-05 1.07e-06 4.70e-05 -39Ar 3.73e-10 6.49e-09 3.50e-09 1.27e-08 6.29e-08 5.16e-07 -40K 4.30e-10 4.27e-08 8.18e-10 4.18e-08 9.09e-09 4.46e-07 -41Ca 5.60e-06 4.63e-06 5.56e-06 4.54e-06 4.80e-06 7.89e-06 -44Ti 2.26e-04 1.29e-05 2.25e-04 1.29e-05 1.91e-04 8.87e-06 -48V 1.00e-07 5.76e-08 1.00e-07 5.72e-08 8.65e-08 1.10e-07 -49V 2.03e-08 2.07e-07 2.09e-08 2.10e-07 4.18e-08 1.04e-06 -48Cr 8.23e-06 3.21e-04 8.13e-06 3.21e-04 5.97e-06 2.14e-04 -49Cr 2.66e-07 1.85e-05 2.62e-07 1.84e-05 1.59e-07 2.42e-05 -51Cr 5.82e-09 1.03e-06 6.12e-09 1.02e-06 1.33e-08 1.51e-05 -51Mn 2.51e-07 4.40e-05 2.49e-07 4.36e-05 2.07e-07 7.59e-05 -52Mn 7.45e-09 2.69e-06 7.56e-09 2.68e-06 1.02e-08 3.93e-06 -53Mn 2.85e-09 1.86e-05 4.03e-09 1.84e-05 5.36e-08 1.70e-04 -54Mn 2.56e-11 2.10e-08 2.24e-10 2.35e-08 9.49e-09 9.59e-07 -52Fe 8.56e-07 6.19e-03 8.59e-07 6.20e-03 9.58e-07 4.49e-03 -53Fe 2.61e-08 4.47e-04 2.65e-08 4.44e-04 4.07e-08 6.53e-04 -55Fe 6.43e-10 3.00e-05 4.00e-09 2.94e-05 1.73e-07 5.90e-04 -59Fe 7.18e-09 1.68e-08 7.71e-08 1.70e-07 3.24e-06 4.15e-06 -60Fe 2.88e-08 4.48e-08 2.86e-07 4.40e-07 2.96e-06 2.83e-05 -55Co 1.08e-07 2.16e-03 1.14e-07 2.14e-03 4.29e-07 4.02e-03 -56Co 6.58e-10 7.18e-06 1.76e-09 7.11e-06 4.64e-08 2.11e-05 -57Co 6.74e-09 3.83e-06 6.70e-08 3.77e-06 2.96e-06 6.27e-05 -58Co 4.52e-10 7.29e-09 4.72e-09 1.25e-08 3.25e-07 2.42e-07 -60Co 7.49e-09 1.64e-08 7.39e-08 1.64e-07 6.22e-07 3.34e-06 -56Ni 8.04e-07 1.40e-01 8.11e-07 1.40e-01 1.18e-06 1.14e-01 -57Ni 8.62e-08 1.22e-03 9.15e-08 1.21e-03 3.13e-07 2.14e-03 -59Ni 5.68e-09 9.79e-07 3.92e-08 1.05e-06 1.28e-06 1.30e-05 -63Ni 1.02e-09 1.04e-08 1.03e-08 1.00e-07 2.66e-07 4.72e-06 -62Zn 3.26e-08 1.03e-06 2.23e-07 1.02e-06 1.94e-06 3.43e-06 -65Zn 1.02e-10 9.59e-09 8.96e-10 9.77e-08 7.30e-09 2.67e-07 -65Ge 4.73e-10 8.68e-10 2.25e-09 8.64e-10 8.75e-09 1.03e-09 +14C 7.29e-08 4.85e-06 7.43e-08 4.62e-06 9.15e-08 8.76e-06 +22Na 5.45e-07 2.50e-08 5.75e-07 2.50e-08 1.44e-06 1.74e-08 +26Al 1.13e-05 1.37e-05 1.14e-05 1.37e-05 1.53e-05 5.47e-06 +32Si 8.10e-10 7.80e-10 1.39e-09 1.05e-09 2.34e-09 8.25e-08 +32P 7.78e-09 2.23e-07 8.35e-09 2.19e-07 1.27e-08 3.92e-06 +33P 1.94e-09 1.65e-07 2.43e-09 1.64e-07 1.25e-08 2.53e-06 +35S 1.95e-09 1.61e-07 2.68e-09 1.55e-07 1.51e-08 5.73e-06 +36Cl 4.68e-09 6.97e-07 4.80e-09 6.76e-07 8.63e-09 5.33e-06 +37Ar 6.59e-07 2.73e-05 6.69e-07 2.68e-05 1.07e-06 4.70e-05 +39Ar 3.73e-10 6.49e-09 3.50e-09 1.27e-08 6.29e-08 5.16e-07 +40K 4.30e-10 4.27e-08 8.18e-10 4.18e-08 9.09e-09 4.46e-07 +41Ca 5.60e-06 4.63e-06 5.56e-06 4.54e-06 4.80e-06 7.89e-06 +44Ti 2.26e-04 1.29e-05 2.25e-04 1.29e-05 1.91e-04 8.87e-06 +48V 1.00e-07 5.76e-08 1.00e-07 5.72e-08 8.65e-08 1.10e-07 +49V 2.03e-08 2.07e-07 2.09e-08 2.10e-07 4.18e-08 1.04e-06 +48Cr 8.23e-06 3.21e-04 8.13e-06 3.21e-04 5.97e-06 2.14e-04 +49Cr 2.66e-07 1.85e-05 2.62e-07 1.84e-05 1.59e-07 2.42e-05 +51Cr 5.82e-09 1.03e-06 6.12e-09 1.02e-06 1.33e-08 1.51e-05 +51Mn 2.51e-07 4.40e-05 2.49e-07 4.36e-05 2.07e-07 7.59e-05 +52Mn 7.45e-09 2.69e-06 7.56e-09 2.68e-06 1.02e-08 3.93e-06 +53Mn 2.85e-09 1.86e-05 4.03e-09 1.84e-05 5.36e-08 1.70e-04 +54Mn 2.56e-11 2.10e-08 2.24e-10 2.35e-08 9.49e-09 9.59e-07 +52Fe 8.56e-07 6.19e-03 8.59e-07 6.20e-03 9.58e-07 4.49e-03 +53Fe 2.61e-08 4.47e-04 2.65e-08 4.44e-04 4.07e-08 6.53e-04 +55Fe 6.43e-10 3.00e-05 4.00e-09 2.94e-05 1.73e-07 5.90e-04 +59Fe 7.18e-09 1.68e-08 7.71e-08 1.70e-07 3.24e-06 4.15e-06 +60Fe 2.88e-08 4.48e-08 2.86e-07 4.40e-07 2.96e-06 2.83e-05 +55Co 1.08e-07 2.16e-03 1.14e-07 2.14e-03 4.29e-07 4.02e-03 +56Co 6.58e-10 7.18e-06 1.76e-09 7.11e-06 4.64e-08 2.11e-05 +57Co 6.74e-09 3.83e-06 6.70e-08 3.77e-06 2.96e-06 6.27e-05 +58Co 4.52e-10 7.29e-09 4.72e-09 1.25e-08 3.25e-07 2.42e-07 +60Co 7.49e-09 1.64e-08 7.39e-08 1.64e-07 6.22e-07 3.34e-06 +56Ni 8.04e-07 1.40e-01 8.11e-07 1.40e-01 1.18e-06 1.14e-01 +57Ni 8.62e-08 1.22e-03 9.15e-08 1.21e-03 3.13e-07 2.14e-03 +59Ni 5.68e-09 9.79e-07 3.92e-08 1.05e-06 1.28e-06 1.30e-05 +63Ni 1.02e-09 1.04e-08 1.03e-08 1.00e-07 2.66e-07 4.72e-06 +62Zn 3.26e-08 1.03e-06 2.23e-07 1.02e-06 1.94e-06 3.43e-06 +65Zn 1.02e-10 9.59e-09 8.96e-10 9.77e-08 7.30e-09 2.67e-07 +65Ge 4.73e-10 8.68e-10 2.25e-09 8.64e-10 8.75e-09 1.03e-09 diff --git a/vice/yields/sneia/gronow21/raw/table13.dat b/vice/yields/sneia/gronow21/raw/table13.dat index e7845f40..e3e08bf7 100644 --- a/vice/yields/sneia/gronow21/raw/table13.dat +++ b/vice/yields/sneia/gronow21/raw/table13.dat @@ -1,39 +1,39 @@ -14C 2.09e-08 3.37e-06 2.12e-08 3.19e-06 2.26e-08 7.51e-06 -22Na 5.09e-08 2.15e-08 5.29e-08 2.15e-08 1.16e-07 1.47e-08 -26Al 9.81e-06 1.12e-05 9.79e-06 1.12e-05 1.03e-05 4.40e-06 -32Si 9.42e-11 8.05e-10 1.77e-10 1.02e-09 3.25e-10 8.08e-08 -32P 1.44e-08 1.87e-07 1.47e-08 1.83e-07 1.65e-08 3.20e-06 -33P 5.99e-09 1.32e-07 6.08e-09 1.31e-07 8.27e-09 2.04e-06 -35S 1.14e-08 1.35e-07 1.17e-08 1.29e-07 1.82e-08 4.64e-06 -36Cl 2.73e-08 5.66e-07 2.74e-08 5.49e-07 3.23e-08 4.26e-06 -37Ar 1.03e-05 2.35e-05 1.03e-05 2.30e-05 1.03e-05 4.10e-05 -39Ar 4.60e-10 5.56e-09 1.77e-09 1.11e-08 2.67e-08 4.59e-07 -40K 2.94e-09 3.57e-08 3.31e-09 3.51e-08 1.38e-08 3.58e-07 -41Ca 9.15e-06 4.07e-06 9.15e-06 3.99e-06 1.06e-05 6.95e-06 -44Ti 2.57e-03 1.33e-05 2.58e-03 1.33e-05 2.87e-03 9.29e-06 -48V 9.56e-07 5.98e-08 9.69e-07 5.94e-08 1.45e-06 1.04e-07 -49V 2.54e-07 1.86e-07 2.61e-07 1.88e-07 5.02e-07 8.95e-07 -48Cr 2.67e-03 3.48e-04 2.66e-03 3.49e-04 2.43e-03 2.38e-04 -49Cr 2.01e-05 1.96e-05 2.02e-05 1.95e-05 2.78e-05 2.67e-05 -51Cr 1.17e-06 9.24e-07 1.18e-06 9.05e-07 1.45e-06 1.33e-05 -51Mn 1.11e-04 4.74e-05 1.11e-04 4.69e-05 1.15e-04 8.55e-05 -52Mn 1.78e-06 2.95e-06 1.78e-06 2.95e-06 2.13e-06 4.12e-06 -53Mn 1.12e-06 1.86e-05 1.13e-06 1.84e-05 1.54e-06 1.54e-04 -54Mn 1.15e-10 1.90e-08 4.65e-10 2.06e-08 1.67e-08 8.36e-07 -52Fe 8.90e-04 7.36e-03 8.82e-04 7.38e-03 6.37e-04 5.44e-03 -53Fe 1.89e-05 5.20e-04 1.89e-05 5.17e-04 2.04e-05 7.94e-04 -55Fe 1.47e-07 2.64e-05 1.58e-07 2.58e-05 6.40e-07 5.17e-04 -59Fe 2.59e-09 1.46e-08 2.76e-08 1.49e-07 1.47e-06 3.79e-06 -60Fe 1.16e-08 4.22e-08 1.16e-07 4.15e-07 1.69e-06 2.51e-05 -55Co 3.03e-05 2.63e-03 3.02e-05 2.60e-03 2.68e-05 5.25e-03 -56Co 2.83e-07 9.27e-06 2.92e-07 9.19e-06 6.31e-07 2.57e-05 -57Co 7.32e-08 3.48e-06 1.72e-07 3.42e-06 7.17e-06 5.64e-05 -58Co 1.12e-09 6.48e-09 1.18e-08 1.03e-08 9.80e-07 2.09e-07 -60Co 6.32e-09 1.37e-08 6.23e-08 1.37e-07 9.31e-07 2.68e-06 -56Ni 7.50e-05 2.10e-01 7.42e-05 2.10e-01 4.98e-05 1.77e-01 -57Ni 6.45e-06 2.03e-03 6.51e-06 2.02e-03 6.95e-06 3.68e-03 -59Ni 2.28e-07 2.10e-06 4.91e-07 2.14e-06 1.24e-05 1.32e-05 -63Ni 1.47e-09 9.60e-09 1.42e-08 9.27e-08 2.06e-07 4.08e-06 -62Zn 6.36e-07 2.54e-05 1.36e-06 2.51e-05 1.34e-05 5.56e-05 -65Zn 2.49e-09 7.76e-09 1.69e-08 7.82e-08 2.15e-07 2.15e-07 -65Ge 8.95e-09 1.15e-08 1.74e-08 1.15e-08 9.34e-08 1.05e-08 +14C 2.09e-08 3.37e-06 2.12e-08 3.19e-06 2.26e-08 7.51e-06 +22Na 5.09e-08 2.15e-08 5.29e-08 2.15e-08 1.16e-07 1.47e-08 +26Al 9.81e-06 1.12e-05 9.79e-06 1.12e-05 1.03e-05 4.40e-06 +32Si 9.42e-11 8.05e-10 1.77e-10 1.02e-09 3.25e-10 8.08e-08 +32P 1.44e-08 1.87e-07 1.47e-08 1.83e-07 1.65e-08 3.20e-06 +33P 5.99e-09 1.32e-07 6.08e-09 1.31e-07 8.27e-09 2.04e-06 +35S 1.14e-08 1.35e-07 1.17e-08 1.29e-07 1.82e-08 4.64e-06 +36Cl 2.73e-08 5.66e-07 2.74e-08 5.49e-07 3.23e-08 4.26e-06 +37Ar 1.03e-05 2.35e-05 1.03e-05 2.30e-05 1.03e-05 4.10e-05 +39Ar 4.60e-10 5.56e-09 1.77e-09 1.11e-08 2.67e-08 4.59e-07 +40K 2.94e-09 3.57e-08 3.31e-09 3.51e-08 1.38e-08 3.58e-07 +41Ca 9.15e-06 4.07e-06 9.15e-06 3.99e-06 1.06e-05 6.95e-06 +44Ti 2.57e-03 1.33e-05 2.58e-03 1.33e-05 2.87e-03 9.29e-06 +48V 9.56e-07 5.98e-08 9.69e-07 5.94e-08 1.45e-06 1.04e-07 +49V 2.54e-07 1.86e-07 2.61e-07 1.88e-07 5.02e-07 8.95e-07 +48Cr 2.67e-03 3.48e-04 2.66e-03 3.49e-04 2.43e-03 2.38e-04 +49Cr 2.01e-05 1.96e-05 2.02e-05 1.95e-05 2.78e-05 2.67e-05 +51Cr 1.17e-06 9.24e-07 1.18e-06 9.05e-07 1.45e-06 1.33e-05 +51Mn 1.11e-04 4.74e-05 1.11e-04 4.69e-05 1.15e-04 8.55e-05 +52Mn 1.78e-06 2.95e-06 1.78e-06 2.95e-06 2.13e-06 4.12e-06 +53Mn 1.12e-06 1.86e-05 1.13e-06 1.84e-05 1.54e-06 1.54e-04 +54Mn 1.15e-10 1.90e-08 4.65e-10 2.06e-08 1.67e-08 8.36e-07 +52Fe 8.90e-04 7.36e-03 8.82e-04 7.38e-03 6.37e-04 5.44e-03 +53Fe 1.89e-05 5.20e-04 1.89e-05 5.17e-04 2.04e-05 7.94e-04 +55Fe 1.47e-07 2.64e-05 1.58e-07 2.58e-05 6.40e-07 5.17e-04 +59Fe 2.59e-09 1.46e-08 2.76e-08 1.49e-07 1.47e-06 3.79e-06 +60Fe 1.16e-08 4.22e-08 1.16e-07 4.15e-07 1.69e-06 2.51e-05 +55Co 3.03e-05 2.63e-03 3.02e-05 2.60e-03 2.68e-05 5.25e-03 +56Co 2.83e-07 9.27e-06 2.92e-07 9.19e-06 6.31e-07 2.57e-05 +57Co 7.32e-08 3.48e-06 1.72e-07 3.42e-06 7.17e-06 5.64e-05 +58Co 1.12e-09 6.48e-09 1.18e-08 1.03e-08 9.80e-07 2.09e-07 +60Co 6.32e-09 1.37e-08 6.23e-08 1.37e-07 9.31e-07 2.68e-06 +56Ni 7.50e-05 2.10e-01 7.42e-05 2.10e-01 4.98e-05 1.77e-01 +57Ni 6.45e-06 2.03e-03 6.51e-06 2.02e-03 6.95e-06 3.68e-03 +59Ni 2.28e-07 2.10e-06 4.91e-07 2.14e-06 1.24e-05 1.32e-05 +63Ni 1.47e-09 9.60e-09 1.42e-08 9.27e-08 2.06e-07 4.08e-06 +62Zn 6.36e-07 2.54e-05 1.36e-06 2.51e-05 1.34e-05 5.56e-05 +65Zn 2.49e-09 7.76e-09 1.69e-08 7.82e-08 2.15e-07 2.15e-07 +65Ge 8.95e-09 1.15e-08 1.74e-08 1.15e-08 9.34e-08 1.05e-08 diff --git a/vice/yields/sneia/gronow21/raw/table14.dat b/vice/yields/sneia/gronow21/raw/table14.dat index e812cd3a..b5886b4c 100644 --- a/vice/yields/sneia/gronow21/raw/table14.dat +++ b/vice/yields/sneia/gronow21/raw/table14.dat @@ -1,39 +1,39 @@ -14C 2.53e-12 2.17e-09 2.81e-12 1.29e-09 1.15e-11 5.76e-08 -22Na 8.66e-09 1.03e-08 8.97e-09 1.04e-08 1.79e-08 7.49e-09 -26Al 6.65e-07 6.65e-06 6.63e-07 6.67e-06 7.06e-07 2.76e-06 -32Si 2.18e-12 8.20e-10 2.24e-12 4.33e-11 2.54e-12 1.41e-08 -32P 2.00e-08 1.19e-07 2.01e-08 1.16e-07 2.14e-08 2.09e-06 -33P 1.59e-08 9.33e-08 1.60e-08 9.05e-08 1.70e-08 1.36e-06 -35S 1.17e-08 9.64e-08 1.16e-08 9.04e-08 1.18e-08 3.50e-06 -36Cl 7.72e-08 4.18e-07 7.66e-08 4.05e-07 7.95e-08 3.24e-06 -37Ar 7.83e-06 1.84e-05 7.79e-06 1.81e-05 8.08e-06 3.28e-05 -39Ar 6.02e-10 4.02e-09 5.91e-10 3.96e-09 6.93e-10 1.51e-07 -40K 4.76e-09 2.83e-08 4.66e-09 2.71e-08 5.58e-09 2.71e-07 -41Ca 3.21e-06 3.27e-06 3.21e-06 3.21e-06 4.16e-06 5.64e-06 -44Ti 1.78e-03 1.52e-05 1.78e-03 1.52e-05 1.83e-03 1.04e-05 -48V 1.01e-06 4.33e-08 1.02e-06 4.29e-08 1.53e-06 8.12e-08 -49V 3.26e-07 1.59e-07 3.29e-07 1.59e-07 5.10e-07 7.22e-07 -48Cr 3.78e-03 3.68e-04 3.79e-03 3.69e-04 3.92e-03 2.57e-04 -49Cr 3.03e-05 2.00e-05 3.06e-05 1.99e-05 4.15e-05 2.83e-05 -51Cr 2.49e-06 7.82e-07 2.50e-06 7.66e-07 2.88e-06 1.11e-05 -51Mn 2.89e-04 4.88e-05 2.90e-04 4.83e-05 3.09e-04 9.16e-05 -52Mn 8.90e-06 2.55e-06 8.96e-06 2.55e-06 1.13e-05 3.71e-06 -53Mn 4.78e-06 1.67e-05 4.84e-06 1.65e-05 6.96e-06 1.30e-04 -54Mn 3.05e-10 2.43e-08 4.66e-10 2.29e-08 5.57e-09 6.93e-07 -52Fe 7.35e-03 7.92e-03 7.36e-03 7.93e-03 7.88e-03 5.96e-03 -53Fe 9.18e-05 5.52e-04 9.29e-05 5.48e-04 1.29e-04 8.69e-04 -55Fe 9.68e-07 2.18e-05 9.85e-07 2.15e-05 1.73e-06 4.28e-04 -59Fe 2.84e-11 1.49e-09 2.75e-10 1.53e-08 6.90e-09 3.33e-07 -60Fe 8.26e-11 7.26e-09 8.13e-10 6.97e-08 1.27e-08 9.60e-06 -55Co 9.19e-04 2.81e-03 9.21e-04 2.79e-03 9.70e-04 5.87e-03 -56Co 3.02e-06 8.91e-06 3.05e-06 8.82e-06 4.15e-06 2.65e-05 -57Co 1.07e-06 3.01e-06 1.11e-06 3.02e-06 2.81e-06 4.73e-05 -58Co 3.90e-10 5.81e-09 2.39e-09 8.90e-09 1.07e-07 1.71e-07 -60Co 1.59e-10 5.96e-09 1.55e-09 5.88e-08 2.97e-08 1.84e-06 -56Ni 1.49e-02 3.24e-01 1.49e-02 3.24e-01 1.49e-02 2.78e-01 -57Ni 1.29e-03 4.50e-03 1.29e-03 4.47e-03 1.31e-03 7.79e-03 -59Ni 9.42e-06 1.28e-05 9.54e-06 1.28e-05 1.61e-05 3.07e-05 -63Ni 7.89e-11 3.81e-09 7.46e-10 3.63e-08 1.10e-08 2.66e-06 -62Zn 1.24e-04 3.90e-04 1.26e-04 3.84e-04 1.75e-04 1.12e-03 -65Zn 2.13e-07 8.52e-09 2.32e-07 6.73e-08 6.21e-07 1.77e-07 -65Ge 2.95e-06 2.37e-07 2.95e-06 2.36e-07 2.93e-06 2.15e-07 +14C 2.53e-12 2.17e-09 2.81e-12 1.29e-09 1.15e-11 5.76e-08 +22Na 8.66e-09 1.03e-08 8.97e-09 1.04e-08 1.79e-08 7.49e-09 +26Al 6.65e-07 6.65e-06 6.63e-07 6.67e-06 7.06e-07 2.76e-06 +32Si 2.18e-12 8.20e-10 2.24e-12 4.33e-11 2.54e-12 1.41e-08 +32P 2.00e-08 1.19e-07 2.01e-08 1.16e-07 2.14e-08 2.09e-06 +33P 1.59e-08 9.33e-08 1.60e-08 9.05e-08 1.70e-08 1.36e-06 +35S 1.17e-08 9.64e-08 1.16e-08 9.04e-08 1.18e-08 3.50e-06 +36Cl 7.72e-08 4.18e-07 7.66e-08 4.05e-07 7.95e-08 3.24e-06 +37Ar 7.83e-06 1.84e-05 7.79e-06 1.81e-05 8.08e-06 3.28e-05 +39Ar 6.02e-10 4.02e-09 5.91e-10 3.96e-09 6.93e-10 1.51e-07 +40K 4.76e-09 2.83e-08 4.66e-09 2.71e-08 5.58e-09 2.71e-07 +41Ca 3.21e-06 3.27e-06 3.21e-06 3.21e-06 4.16e-06 5.64e-06 +44Ti 1.78e-03 1.52e-05 1.78e-03 1.52e-05 1.83e-03 1.04e-05 +48V 1.01e-06 4.33e-08 1.02e-06 4.29e-08 1.53e-06 8.12e-08 +49V 3.26e-07 1.59e-07 3.29e-07 1.59e-07 5.10e-07 7.22e-07 +48Cr 3.78e-03 3.68e-04 3.79e-03 3.69e-04 3.92e-03 2.57e-04 +49Cr 3.03e-05 2.00e-05 3.06e-05 1.99e-05 4.15e-05 2.83e-05 +51Cr 2.49e-06 7.82e-07 2.50e-06 7.66e-07 2.88e-06 1.11e-05 +51Mn 2.89e-04 4.88e-05 2.90e-04 4.83e-05 3.09e-04 9.16e-05 +52Mn 8.90e-06 2.55e-06 8.96e-06 2.55e-06 1.13e-05 3.71e-06 +53Mn 4.78e-06 1.67e-05 4.84e-06 1.65e-05 6.96e-06 1.30e-04 +54Mn 3.05e-10 2.43e-08 4.66e-10 2.29e-08 5.57e-09 6.93e-07 +52Fe 7.35e-03 7.92e-03 7.36e-03 7.93e-03 7.88e-03 5.96e-03 +53Fe 9.18e-05 5.52e-04 9.29e-05 5.48e-04 1.29e-04 8.69e-04 +55Fe 9.68e-07 2.18e-05 9.85e-07 2.15e-05 1.73e-06 4.28e-04 +59Fe 2.84e-11 1.49e-09 2.75e-10 1.53e-08 6.90e-09 3.33e-07 +60Fe 8.26e-11 7.26e-09 8.13e-10 6.97e-08 1.27e-08 9.60e-06 +55Co 9.19e-04 2.81e-03 9.21e-04 2.79e-03 9.70e-04 5.87e-03 +56Co 3.02e-06 8.91e-06 3.05e-06 8.82e-06 4.15e-06 2.65e-05 +57Co 1.07e-06 3.01e-06 1.11e-06 3.02e-06 2.81e-06 4.73e-05 +58Co 3.90e-10 5.81e-09 2.39e-09 8.90e-09 1.07e-07 1.71e-07 +60Co 1.59e-10 5.96e-09 1.55e-09 5.88e-08 2.97e-08 1.84e-06 +56Ni 1.49e-02 3.24e-01 1.49e-02 3.24e-01 1.49e-02 2.78e-01 +57Ni 1.29e-03 4.50e-03 1.29e-03 4.47e-03 1.31e-03 7.79e-03 +59Ni 9.42e-06 1.28e-05 9.54e-06 1.28e-05 1.61e-05 3.07e-05 +63Ni 7.89e-11 3.81e-09 7.46e-10 3.63e-08 1.10e-08 2.66e-06 +62Zn 1.24e-04 3.90e-04 1.26e-04 3.84e-04 1.75e-04 1.12e-03 +65Zn 2.13e-07 8.52e-09 2.32e-07 6.73e-08 6.21e-07 1.77e-07 +65Ge 2.95e-06 2.37e-07 2.95e-06 2.36e-07 2.93e-06 2.15e-07 diff --git a/vice/yields/sneia/gronow21/raw/table15.dat b/vice/yields/sneia/gronow21/raw/table15.dat index d80bc0aa..5a5c50b7 100644 --- a/vice/yields/sneia/gronow21/raw/table15.dat +++ b/vice/yields/sneia/gronow21/raw/table15.dat @@ -1,39 +1,39 @@ -14C 3.68e-08 1.93e-06 3.73e-08 1.83e-06 4.31e-08 3.71e-06 -22Na 9.34e-08 1.38e-08 9.78e-08 1.38e-08 2.32e-07 9.36e-09 -26Al 1.33e-05 7.04e-06 1.33e-05 7.09e-06 1.45e-05 2.74e-06 -32Si 3.09e-10 5.35e-10 5.69e-10 6.89e-10 9.61e-10 5.47e-08 -32P 1.00e-08 1.39e-07 1.05e-08 1.36e-07 1.32e-08 2.22e-06 -33P 2.57e-09 9.66e-08 2.82e-09 9.56e-08 7.86e-09 1.43e-06 -35S 5.02e-09 9.84e-08 5.57e-09 9.44e-08 1.51e-08 3.14e-06 -36Cl 1.06e-08 4.32e-07 1.07e-08 4.19e-07 1.48e-08 3.04e-06 -37Ar 3.00e-06 2.10e-05 2.99e-06 2.06e-05 3.04e-06 3.82e-05 -39Ar 3.54e-10 4.23e-09 2.82e-09 7.54e-09 4.90e-08 2.97e-07 -40K 8.71e-10 2.69e-08 1.26e-09 2.63e-08 1.11e-08 2.47e-07 -41Ca 1.04e-05 3.82e-06 1.03e-05 3.74e-06 1.10e-05 6.65e-06 -44Ti 7.50e-04 1.57e-05 7.47e-04 1.58e-05 6.50e-04 1.12e-05 -48V 4.44e-07 5.42e-08 4.50e-07 5.37e-08 6.06e-07 9.88e-08 -49V 8.92e-08 1.80e-07 9.15e-08 1.80e-07 1.64e-07 7.95e-07 -48Cr 1.25e-04 4.29e-04 1.23e-04 4.30e-04 7.45e-05 3.00e-04 -49Cr 3.61e-06 2.32e-05 3.60e-06 2.30e-05 3.00e-06 3.29e-05 -51Cr 7.69e-08 8.98e-07 7.77e-08 8.81e-07 9.33e-08 1.27e-05 -51Mn 5.40e-06 5.63e-05 5.34e-06 5.58e-05 3.62e-06 1.06e-04 -52Mn 1.00e-07 3.34e-06 1.01e-07 3.34e-06 9.94e-08 4.58e-06 -53Mn 3.67e-08 2.09e-05 3.81e-08 2.07e-05 1.13e-07 1.53e-04 -54Mn 9.17e-11 1.84e-08 6.34e-10 1.94e-08 2.56e-08 7.84e-07 -52Fe 5.16e-06 9.49e-03 5.06e-06 9.50e-03 2.75e-06 7.13e-03 -53Fe 4.30e-07 6.51e-04 4.26e-07 6.47e-04 2.81e-07 1.03e-03 -55Fe 3.58e-09 2.55e-05 7.93e-09 2.49e-05 2.34e-07 4.94e-04 -59Fe 4.71e-09 8.35e-09 5.04e-08 8.51e-08 2.48e-06 2.26e-06 -60Fe 2.46e-08 2.75e-08 2.44e-07 2.71e-07 2.84e-06 1.66e-05 -55Co 2.57e-07 3.34e-03 2.60e-07 3.31e-03 5.27e-07 7.01e-03 -56Co 4.61e-09 1.08e-05 6.05e-09 1.07e-05 7.43e-08 3.14e-05 -57Co 8.22e-09 3.50e-06 7.74e-08 3.43e-06 4.55e-06 5.49e-05 -58Co 7.42e-10 6.24e-09 8.00e-09 8.64e-09 7.18e-07 1.94e-07 -60Co 1.77e-08 8.85e-09 1.75e-07 8.88e-08 1.61e-06 1.72e-06 -56Ni 7.45e-07 3.43e-01 7.54e-07 3.43e-01 1.26e-06 2.94e-01 -57Ni 9.79e-08 4.04e-03 1.06e-07 4.02e-03 4.22e-07 7.22e-03 -59Ni 1.12e-08 8.88e-06 8.45e-08 8.85e-06 3.02e-06 2.32e-05 -63Ni 1.40e-09 6.59e-09 1.38e-08 6.37e-08 2.81e-07 2.61e-06 -62Zn 3.80e-08 1.84e-04 2.97e-07 1.81e-04 2.81e-06 4.16e-04 -65Zn 2.98e-10 6.09e-09 2.76e-09 5.40e-08 2.43e-08 1.55e-07 -65Ge 4.03e-10 6.83e-08 1.90e-09 6.82e-08 8.78e-09 4.42e-08 +14C 3.68e-08 1.93e-06 3.73e-08 1.83e-06 4.31e-08 3.71e-06 +22Na 9.34e-08 1.38e-08 9.78e-08 1.38e-08 2.32e-07 9.36e-09 +26Al 1.33e-05 7.04e-06 1.33e-05 7.09e-06 1.45e-05 2.74e-06 +32Si 3.09e-10 5.35e-10 5.69e-10 6.89e-10 9.61e-10 5.47e-08 +32P 1.00e-08 1.39e-07 1.05e-08 1.36e-07 1.32e-08 2.22e-06 +33P 2.57e-09 9.66e-08 2.82e-09 9.56e-08 7.86e-09 1.43e-06 +35S 5.02e-09 9.84e-08 5.57e-09 9.44e-08 1.51e-08 3.14e-06 +36Cl 1.06e-08 4.32e-07 1.07e-08 4.19e-07 1.48e-08 3.04e-06 +37Ar 3.00e-06 2.10e-05 2.99e-06 2.06e-05 3.04e-06 3.82e-05 +39Ar 3.54e-10 4.23e-09 2.82e-09 7.54e-09 4.90e-08 2.97e-07 +40K 8.71e-10 2.69e-08 1.26e-09 2.63e-08 1.11e-08 2.47e-07 +41Ca 1.04e-05 3.82e-06 1.03e-05 3.74e-06 1.10e-05 6.65e-06 +44Ti 7.50e-04 1.57e-05 7.47e-04 1.58e-05 6.50e-04 1.12e-05 +48V 4.44e-07 5.42e-08 4.50e-07 5.37e-08 6.06e-07 9.88e-08 +49V 8.92e-08 1.80e-07 9.15e-08 1.80e-07 1.64e-07 7.95e-07 +48Cr 1.25e-04 4.29e-04 1.23e-04 4.30e-04 7.45e-05 3.00e-04 +49Cr 3.61e-06 2.32e-05 3.60e-06 2.30e-05 3.00e-06 3.29e-05 +51Cr 7.69e-08 8.98e-07 7.77e-08 8.81e-07 9.33e-08 1.27e-05 +51Mn 5.40e-06 5.63e-05 5.34e-06 5.58e-05 3.62e-06 1.06e-04 +52Mn 1.00e-07 3.34e-06 1.01e-07 3.34e-06 9.94e-08 4.58e-06 +53Mn 3.67e-08 2.09e-05 3.81e-08 2.07e-05 1.13e-07 1.53e-04 +54Mn 9.17e-11 1.84e-08 6.34e-10 1.94e-08 2.56e-08 7.84e-07 +52Fe 5.16e-06 9.49e-03 5.06e-06 9.50e-03 2.75e-06 7.13e-03 +53Fe 4.30e-07 6.51e-04 4.26e-07 6.47e-04 2.81e-07 1.03e-03 +55Fe 3.58e-09 2.55e-05 7.93e-09 2.49e-05 2.34e-07 4.94e-04 +59Fe 4.71e-09 8.35e-09 5.04e-08 8.51e-08 2.48e-06 2.26e-06 +60Fe 2.46e-08 2.75e-08 2.44e-07 2.71e-07 2.84e-06 1.66e-05 +55Co 2.57e-07 3.34e-03 2.60e-07 3.31e-03 5.27e-07 7.01e-03 +56Co 4.61e-09 1.08e-05 6.05e-09 1.07e-05 7.43e-08 3.14e-05 +57Co 8.22e-09 3.50e-06 7.74e-08 3.43e-06 4.55e-06 5.49e-05 +58Co 7.42e-10 6.24e-09 8.00e-09 8.64e-09 7.18e-07 1.94e-07 +60Co 1.77e-08 8.85e-09 1.75e-07 8.88e-08 1.61e-06 1.72e-06 +56Ni 7.45e-07 3.43e-01 7.54e-07 3.43e-01 1.26e-06 2.94e-01 +57Ni 9.79e-08 4.04e-03 1.06e-07 4.02e-03 4.22e-07 7.22e-03 +59Ni 1.12e-08 8.88e-06 8.45e-08 8.85e-06 3.02e-06 2.32e-05 +63Ni 1.40e-09 6.59e-09 1.38e-08 6.37e-08 2.81e-07 2.61e-06 +62Zn 3.80e-08 1.84e-04 2.97e-07 1.81e-04 2.81e-06 4.16e-04 +65Zn 2.98e-10 6.09e-09 2.76e-09 5.40e-08 2.43e-08 1.55e-07 +65Ge 4.03e-10 6.83e-08 1.90e-09 6.82e-08 8.78e-09 4.42e-08 diff --git a/vice/yields/sneia/gronow21/raw/table16.dat b/vice/yields/sneia/gronow21/raw/table16.dat index aa99e314..9f1fe21d 100644 --- a/vice/yields/sneia/gronow21/raw/table16.dat +++ b/vice/yields/sneia/gronow21/raw/table16.dat @@ -1,39 +1,39 @@ -14C 6.91e-11 2.08e-07 6.95e-11 1.95e-07 5.21e-11 1.18e-06 -22Na 1.49e-08 1.41e-08 1.54e-08 1.41e-08 2.93e-08 1.00e-08 -26Al 3.04e-06 7.54e-06 3.03e-06 7.58e-06 3.06e-06 2.94e-06 -32Si 4.31e-12 2.23e-10 4.13e-12 2.40e-10 4.67e-12 3.72e-08 -32P 1.54e-08 1.19e-07 1.54e-08 1.16e-07 1.63e-08 2.06e-06 -33P 1.04e-08 8.24e-08 1.04e-08 8.06e-08 1.10e-08 1.22e-06 -35S 1.40e-08 9.21e-08 1.39e-08 8.71e-08 1.48e-08 2.98e-06 -36Cl 5.00e-08 3.72e-07 4.98e-08 3.61e-07 5.24e-08 2.70e-06 -37Ar 9.40e-06 1.79e-05 9.38e-06 1.75e-05 9.50e-06 3.27e-05 -39Ar 6.51e-10 3.68e-09 7.05e-10 4.77e-09 2.14e-09 2.27e-07 -40K 5.22e-09 2.44e-08 5.25e-09 2.39e-08 8.56e-09 2.28e-07 -41Ca 6.35e-06 3.26e-06 6.35e-06 3.20e-06 7.10e-06 5.71e-06 -44Ti 1.99e-03 1.65e-05 2.00e-03 1.65e-05 2.13e-03 1.12e-05 -48V 1.83e-06 4.56e-08 1.85e-06 4.53e-08 2.54e-06 8.44e-08 -49V 4.35e-07 1.54e-07 4.41e-07 1.54e-07 6.76e-07 6.86e-07 -48Cr 4.47e-03 4.03e-04 4.49e-03 4.04e-04 4.97e-03 2.84e-04 -49Cr 4.06e-05 2.14e-05 4.10e-05 2.13e-05 5.42e-05 3.10e-05 -51Cr 3.41e-06 7.68e-07 3.43e-06 7.54e-07 4.14e-06 1.08e-05 -51Mn 3.69e-04 5.23e-05 3.71e-04 5.18e-05 4.19e-04 9.97e-05 -52Mn 1.03e-05 2.80e-06 1.04e-05 2.80e-06 1.23e-05 3.96e-06 -53Mn 6.93e-06 1.76e-05 6.99e-06 1.75e-05 9.00e-06 1.31e-04 -54Mn 2.57e-10 1.58e-08 4.91e-10 1.68e-08 8.01e-09 6.71e-07 -52Fe 5.08e-03 8.79e-03 5.09e-03 8.80e-03 5.25e-03 6.65e-03 -53Fe 1.29e-04 6.03e-04 1.30e-04 5.99e-04 1.63e-04 9.62e-04 -55Fe 1.09e-06 2.17e-05 1.11e-06 2.12e-05 1.63e-06 4.21e-04 -59Fe 2.81e-10 4.66e-09 2.98e-09 4.79e-08 1.83e-07 1.16e-06 -60Fe 1.59e-09 2.06e-08 1.58e-08 2.01e-07 2.61e-07 1.57e-05 -55Co 4.11e-04 3.08e-03 4.11e-04 3.05e-03 3.94e-04 6.52e-03 -56Co 2.72e-06 1.03e-05 2.74e-06 1.02e-05 3.18e-06 2.94e-05 -57Co 6.54e-07 3.11e-06 6.95e-07 3.05e-06 2.95e-06 4.75e-05 -58Co 5.51e-10 5.41e-09 4.09e-09 7.77e-09 2.80e-07 1.66e-07 -60Co 1.50e-09 9.69e-09 1.43e-08 9.68e-08 2.83e-07 1.81e-06 -56Ni 2.13e-03 3.98e-01 2.12e-03 3.98e-01 1.70e-03 3.43e-01 -57Ni 1.37e-04 5.79e-03 1.37e-04 5.76e-03 1.27e-04 1.00e-02 -59Ni 2.90e-06 1.82e-05 3.09e-06 1.80e-05 1.17e-05 3.98e-05 -63Ni 6.78e-10 6.72e-09 6.50e-09 6.48e-08 8.20e-08 2.91e-06 -62Zn 1.29e-05 5.82e-04 1.35e-05 5.73e-04 2.72e-05 1.63e-03 -65Zn 1.15e-08 7.67e-09 3.72e-08 5.04e-08 4.48e-07 1.33e-07 -65Ge 1.14e-07 3.45e-07 1.27e-07 3.44e-07 4.07e-07 2.90e-07 +14C 6.91e-11 2.08e-07 6.95e-11 1.95e-07 5.21e-11 1.18e-06 +22Na 1.49e-08 1.41e-08 1.54e-08 1.41e-08 2.93e-08 1.00e-08 +26Al 3.04e-06 7.54e-06 3.03e-06 7.58e-06 3.06e-06 2.94e-06 +32Si 4.31e-12 2.23e-10 4.13e-12 2.40e-10 4.67e-12 3.72e-08 +32P 1.54e-08 1.19e-07 1.54e-08 1.16e-07 1.63e-08 2.06e-06 +33P 1.04e-08 8.24e-08 1.04e-08 8.06e-08 1.10e-08 1.22e-06 +35S 1.40e-08 9.21e-08 1.39e-08 8.71e-08 1.48e-08 2.98e-06 +36Cl 5.00e-08 3.72e-07 4.98e-08 3.61e-07 5.24e-08 2.70e-06 +37Ar 9.40e-06 1.79e-05 9.38e-06 1.75e-05 9.50e-06 3.27e-05 +39Ar 6.51e-10 3.68e-09 7.05e-10 4.77e-09 2.14e-09 2.27e-07 +40K 5.22e-09 2.44e-08 5.25e-09 2.39e-08 8.56e-09 2.28e-07 +41Ca 6.35e-06 3.26e-06 6.35e-06 3.20e-06 7.10e-06 5.71e-06 +44Ti 1.99e-03 1.65e-05 2.00e-03 1.65e-05 2.13e-03 1.12e-05 +48V 1.83e-06 4.56e-08 1.85e-06 4.53e-08 2.54e-06 8.44e-08 +49V 4.35e-07 1.54e-07 4.41e-07 1.54e-07 6.76e-07 6.86e-07 +48Cr 4.47e-03 4.03e-04 4.49e-03 4.04e-04 4.97e-03 2.84e-04 +49Cr 4.06e-05 2.14e-05 4.10e-05 2.13e-05 5.42e-05 3.10e-05 +51Cr 3.41e-06 7.68e-07 3.43e-06 7.54e-07 4.14e-06 1.08e-05 +51Mn 3.69e-04 5.23e-05 3.71e-04 5.18e-05 4.19e-04 9.97e-05 +52Mn 1.03e-05 2.80e-06 1.04e-05 2.80e-06 1.23e-05 3.96e-06 +53Mn 6.93e-06 1.76e-05 6.99e-06 1.75e-05 9.00e-06 1.31e-04 +54Mn 2.57e-10 1.58e-08 4.91e-10 1.68e-08 8.01e-09 6.71e-07 +52Fe 5.08e-03 8.79e-03 5.09e-03 8.80e-03 5.25e-03 6.65e-03 +53Fe 1.29e-04 6.03e-04 1.30e-04 5.99e-04 1.63e-04 9.62e-04 +55Fe 1.09e-06 2.17e-05 1.11e-06 2.12e-05 1.63e-06 4.21e-04 +59Fe 2.81e-10 4.66e-09 2.98e-09 4.79e-08 1.83e-07 1.16e-06 +60Fe 1.59e-09 2.06e-08 1.58e-08 2.01e-07 2.61e-07 1.57e-05 +55Co 4.11e-04 3.08e-03 4.11e-04 3.05e-03 3.94e-04 6.52e-03 +56Co 2.72e-06 1.03e-05 2.74e-06 1.02e-05 3.18e-06 2.94e-05 +57Co 6.54e-07 3.11e-06 6.95e-07 3.05e-06 2.95e-06 4.75e-05 +58Co 5.51e-10 5.41e-09 4.09e-09 7.77e-09 2.80e-07 1.66e-07 +60Co 1.50e-09 9.69e-09 1.43e-08 9.68e-08 2.83e-07 1.81e-06 +56Ni 2.13e-03 3.98e-01 2.12e-03 3.98e-01 1.70e-03 3.43e-01 +57Ni 1.37e-04 5.79e-03 1.37e-04 5.76e-03 1.27e-04 1.00e-02 +59Ni 2.90e-06 1.82e-05 3.09e-06 1.80e-05 1.17e-05 3.98e-05 +63Ni 6.78e-10 6.72e-09 6.50e-09 6.48e-08 8.20e-08 2.91e-06 +62Zn 1.29e-05 5.82e-04 1.35e-05 5.73e-04 2.72e-05 1.63e-03 +65Zn 1.15e-08 7.67e-09 3.72e-08 5.04e-08 4.48e-07 1.33e-07 +65Ge 1.14e-07 3.45e-07 1.27e-07 3.44e-07 4.07e-07 2.90e-07 diff --git a/vice/yields/sneia/gronow21/raw/table17.dat b/vice/yields/sneia/gronow21/raw/table17.dat index f513717a..7d00f46e 100644 --- a/vice/yields/sneia/gronow21/raw/table17.dat +++ b/vice/yields/sneia/gronow21/raw/table17.dat @@ -1,39 +1,39 @@ -14C 3.84e-12 2.80e-13 4.47e-12 1.73e-13 2.36e-11 3.61e-11 -22Na 7.85e-09 5.73e-09 8.22e-09 5.68e-09 1.83e-08 6.08e-09 -26Al 9.78e-08 1.84e-06 9.91e-08 1.84e-06 1.43e-07 7.96e-07 -32Si 1.93e-12 4.35e-10 2.03e-12 7.81e-11 2.34e-12 3.41e-09 -32P 1.52e-08 7.62e-08 1.55e-08 7.39e-08 1.65e-08 1.07e-06 -33P 1.22e-08 6.01e-08 1.25e-08 5.81e-08 1.32e-08 8.09e-07 -35S 3.80e-09 5.22e-08 3.78e-09 4.92e-08 3.93e-09 1.55e-06 -36Cl 6.30e-08 2.80e-07 6.30e-08 2.71e-07 6.46e-08 1.91e-06 -37Ar 3.56e-06 1.41e-05 3.53e-06 1.39e-05 3.70e-06 2.59e-05 -39Ar 1.60e-10 2.51e-09 1.57e-10 2.40e-09 2.07e-10 4.74e-08 -40K 1.23e-09 1.80e-08 1.20e-09 1.70e-08 1.52e-09 1.45e-07 -41Ca 1.14e-06 2.59e-06 1.15e-06 2.54e-06 1.74e-06 4.55e-06 -44Ti 8.70e-04 1.81e-05 8.71e-04 1.81e-05 9.07e-04 1.15e-05 -48V 4.23e-07 3.68e-08 4.30e-07 3.63e-08 7.18e-07 6.74e-08 -49V 1.98e-07 1.37e-07 2.00e-07 1.35e-07 3.03e-07 5.57e-07 -48Cr 1.88e-03 3.73e-04 1.88e-03 3.74e-04 1.99e-03 2.62e-04 -49Cr 2.02e-05 1.95e-05 2.05e-05 1.93e-05 2.77e-05 2.84e-05 -51Cr 2.06e-06 6.40e-07 2.05e-06 6.28e-07 2.05e-06 8.69e-06 -51Mn 2.65e-04 4.81e-05 2.64e-04 4.77e-05 2.48e-04 9.26e-05 -52Mn 3.70e-06 2.42e-06 3.73e-06 2.42e-06 4.78e-06 3.45e-06 -53Mn 2.77e-06 1.54e-05 2.81e-06 1.52e-05 3.99e-06 1.06e-04 -54Mn 2.38e-10 1.56e-08 3.08e-10 1.72e-08 3.64e-09 5.43e-07 -52Fe 3.98e-03 8.09e-03 3.98e-03 8.11e-03 4.08e-03 6.14e-03 -53Fe 5.77e-05 5.54e-04 5.83e-05 5.50e-04 8.01e-05 8.92e-04 -55Fe 3.69e-07 1.69e-05 3.88e-07 1.66e-05 1.24e-06 3.32e-04 -59Fe 2.72e-11 1.07e-10 2.05e-10 1.07e-09 8.18e-10 2.42e-08 -60Fe 1.38e-11 1.92e-09 9.32e-11 1.18e-08 4.44e-10 1.89e-06 -55Co 3.68e-04 2.87e-03 3.69e-04 2.84e-03 3.82e-04 6.16e-03 -56Co 1.01e-06 1.00e-05 1.02e-06 9.96e-06 1.47e-06 2.78e-05 -57Co 5.21e-07 2.67e-06 5.43e-07 2.62e-06 1.39e-06 3.86e-05 -58Co 1.53e-10 4.51e-09 1.02e-09 6.04e-09 3.38e-08 1.36e-07 -60Co 1.28e-11 1.21e-09 1.05e-10 1.17e-08 1.56e-09 5.26e-07 -56Ni 2.60e-02 4.93e-01 2.60e-02 4.93e-01 2.65e-02 4.28e-01 -57Ni 2.40e-03 8.62e-03 2.40e-03 8.57e-03 2.42e-03 1.45e-02 -59Ni 7.59e-05 3.31e-05 7.56e-05 3.29e-05 6.49e-05 6.60e-05 -63Ni 5.55e-12 5.83e-10 4.89e-11 5.31e-09 6.79e-10 6.46e-07 -62Zn 1.65e-04 1.19e-03 1.65e-04 1.17e-03 1.63e-04 3.45e-03 -65Zn 2.41e-07 1.03e-08 2.43e-07 4.42e-08 3.06e-07 1.62e-07 -65Ge 4.13e-06 8.10e-07 4.13e-06 8.08e-07 3.88e-06 7.19e-07 +14C 3.84e-12 2.80e-13 4.47e-12 1.73e-13 2.36e-11 3.61e-11 +22Na 7.85e-09 5.73e-09 8.22e-09 5.68e-09 1.83e-08 6.08e-09 +26Al 9.78e-08 1.84e-06 9.91e-08 1.84e-06 1.43e-07 7.96e-07 +32Si 1.93e-12 4.35e-10 2.03e-12 7.81e-11 2.34e-12 3.41e-09 +32P 1.52e-08 7.62e-08 1.55e-08 7.39e-08 1.65e-08 1.07e-06 +33P 1.22e-08 6.01e-08 1.25e-08 5.81e-08 1.32e-08 8.09e-07 +35S 3.80e-09 5.22e-08 3.78e-09 4.92e-08 3.93e-09 1.55e-06 +36Cl 6.30e-08 2.80e-07 6.30e-08 2.71e-07 6.46e-08 1.91e-06 +37Ar 3.56e-06 1.41e-05 3.53e-06 1.39e-05 3.70e-06 2.59e-05 +39Ar 1.60e-10 2.51e-09 1.57e-10 2.40e-09 2.07e-10 4.74e-08 +40K 1.23e-09 1.80e-08 1.20e-09 1.70e-08 1.52e-09 1.45e-07 +41Ca 1.14e-06 2.59e-06 1.15e-06 2.54e-06 1.74e-06 4.55e-06 +44Ti 8.70e-04 1.81e-05 8.71e-04 1.81e-05 9.07e-04 1.15e-05 +48V 4.23e-07 3.68e-08 4.30e-07 3.63e-08 7.18e-07 6.74e-08 +49V 1.98e-07 1.37e-07 2.00e-07 1.35e-07 3.03e-07 5.57e-07 +48Cr 1.88e-03 3.73e-04 1.88e-03 3.74e-04 1.99e-03 2.62e-04 +49Cr 2.02e-05 1.95e-05 2.05e-05 1.93e-05 2.77e-05 2.84e-05 +51Cr 2.06e-06 6.40e-07 2.05e-06 6.28e-07 2.05e-06 8.69e-06 +51Mn 2.65e-04 4.81e-05 2.64e-04 4.77e-05 2.48e-04 9.26e-05 +52Mn 3.70e-06 2.42e-06 3.73e-06 2.42e-06 4.78e-06 3.45e-06 +53Mn 2.77e-06 1.54e-05 2.81e-06 1.52e-05 3.99e-06 1.06e-04 +54Mn 2.38e-10 1.56e-08 3.08e-10 1.72e-08 3.64e-09 5.43e-07 +52Fe 3.98e-03 8.09e-03 3.98e-03 8.11e-03 4.08e-03 6.14e-03 +53Fe 5.77e-05 5.54e-04 5.83e-05 5.50e-04 8.01e-05 8.92e-04 +55Fe 3.69e-07 1.69e-05 3.88e-07 1.66e-05 1.24e-06 3.32e-04 +59Fe 2.72e-11 1.07e-10 2.05e-10 1.07e-09 8.18e-10 2.42e-08 +60Fe 1.38e-11 1.92e-09 9.32e-11 1.18e-08 4.44e-10 1.89e-06 +55Co 3.68e-04 2.87e-03 3.69e-04 2.84e-03 3.82e-04 6.16e-03 +56Co 1.01e-06 1.00e-05 1.02e-06 9.96e-06 1.47e-06 2.78e-05 +57Co 5.21e-07 2.67e-06 5.43e-07 2.62e-06 1.39e-06 3.86e-05 +58Co 1.53e-10 4.51e-09 1.02e-09 6.04e-09 3.38e-08 1.36e-07 +60Co 1.28e-11 1.21e-09 1.05e-10 1.17e-08 1.56e-09 5.26e-07 +56Ni 2.60e-02 4.93e-01 2.60e-02 4.93e-01 2.65e-02 4.28e-01 +57Ni 2.40e-03 8.62e-03 2.40e-03 8.57e-03 2.42e-03 1.45e-02 +59Ni 7.59e-05 3.31e-05 7.56e-05 3.29e-05 6.49e-05 6.60e-05 +63Ni 5.55e-12 5.83e-10 4.89e-11 5.31e-09 6.79e-10 6.46e-07 +62Zn 1.65e-04 1.19e-03 1.65e-04 1.17e-03 1.63e-04 3.45e-03 +65Zn 2.41e-07 1.03e-08 2.43e-07 4.42e-08 3.06e-07 1.62e-07 +65Ge 4.13e-06 8.10e-07 4.13e-06 8.08e-07 3.88e-06 7.19e-07 diff --git a/vice/yields/sneia/gronow21/raw/table18.dat b/vice/yields/sneia/gronow21/raw/table18.dat index 89b28577..f2bf2fc7 100644 --- a/vice/yields/sneia/gronow21/raw/table18.dat +++ b/vice/yields/sneia/gronow21/raw/table18.dat @@ -1,39 +1,39 @@ -14C 9.13e-09 4.82e-07 9.25e-09 4.55e-07 1.07e-08 1.09e-06 -22Na 4.63e-08 7.63e-09 4.85e-08 7.62e-09 1.15e-07 5.23e-09 -26Al 6.68e-06 4.05e-06 6.69e-06 4.08e-06 7.41e-06 1.57e-06 -32Si 9.92e-11 2.11e-10 1.67e-10 2.53e-10 2.82e-10 2.52e-08 -32P 4.98e-09 8.29e-08 5.13e-09 8.09e-08 5.94e-09 1.31e-06 -33P 1.26e-09 5.62e-08 1.33e-09 5.51e-08 2.79e-09 8.13e-07 -35S 2.55e-09 6.27e-08 2.74e-09 5.95e-08 6.27e-09 1.94e-06 -36Cl 5.32e-09 2.60e-07 5.39e-09 2.52e-07 7.63e-09 1.82e-06 -37Ar 1.96e-06 1.45e-05 1.96e-06 1.42e-05 2.17e-06 2.80e-05 -39Ar 1.42e-10 2.70e-09 1.08e-09 3.69e-09 1.89e-08 1.44e-07 -40K 4.62e-10 1.74e-08 6.79e-10 1.69e-08 6.00e-09 1.51e-07 -41Ca 4.61e-06 2.77e-06 4.61e-06 2.71e-06 5.17e-06 5.02e-06 -44Ti 5.72e-04 1.99e-05 5.72e-04 1.99e-05 5.54e-04 1.27e-05 -48V 2.60e-07 4.18e-08 2.64e-07 4.15e-08 3.83e-07 7.60e-08 -49V 5.38e-08 1.38e-07 5.52e-08 1.38e-07 1.08e-07 5.80e-07 -48Cr 2.53e-04 4.32e-04 2.51e-04 4.33e-04 1.95e-04 3.05e-04 -49Cr 3.59e-06 2.24e-05 3.61e-06 2.22e-05 4.19e-06 3.28e-05 -51Cr 1.01e-07 6.76e-07 1.02e-07 6.65e-07 1.30e-07 9.60e-06 -51Mn 1.09e-05 5.49e-05 1.09e-05 5.43e-05 9.73e-06 1.06e-04 -52Mn 1.46e-07 2.87e-06 1.47e-07 2.87e-06 1.91e-07 4.00e-06 -53Mn 6.49e-08 1.76e-05 6.64e-08 1.74e-05 1.29e-07 1.20e-04 -54Mn 5.15e-11 1.37e-08 3.21e-10 1.44e-08 1.25e-08 5.87e-07 -52Fe 2.91e-05 9.49e-03 2.87e-05 9.51e-03 1.93e-05 7.21e-03 -53Fe 1.22e-06 6.44e-04 1.22e-06 6.40e-04 1.19e-06 1.04e-03 -55Fe 1.08e-08 1.86e-05 1.37e-08 1.82e-05 1.51e-07 3.72e-04 -59Fe 2.37e-09 2.82e-09 2.54e-08 2.89e-08 1.23e-06 8.06e-07 -60Fe 1.27e-08 1.21e-08 1.26e-07 1.19e-07 1.41e-06 9.11e-06 -55Co 1.27e-06 3.32e-03 1.27e-06 3.29e-03 1.32e-06 7.14e-03 -56Co 1.81e-08 1.21e-05 1.97e-08 1.20e-05 8.33e-08 3.24e-05 -57Co 1.04e-08 2.94e-06 6.76e-08 2.90e-06 3.05e-06 4.34e-05 -58Co 4.09e-10 4.69e-09 4.36e-09 6.07e-09 3.61e-07 1.45e-07 -60Co 8.52e-09 5.15e-09 8.40e-08 5.15e-08 7.48e-07 1.09e-06 -56Ni 1.80e-06 5.59e-01 1.80e-06 5.59e-01 1.79e-06 4.86e-01 -57Ni 2.90e-07 9.28e-03 2.97e-07 9.23e-03 4.86e-07 1.58e-02 -59Ni 1.85e-08 3.47e-05 6.98e-08 3.44e-05 2.07e-06 6.96e-05 -63Ni 7.22e-10 3.78e-09 7.13e-09 3.65e-08 1.41e-07 1.52e-06 -62Zn 5.05e-08 1.27e-03 2.17e-07 1.26e-03 1.84e-06 3.69e-03 -65Zn 1.82e-10 9.79e-09 1.43e-09 3.76e-08 1.42e-08 9.24e-08 -65Ge 8.47e-10 8.36e-07 2.07e-09 8.34e-07 6.04e-09 7.22e-07 +14C 9.13e-09 4.82e-07 9.25e-09 4.55e-07 1.07e-08 1.09e-06 +22Na 4.63e-08 7.63e-09 4.85e-08 7.62e-09 1.15e-07 5.23e-09 +26Al 6.68e-06 4.05e-06 6.69e-06 4.08e-06 7.41e-06 1.57e-06 +32Si 9.92e-11 2.11e-10 1.67e-10 2.53e-10 2.82e-10 2.52e-08 +32P 4.98e-09 8.29e-08 5.13e-09 8.09e-08 5.94e-09 1.31e-06 +33P 1.26e-09 5.62e-08 1.33e-09 5.51e-08 2.79e-09 8.13e-07 +35S 2.55e-09 6.27e-08 2.74e-09 5.95e-08 6.27e-09 1.94e-06 +36Cl 5.32e-09 2.60e-07 5.39e-09 2.52e-07 7.63e-09 1.82e-06 +37Ar 1.96e-06 1.45e-05 1.96e-06 1.42e-05 2.17e-06 2.80e-05 +39Ar 1.42e-10 2.70e-09 1.08e-09 3.69e-09 1.89e-08 1.44e-07 +40K 4.62e-10 1.74e-08 6.79e-10 1.69e-08 6.00e-09 1.51e-07 +41Ca 4.61e-06 2.77e-06 4.61e-06 2.71e-06 5.17e-06 5.02e-06 +44Ti 5.72e-04 1.99e-05 5.72e-04 1.99e-05 5.54e-04 1.27e-05 +48V 2.60e-07 4.18e-08 2.64e-07 4.15e-08 3.83e-07 7.60e-08 +49V 5.38e-08 1.38e-07 5.52e-08 1.38e-07 1.08e-07 5.80e-07 +48Cr 2.53e-04 4.32e-04 2.51e-04 4.33e-04 1.95e-04 3.05e-04 +49Cr 3.59e-06 2.24e-05 3.61e-06 2.22e-05 4.19e-06 3.28e-05 +51Cr 1.01e-07 6.76e-07 1.02e-07 6.65e-07 1.30e-07 9.60e-06 +51Mn 1.09e-05 5.49e-05 1.09e-05 5.43e-05 9.73e-06 1.06e-04 +52Mn 1.46e-07 2.87e-06 1.47e-07 2.87e-06 1.91e-07 4.00e-06 +53Mn 6.49e-08 1.76e-05 6.64e-08 1.74e-05 1.29e-07 1.20e-04 +54Mn 5.15e-11 1.37e-08 3.21e-10 1.44e-08 1.25e-08 5.87e-07 +52Fe 2.91e-05 9.49e-03 2.87e-05 9.51e-03 1.93e-05 7.21e-03 +53Fe 1.22e-06 6.44e-04 1.22e-06 6.40e-04 1.19e-06 1.04e-03 +55Fe 1.08e-08 1.86e-05 1.37e-08 1.82e-05 1.51e-07 3.72e-04 +59Fe 2.37e-09 2.82e-09 2.54e-08 2.89e-08 1.23e-06 8.06e-07 +60Fe 1.27e-08 1.21e-08 1.26e-07 1.19e-07 1.41e-06 9.11e-06 +55Co 1.27e-06 3.32e-03 1.27e-06 3.29e-03 1.32e-06 7.14e-03 +56Co 1.81e-08 1.21e-05 1.97e-08 1.20e-05 8.33e-08 3.24e-05 +57Co 1.04e-08 2.94e-06 6.76e-08 2.90e-06 3.05e-06 4.34e-05 +58Co 4.09e-10 4.69e-09 4.36e-09 6.07e-09 3.61e-07 1.45e-07 +60Co 8.52e-09 5.15e-09 8.40e-08 5.15e-08 7.48e-07 1.09e-06 +56Ni 1.80e-06 5.59e-01 1.80e-06 5.59e-01 1.79e-06 4.86e-01 +57Ni 2.90e-07 9.28e-03 2.97e-07 9.23e-03 4.86e-07 1.58e-02 +59Ni 1.85e-08 3.47e-05 6.98e-08 3.44e-05 2.07e-06 6.96e-05 +63Ni 7.22e-10 3.78e-09 7.13e-09 3.65e-08 1.41e-07 1.52e-06 +62Zn 5.05e-08 1.27e-03 2.17e-07 1.26e-03 1.84e-06 3.69e-03 +65Zn 1.82e-10 9.79e-09 1.43e-09 3.76e-08 1.42e-08 9.24e-08 +65Ge 8.47e-10 8.36e-07 2.07e-09 8.34e-07 6.04e-09 7.22e-07 diff --git a/vice/yields/sneia/gronow21/raw/table19.dat b/vice/yields/sneia/gronow21/raw/table19.dat index 7a315343..74555490 100644 --- a/vice/yields/sneia/gronow21/raw/table19.dat +++ b/vice/yields/sneia/gronow21/raw/table19.dat @@ -1,39 +1,39 @@ -14C 8.73e-10 6.33e-08 8.84e-10 5.84e-08 8.62e-10 3.51e-07 -22Na 1.96e-08 7.01e-09 2.04e-08 6.99e-09 4.12e-08 4.96e-09 -26Al 5.01e-06 3.83e-06 5.00e-06 3.85e-06 5.07e-06 1.49e-06 -32Si 7.27e-12 9.32e-11 8.88e-12 9.69e-11 1.12e-11 1.72e-08 -32P 1.43e-08 6.92e-08 1.43e-08 6.73e-08 1.50e-08 1.13e-06 -33P 8.37e-09 4.71e-08 8.35e-09 4.59e-08 8.74e-09 6.75e-07 -35S 1.41e-08 5.25e-08 1.41e-08 4.95e-08 1.57e-08 1.62e-06 -36Cl 3.95e-08 2.21e-07 3.94e-08 2.14e-07 4.22e-08 1.54e-06 -37Ar 7.91e-06 1.30e-05 7.89e-06 1.28e-05 7.92e-06 2.50e-05 -39Ar 5.67e-10 2.20e-09 7.15e-10 2.55e-09 3.91e-09 1.10e-07 -40K 4.48e-09 1.46e-08 4.61e-09 1.42e-08 1.00e-08 1.27e-07 -41Ca 6.33e-06 2.52e-06 6.32e-06 2.48e-06 6.70e-06 4.54e-06 -44Ti 1.05e-03 2.01e-05 1.05e-03 2.02e-05 1.17e-03 1.24e-05 -48V 4.48e-07 3.68e-08 4.52e-07 3.66e-08 6.26e-07 6.81e-08 -49V 1.12e-07 1.24e-07 1.16e-07 1.24e-07 2.21e-07 5.16e-07 -48Cr 1.71e-03 4.03e-04 1.71e-03 4.03e-04 1.55e-03 2.85e-04 -49Cr 1.13e-05 2.06e-05 1.13e-05 2.05e-05 1.36e-05 3.06e-05 -51Cr 4.72e-07 6.15e-07 4.75e-07 6.07e-07 5.91e-07 8.57e-06 -51Mn 6.03e-05 5.08e-05 6.04e-05 5.03e-05 6.14e-05 9.90e-05 -52Mn 9.08e-07 2.59e-06 9.08e-07 2.59e-06 9.37e-07 3.64e-06 -53Mn 5.24e-07 1.60e-05 5.27e-07 1.59e-05 6.62e-07 1.08e-04 -54Mn 8.14e-11 1.25e-08 3.24e-10 1.33e-08 9.76e-09 5.31e-07 -52Fe 7.31e-04 8.74e-03 7.24e-04 8.75e-03 5.12e-04 6.66e-03 -53Fe 1.22e-05 5.93e-04 1.22e-05 5.89e-04 1.16e-05 9.63e-04 -55Fe 5.64e-08 1.70e-05 6.23e-08 1.68e-05 3.26e-07 3.31e-04 -59Fe 6.53e-10 1.77e-09 6.99e-09 1.82e-08 4.26e-07 4.55e-07 -60Fe 3.80e-09 9.38e-09 3.79e-08 9.12e-08 5.80e-07 7.94e-06 -55Co 1.74e-05 3.06e-03 1.73e-05 3.02e-03 1.40e-05 6.61e-03 -56Co 1.14e-07 1.19e-05 1.16e-07 1.18e-05 1.97e-07 3.06e-05 -57Co 2.59e-08 2.85e-06 6.87e-08 2.82e-06 3.40e-06 3.94e-05 -58Co 5.28e-10 4.33e-09 5.48e-09 5.66e-09 4.94e-07 1.31e-07 -60Co 2.93e-09 5.03e-09 2.90e-08 5.02e-08 5.19e-07 9.67e-07 -56Ni 6.95e-05 6.10e-01 6.85e-05 6.11e-01 4.25e-05 5.32e-01 -57Ni 3.37e-06 1.11e-02 3.37e-06 1.10e-02 3.09e-06 1.86e-02 -59Ni 9.35e-08 4.59e-05 2.81e-07 4.55e-05 9.02e-06 8.90e-05 -63Ni 1.08e-09 3.39e-09 1.04e-08 3.26e-08 1.26e-07 1.45e-06 -62Zn 2.42e-07 1.69e-03 5.20e-07 1.67e-03 4.01e-06 4.81e-03 -65Zn 2.87e-09 1.15e-08 2.59e-08 3.40e-08 3.17e-07 7.87e-08 -65Ge 4.42e-09 1.10e-06 7.68e-09 1.10e-06 2.61e-08 9.23e-07 +14C 8.73e-10 6.33e-08 8.84e-10 5.84e-08 8.62e-10 3.51e-07 +22Na 1.96e-08 7.01e-09 2.04e-08 6.99e-09 4.12e-08 4.96e-09 +26Al 5.01e-06 3.83e-06 5.00e-06 3.85e-06 5.07e-06 1.49e-06 +32Si 7.27e-12 9.32e-11 8.88e-12 9.69e-11 1.12e-11 1.72e-08 +32P 1.43e-08 6.92e-08 1.43e-08 6.73e-08 1.50e-08 1.13e-06 +33P 8.37e-09 4.71e-08 8.35e-09 4.59e-08 8.74e-09 6.75e-07 +35S 1.41e-08 5.25e-08 1.41e-08 4.95e-08 1.57e-08 1.62e-06 +36Cl 3.95e-08 2.21e-07 3.94e-08 2.14e-07 4.22e-08 1.54e-06 +37Ar 7.91e-06 1.30e-05 7.89e-06 1.28e-05 7.92e-06 2.50e-05 +39Ar 5.67e-10 2.20e-09 7.15e-10 2.55e-09 3.91e-09 1.10e-07 +40K 4.48e-09 1.46e-08 4.61e-09 1.42e-08 1.00e-08 1.27e-07 +41Ca 6.33e-06 2.52e-06 6.32e-06 2.48e-06 6.70e-06 4.54e-06 +44Ti 1.05e-03 2.01e-05 1.05e-03 2.02e-05 1.17e-03 1.24e-05 +48V 4.48e-07 3.68e-08 4.52e-07 3.66e-08 6.26e-07 6.81e-08 +49V 1.12e-07 1.24e-07 1.16e-07 1.24e-07 2.21e-07 5.16e-07 +48Cr 1.71e-03 4.03e-04 1.71e-03 4.03e-04 1.55e-03 2.85e-04 +49Cr 1.13e-05 2.06e-05 1.13e-05 2.05e-05 1.36e-05 3.06e-05 +51Cr 4.72e-07 6.15e-07 4.75e-07 6.07e-07 5.91e-07 8.57e-06 +51Mn 6.03e-05 5.08e-05 6.04e-05 5.03e-05 6.14e-05 9.90e-05 +52Mn 9.08e-07 2.59e-06 9.08e-07 2.59e-06 9.37e-07 3.64e-06 +53Mn 5.24e-07 1.60e-05 5.27e-07 1.59e-05 6.62e-07 1.08e-04 +54Mn 8.14e-11 1.25e-08 3.24e-10 1.33e-08 9.76e-09 5.31e-07 +52Fe 7.31e-04 8.74e-03 7.24e-04 8.75e-03 5.12e-04 6.66e-03 +53Fe 1.22e-05 5.93e-04 1.22e-05 5.89e-04 1.16e-05 9.63e-04 +55Fe 5.64e-08 1.70e-05 6.23e-08 1.68e-05 3.26e-07 3.31e-04 +59Fe 6.53e-10 1.77e-09 6.99e-09 1.82e-08 4.26e-07 4.55e-07 +60Fe 3.80e-09 9.38e-09 3.79e-08 9.12e-08 5.80e-07 7.94e-06 +55Co 1.74e-05 3.06e-03 1.73e-05 3.02e-03 1.40e-05 6.61e-03 +56Co 1.14e-07 1.19e-05 1.16e-07 1.18e-05 1.97e-07 3.06e-05 +57Co 2.59e-08 2.85e-06 6.87e-08 2.82e-06 3.40e-06 3.94e-05 +58Co 5.28e-10 4.33e-09 5.48e-09 5.66e-09 4.94e-07 1.31e-07 +60Co 2.93e-09 5.03e-09 2.90e-08 5.02e-08 5.19e-07 9.67e-07 +56Ni 6.95e-05 6.10e-01 6.85e-05 6.11e-01 4.25e-05 5.32e-01 +57Ni 3.37e-06 1.11e-02 3.37e-06 1.10e-02 3.09e-06 1.86e-02 +59Ni 9.35e-08 4.59e-05 2.81e-07 4.55e-05 9.02e-06 8.90e-05 +63Ni 1.08e-09 3.39e-09 1.04e-08 3.26e-08 1.26e-07 1.45e-06 +62Zn 2.42e-07 1.69e-03 5.20e-07 1.67e-03 4.01e-06 4.81e-03 +65Zn 2.87e-09 1.15e-08 2.59e-08 3.40e-08 3.17e-07 7.87e-08 +65Ge 4.42e-09 1.10e-06 7.68e-09 1.10e-06 2.61e-08 9.23e-07 diff --git a/vice/yields/sneia/gronow21/raw/table2.dat b/vice/yields/sneia/gronow21/raw/table2.dat index 31bd2172..bb4945e9 100644 --- a/vice/yields/sneia/gronow21/raw/table2.dat +++ b/vice/yields/sneia/gronow21/raw/table2.dat @@ -1,68 +1,68 @@ -12C 2.34e-03 7.55e-03 2.33e-03 7.55e-03 2.27e-03 7.25e-03 -13C 5.16e-10 7.76e-08 5.15e-10 7.40e-08 3.61e-10 4.36e-07 -14N 3.44e-07 6.82e-06 1.42e-06 6.57e-06 3.62e-05 1.08e-05 -15N 3.46e-08 1.49e-08 3.62e-08 1.45e-08 9.03e-08 1.95e-08 -16O 6.07e-03 1.16e-01 6.10e-03 1.16e-01 6.61e-03 1.18e-01 -17O 2.19e-08 1.67e-06 2.35e-08 1.62e-06 6.59e-08 2.37e-06 -18O 3.67e-08 2.99e-08 4.63e-08 2.88e-08 3.53e-07 4.39e-08 -19F 2.08e-08 4.93e-10 2.19e-08 4.75e-10 5.84e-08 1.52e-09 -20Ne 3.05e-03 5.39e-03 3.05e-03 5.39e-03 3.07e-03 4.75e-03 -21Ne 2.30e-07 2.02e-06 2.32e-07 1.93e-06 3.14e-07 7.43e-06 -22Ne 1.66e-07 3.39e-05 1.89e-07 3.26e-05 8.76e-07 3.07e-04 -23Na 1.65e-05 5.54e-05 1.65e-05 5.44e-05 1.63e-05 1.49e-04 -24Mg 4.17e-03 1.00e-02 4.18e-03 1.03e-02 4.27e-03 4.54e-03 -25Mg 2.25e-05 8.73e-05 2.25e-05 8.56e-05 2.67e-05 3.33e-04 -26Mg 3.82e-05 1.21e-04 3.81e-05 1.18e-04 3.76e-05 4.75e-04 -27Al 1.47e-04 4.19e-04 1.47e-04 4.21e-04 1.51e-04 5.37e-04 -28Si 9.24e-03 2.28e-01 9.24e-03 2.28e-01 9.41e-03 2.26e-01 -29Si 1.15e-04 6.29e-04 1.14e-04 6.23e-04 1.13e-04 2.07e-03 -30Si 1.05e-04 8.54e-04 1.05e-04 8.45e-04 1.10e-04 4.51e-03 -31P 8.62e-05 4.32e-04 8.63e-05 4.26e-04 9.14e-05 1.19e-03 -32S 4.69e-03 1.31e-01 4.69e-03 1.31e-01 4.81e-03 1.11e-01 -33S 5.55e-05 3.34e-04 5.53e-05 3.30e-04 5.46e-05 6.19e-04 -34S 2.75e-05 1.78e-03 2.73e-05 1.73e-03 2.76e-05 8.29e-03 -36S 1.98e-09 5.30e-08 3.22e-09 5.93e-08 1.93e-08 5.06e-06 -35Cl 4.36e-05 1.11e-04 4.38e-05 1.08e-04 5.49e-05 2.89e-04 -37Cl 1.03e-05 2.40e-05 1.03e-05 2.35e-05 1.04e-05 4.66e-05 -36Ar 2.09e-03 2.34e-02 2.10e-03 2.34e-02 2.16e-03 1.69e-02 -38Ar 1.29e-05 7.54e-04 1.30e-05 7.30e-04 1.71e-05 3.43e-03 -40Ar 5.12e-10 5.24e-09 2.08e-09 9.26e-09 1.60e-08 5.27e-07 -39K 1.07e-04 5.86e-05 1.09e-04 5.73e-05 1.66e-04 1.30e-04 -41K 9.15e-06 4.08e-06 9.15e-06 3.99e-06 1.06e-05 7.17e-06 -40Ca 7.85e-03 2.04e-02 7.86e-03 2.04e-02 8.47e-03 1.41e-02 -42Ca 4.36e-06 1.95e-05 4.44e-06 1.87e-05 8.01e-06 8.10e-05 -43Ca 1.93e-05 6.43e-08 1.93e-05 6.41e-08 2.31e-05 4.50e-07 -44Ca 2.57e-03 1.33e-05 2.58e-03 1.33e-05 2.87e-03 1.02e-05 -46Ca 6.73e-11 2.55e-10 6.49e-10 2.29e-09 6.20e-09 2.48e-07 -48Ca 1.40e-11 1.95e-11 1.35e-10 1.85e-10 2.87e-09 2.16e-08 -45Sc 4.73e-06 2.01e-07 4.78e-06 2.00e-07 7.28e-06 6.66e-07 -46Ti 2.65e-06 7.26e-06 2.69e-06 7.01e-06 4.32e-06 2.68e-05 -47Ti 6.88e-05 3.01e-07 6.94e-05 2.96e-07 9.45e-05 1.56e-06 -48Ti 2.67e-03 3.48e-04 2.66e-03 3.49e-04 2.43e-03 2.40e-04 -49Ti 2.03e-05 1.98e-05 2.05e-05 1.97e-05 2.83e-05 2.79e-05 -50Ti 5.56e-11 6.15e-10 5.66e-10 2.79e-09 2.04e-08 5.87e-07 -50V 4.16e-11 3.44e-09 1.77e-10 4.28e-09 3.41e-09 1.55e-07 -51V 1.12e-04 4.83e-05 1.12e-04 4.78e-05 1.17e-04 9.96e-05 -50Cr 7.60e-06 1.33e-04 7.69e-06 1.31e-04 1.12e-05 6.63e-04 -52Cr 8.92e-04 7.37e-03 8.84e-04 7.39e-03 6.40e-04 5.77e-03 -53Cr 2.00e-05 5.39e-04 2.01e-05 5.35e-04 2.20e-05 9.48e-04 -54Cr 2.18e-10 1.96e-08 1.52e-09 2.51e-08 6.56e-08 1.19e-06 -55Mn 3.04e-05 2.65e-03 3.04e-05 2.63e-03 2.76e-05 5.77e-03 -54Fe 8.74e-06 1.37e-02 8.81e-06 1.35e-02 1.07e-05 5.72e-02 -56Fe 7.54e-05 2.10e-01 7.51e-05 2.10e-01 7.40e-05 1.79e-01 -57Fe 6.53e-06 2.04e-03 6.71e-06 2.02e-03 1.57e-05 3.73e-03 -58Fe 6.06e-09 2.48e-08 6.49e-08 1.95e-07 5.09e-06 7.55e-06 -59Co 8.19e-07 9.85e-06 1.33e-06 1.01e-05 2.39e-05 3.28e-05 -58Ni 2.64e-06 1.81e-03 3.03e-06 1.78e-03 3.25e-05 7.82e-03 -60Ni 1.39e-06 1.49e-04 2.41e-06 1.54e-04 2.17e-05 2.39e-04 -61Ni 5.72e-07 4.44e-06 9.83e-07 4.84e-06 8.73e-06 2.41e-05 -62Ni 6.61e-07 2.57e-05 1.58e-06 2.77e-05 1.57e-05 1.67e-04 -64Ni 1.44e-09 1.09e-08 1.43e-08 1.06e-07 2.57e-07 9.25e-06 -63Cu 5.06e-08 4.72e-08 2.14e-07 3.82e-07 2.53e-06 8.72e-06 -64Zn 1.31e-07 3.96e-07 2.48e-07 9.31e-07 2.35e-06 1.80e-06 -66Zn 8.59e-08 4.94e-07 2.42e-07 1.76e-06 1.97e-06 1.63e-05 -67Zn 2.72e-08 2.72e-09 8.30e-08 2.46e-08 7.25e-07 1.37e-06 -68Zn 3.58e-08 8.24e-09 1.20e-07 7.91e-08 6.68e-07 2.77e-06 -70Zn 7.38e-12 8.42e-11 7.73e-11 8.14e-10 5.30e-09 6.08e-08 -69Ga 2.87e-09 5.06e-09 1.05e-08 4.93e-08 6.18e-08 4.48e-07 -71Ga 5.64e-10 6.97e-10 2.62e-09 6.65e-09 2.24e-08 1.82e-07 +12C 2.34e-03 7.55e-03 2.33e-03 7.55e-03 2.27e-03 7.25e-03 +13C 5.16e-10 7.76e-08 5.15e-10 7.40e-08 3.61e-10 4.36e-07 +14N 3.44e-07 6.82e-06 1.42e-06 6.57e-06 3.62e-05 1.08e-05 +15N 3.46e-08 1.49e-08 3.62e-08 1.45e-08 9.03e-08 1.95e-08 +16O 6.07e-03 1.16e-01 6.10e-03 1.16e-01 6.61e-03 1.18e-01 +17O 2.19e-08 1.67e-06 2.35e-08 1.62e-06 6.59e-08 2.37e-06 +18O 3.67e-08 2.99e-08 4.63e-08 2.88e-08 3.53e-07 4.39e-08 +19F 2.08e-08 4.93e-10 2.19e-08 4.75e-10 5.84e-08 1.52e-09 +20Ne 3.05e-03 5.39e-03 3.05e-03 5.39e-03 3.07e-03 4.75e-03 +21Ne 2.30e-07 2.02e-06 2.32e-07 1.93e-06 3.14e-07 7.43e-06 +22Ne 1.66e-07 3.39e-05 1.89e-07 3.26e-05 8.76e-07 3.07e-04 +23Na 1.65e-05 5.54e-05 1.65e-05 5.44e-05 1.63e-05 1.49e-04 +24Mg 4.17e-03 1.00e-02 4.18e-03 1.03e-02 4.27e-03 4.54e-03 +25Mg 2.25e-05 8.73e-05 2.25e-05 8.56e-05 2.67e-05 3.33e-04 +26Mg 3.82e-05 1.21e-04 3.81e-05 1.18e-04 3.76e-05 4.75e-04 +27Al 1.47e-04 4.19e-04 1.47e-04 4.21e-04 1.51e-04 5.37e-04 +28Si 9.24e-03 2.28e-01 9.24e-03 2.28e-01 9.41e-03 2.26e-01 +29Si 1.15e-04 6.29e-04 1.14e-04 6.23e-04 1.13e-04 2.07e-03 +30Si 1.05e-04 8.54e-04 1.05e-04 8.45e-04 1.10e-04 4.51e-03 +31P 8.62e-05 4.32e-04 8.63e-05 4.26e-04 9.14e-05 1.19e-03 +32S 4.69e-03 1.31e-01 4.69e-03 1.31e-01 4.81e-03 1.11e-01 +33S 5.55e-05 3.34e-04 5.53e-05 3.30e-04 5.46e-05 6.19e-04 +34S 2.75e-05 1.78e-03 2.73e-05 1.73e-03 2.76e-05 8.29e-03 +36S 1.98e-09 5.30e-08 3.22e-09 5.93e-08 1.93e-08 5.06e-06 +35Cl 4.36e-05 1.11e-04 4.38e-05 1.08e-04 5.49e-05 2.89e-04 +37Cl 1.03e-05 2.40e-05 1.03e-05 2.35e-05 1.04e-05 4.66e-05 +36Ar 2.09e-03 2.34e-02 2.10e-03 2.34e-02 2.16e-03 1.69e-02 +38Ar 1.29e-05 7.54e-04 1.30e-05 7.30e-04 1.71e-05 3.43e-03 +40Ar 5.12e-10 5.24e-09 2.08e-09 9.26e-09 1.60e-08 5.27e-07 +39K 1.07e-04 5.86e-05 1.09e-04 5.73e-05 1.66e-04 1.30e-04 +41K 9.15e-06 4.08e-06 9.15e-06 3.99e-06 1.06e-05 7.17e-06 +40Ca 7.85e-03 2.04e-02 7.86e-03 2.04e-02 8.47e-03 1.41e-02 +42Ca 4.36e-06 1.95e-05 4.44e-06 1.87e-05 8.01e-06 8.10e-05 +43Ca 1.93e-05 6.43e-08 1.93e-05 6.41e-08 2.31e-05 4.50e-07 +44Ca 2.57e-03 1.33e-05 2.58e-03 1.33e-05 2.87e-03 1.02e-05 +46Ca 6.73e-11 2.55e-10 6.49e-10 2.29e-09 6.20e-09 2.48e-07 +48Ca 1.40e-11 1.95e-11 1.35e-10 1.85e-10 2.87e-09 2.16e-08 +45Sc 4.73e-06 2.01e-07 4.78e-06 2.00e-07 7.28e-06 6.66e-07 +46Ti 2.65e-06 7.26e-06 2.69e-06 7.01e-06 4.32e-06 2.68e-05 +47Ti 6.88e-05 3.01e-07 6.94e-05 2.96e-07 9.45e-05 1.56e-06 +48Ti 2.67e-03 3.48e-04 2.66e-03 3.49e-04 2.43e-03 2.40e-04 +49Ti 2.03e-05 1.98e-05 2.05e-05 1.97e-05 2.83e-05 2.79e-05 +50Ti 5.56e-11 6.15e-10 5.66e-10 2.79e-09 2.04e-08 5.87e-07 +50V 4.16e-11 3.44e-09 1.77e-10 4.28e-09 3.41e-09 1.55e-07 +51V 1.12e-04 4.83e-05 1.12e-04 4.78e-05 1.17e-04 9.96e-05 +50Cr 7.60e-06 1.33e-04 7.69e-06 1.31e-04 1.12e-05 6.63e-04 +52Cr 8.92e-04 7.37e-03 8.84e-04 7.39e-03 6.40e-04 5.77e-03 +53Cr 2.00e-05 5.39e-04 2.01e-05 5.35e-04 2.20e-05 9.48e-04 +54Cr 2.18e-10 1.96e-08 1.52e-09 2.51e-08 6.56e-08 1.19e-06 +55Mn 3.04e-05 2.65e-03 3.04e-05 2.63e-03 2.76e-05 5.77e-03 +54Fe 8.74e-06 1.37e-02 8.81e-06 1.35e-02 1.07e-05 5.72e-02 +56Fe 7.54e-05 2.10e-01 7.51e-05 2.10e-01 7.40e-05 1.79e-01 +57Fe 6.53e-06 2.04e-03 6.71e-06 2.02e-03 1.57e-05 3.73e-03 +58Fe 6.06e-09 2.48e-08 6.49e-08 1.95e-07 5.09e-06 7.55e-06 +59Co 8.19e-07 9.85e-06 1.33e-06 1.01e-05 2.39e-05 3.28e-05 +58Ni 2.64e-06 1.81e-03 3.03e-06 1.78e-03 3.25e-05 7.82e-03 +60Ni 1.39e-06 1.49e-04 2.41e-06 1.54e-04 2.17e-05 2.39e-04 +61Ni 5.72e-07 4.44e-06 9.83e-07 4.84e-06 8.73e-06 2.41e-05 +62Ni 6.61e-07 2.57e-05 1.58e-06 2.77e-05 1.57e-05 1.67e-04 +64Ni 1.44e-09 1.09e-08 1.43e-08 1.06e-07 2.57e-07 9.25e-06 +63Cu 5.06e-08 4.72e-08 2.14e-07 3.82e-07 2.53e-06 8.72e-06 +64Zn 1.31e-07 3.96e-07 2.48e-07 9.31e-07 2.35e-06 1.80e-06 +66Zn 8.59e-08 4.94e-07 2.42e-07 1.76e-06 1.97e-06 1.63e-05 +67Zn 2.72e-08 2.72e-09 8.30e-08 2.46e-08 7.25e-07 1.37e-06 +68Zn 3.58e-08 8.24e-09 1.20e-07 7.91e-08 6.68e-07 2.77e-06 +70Zn 7.38e-12 8.42e-11 7.73e-11 8.14e-10 5.30e-09 6.08e-08 +69Ga 2.87e-09 5.06e-09 1.05e-08 4.93e-08 6.18e-08 4.48e-07 +71Ga 5.64e-10 6.97e-10 2.62e-09 6.65e-09 2.24e-08 1.82e-07 diff --git a/vice/yields/sneia/gronow21/raw/table20.dat b/vice/yields/sneia/gronow21/raw/table20.dat index 73404be3..c64c1e63 100644 --- a/vice/yields/sneia/gronow21/raw/table20.dat +++ b/vice/yields/sneia/gronow21/raw/table20.dat @@ -1,39 +1,39 @@ -14C 1.41e-12 1.03e-08 1.64e-12 9.76e-09 8.35e-12 4.47e-08 -22Na 3.59e-09 7.16e-09 3.71e-09 8.19e-09 7.09e-09 6.42e-09 -26Al 1.11e-07 3.88e-06 1.11e-07 3.89e-06 1.24e-07 1.64e-06 -32Si 2.44e-12 8.01e-10 2.54e-12 8.60e-11 2.90e-12 6.30e-09 -32P 1.97e-08 9.13e-08 2.00e-08 8.83e-08 2.12e-08 1.50e-06 -33P 1.59e-08 7.06e-08 1.61e-08 6.81e-08 1.71e-08 1.02e-06 -35S 5.37e-09 7.25e-08 5.33e-09 6.83e-08 5.50e-09 2.46e-06 -36Cl 7.84e-08 3.19e-07 7.82e-08 3.09e-07 8.05e-08 2.47e-06 -37Ar 5.40e-06 1.49e-05 5.35e-06 1.46e-05 5.59e-06 2.71e-05 -39Ar 2.36e-10 3.24e-09 2.30e-10 3.12e-09 2.63e-10 8.73e-08 -40K 1.86e-09 2.33e-08 1.82e-09 2.21e-08 2.17e-09 2.12e-07 -41Ca 1.84e-06 2.74e-06 1.84e-06 2.69e-06 2.42e-06 4.77e-06 -44Ti 7.79e-04 2.42e-05 7.80e-04 2.43e-05 8.10e-04 1.37e-05 -48V 4.79e-07 5.44e-08 4.86e-07 5.40e-08 7.56e-07 8.20e-08 -49V 1.85e-07 1.43e-07 1.87e-07 1.43e-07 2.72e-07 6.16e-07 -48Cr 2.06e-03 3.95e-04 2.06e-03 3.96e-04 2.15e-03 2.75e-04 -49Cr 2.03e-05 2.02e-05 2.05e-05 2.01e-05 2.61e-05 2.96e-05 -51Cr 1.07e-06 6.55e-07 1.07e-06 6.49e-07 1.27e-06 9.06e-06 -51Mn 1.47e-04 4.98e-05 1.47e-04 4.93e-05 1.58e-04 9.63e-05 -52Mn 4.23e-06 2.81e-06 4.27e-06 2.80e-06 5.45e-06 3.80e-06 -53Mn 2.40e-06 1.60e-05 2.43e-06 1.59e-05 3.42e-06 1.11e-04 -54Mn 2.78e-10 1.38e-08 3.49e-10 1.58e-08 3.43e-09 5.76e-07 -52Fe 4.02e-03 8.42e-03 4.03e-03 8.43e-03 4.36e-03 6.39e-03 -53Fe 5.53e-05 5.75e-04 5.59e-05 5.71e-04 7.56e-05 9.27e-04 -55Fe 4.09e-07 1.77e-05 4.22e-07 1.74e-05 1.08e-06 3.47e-04 -59Fe 9.45e-12 6.17e-10 7.11e-11 6.38e-09 6.18e-10 1.31e-07 -60Fe 7.26e-12 3.88e-09 6.09e-11 3.51e-08 7.48e-10 4.85e-06 -55Co 4.77e-04 2.96e-03 4.78e-04 2.93e-03 4.93e-04 6.37e-03 -56Co 1.33e-06 1.51e-05 1.34e-06 1.50e-05 1.84e-06 3.30e-05 -57Co 4.61e-07 2.97e-06 4.83e-07 2.92e-06 1.43e-06 4.05e-05 -58Co 1.54e-10 4.61e-09 1.00e-09 7.07e-09 4.24e-08 1.46e-07 -60Co 1.07e-11 3.41e-09 1.00e-10 3.36e-08 2.27e-09 1.05e-06 -56Ni 8.32e-03 5.56e-01 8.31e-03 5.57e-01 8.07e-03 4.84e-01 -57Ni 5.75e-04 1.01e-02 5.75e-04 1.00e-02 5.71e-04 1.69e-02 -59Ni 5.36e-06 4.35e-05 5.39e-06 4.31e-05 7.93e-06 8.35e-05 -63Ni 6.77e-12 1.58e-09 6.42e-11 1.51e-08 1.06e-09 1.34e-06 -62Zn 5.98e-05 1.57e-03 6.04e-05 1.55e-03 8.24e-05 4.48e-03 -65Zn 6.44e-08 1.57e-08 6.96e-08 6.41e-08 1.93e-07 1.95e-07 -65Ge 1.52e-06 1.26e-06 1.52e-06 1.25e-06 1.51e-06 1.10e-06 +14C 1.41e-12 1.03e-08 1.64e-12 9.76e-09 8.35e-12 4.47e-08 +22Na 3.59e-09 7.16e-09 3.71e-09 8.19e-09 7.09e-09 6.42e-09 +26Al 1.11e-07 3.88e-06 1.11e-07 3.89e-06 1.24e-07 1.64e-06 +32Si 2.44e-12 8.01e-10 2.54e-12 8.60e-11 2.90e-12 6.30e-09 +32P 1.97e-08 9.13e-08 2.00e-08 8.83e-08 2.12e-08 1.50e-06 +33P 1.59e-08 7.06e-08 1.61e-08 6.81e-08 1.71e-08 1.02e-06 +35S 5.37e-09 7.25e-08 5.33e-09 6.83e-08 5.50e-09 2.46e-06 +36Cl 7.84e-08 3.19e-07 7.82e-08 3.09e-07 8.05e-08 2.47e-06 +37Ar 5.40e-06 1.49e-05 5.35e-06 1.46e-05 5.59e-06 2.71e-05 +39Ar 2.36e-10 3.24e-09 2.30e-10 3.12e-09 2.63e-10 8.73e-08 +40K 1.86e-09 2.33e-08 1.82e-09 2.21e-08 2.17e-09 2.12e-07 +41Ca 1.84e-06 2.74e-06 1.84e-06 2.69e-06 2.42e-06 4.77e-06 +44Ti 7.79e-04 2.42e-05 7.80e-04 2.43e-05 8.10e-04 1.37e-05 +48V 4.79e-07 5.44e-08 4.86e-07 5.40e-08 7.56e-07 8.20e-08 +49V 1.85e-07 1.43e-07 1.87e-07 1.43e-07 2.72e-07 6.16e-07 +48Cr 2.06e-03 3.95e-04 2.06e-03 3.96e-04 2.15e-03 2.75e-04 +49Cr 2.03e-05 2.02e-05 2.05e-05 2.01e-05 2.61e-05 2.96e-05 +51Cr 1.07e-06 6.55e-07 1.07e-06 6.49e-07 1.27e-06 9.06e-06 +51Mn 1.47e-04 4.98e-05 1.47e-04 4.93e-05 1.58e-04 9.63e-05 +52Mn 4.23e-06 2.81e-06 4.27e-06 2.80e-06 5.45e-06 3.80e-06 +53Mn 2.40e-06 1.60e-05 2.43e-06 1.59e-05 3.42e-06 1.11e-04 +54Mn 2.78e-10 1.38e-08 3.49e-10 1.58e-08 3.43e-09 5.76e-07 +52Fe 4.02e-03 8.42e-03 4.03e-03 8.43e-03 4.36e-03 6.39e-03 +53Fe 5.53e-05 5.75e-04 5.59e-05 5.71e-04 7.56e-05 9.27e-04 +55Fe 4.09e-07 1.77e-05 4.22e-07 1.74e-05 1.08e-06 3.47e-04 +59Fe 9.45e-12 6.17e-10 7.11e-11 6.38e-09 6.18e-10 1.31e-07 +60Fe 7.26e-12 3.88e-09 6.09e-11 3.51e-08 7.48e-10 4.85e-06 +55Co 4.77e-04 2.96e-03 4.78e-04 2.93e-03 4.93e-04 6.37e-03 +56Co 1.33e-06 1.51e-05 1.34e-06 1.50e-05 1.84e-06 3.30e-05 +57Co 4.61e-07 2.97e-06 4.83e-07 2.92e-06 1.43e-06 4.05e-05 +58Co 1.54e-10 4.61e-09 1.00e-09 7.07e-09 4.24e-08 1.46e-07 +60Co 1.07e-11 3.41e-09 1.00e-10 3.36e-08 2.27e-09 1.05e-06 +56Ni 8.32e-03 5.56e-01 8.31e-03 5.57e-01 8.07e-03 4.84e-01 +57Ni 5.75e-04 1.01e-02 5.75e-04 1.00e-02 5.71e-04 1.69e-02 +59Ni 5.36e-06 4.35e-05 5.39e-06 4.31e-05 7.93e-06 8.35e-05 +63Ni 6.77e-12 1.58e-09 6.42e-11 1.51e-08 1.06e-09 1.34e-06 +62Zn 5.98e-05 1.57e-03 6.04e-05 1.55e-03 8.24e-05 4.48e-03 +65Zn 6.44e-08 1.57e-08 6.96e-08 6.41e-08 1.93e-07 1.95e-07 +65Ge 1.52e-06 1.26e-06 1.52e-06 1.25e-06 1.51e-06 1.10e-06 diff --git a/vice/yields/sneia/gronow21/raw/table21.dat b/vice/yields/sneia/gronow21/raw/table21.dat index 7cf0ed6c..a728bcdc 100644 --- a/vice/yields/sneia/gronow21/raw/table21.dat +++ b/vice/yields/sneia/gronow21/raw/table21.dat @@ -1,39 +1,39 @@ -14C 3.58e-14 7.47e-16 7.04e-14 7.84e-16 1.08e-12 2.09e-15 -22Na 1.25e-08 3.21e-13 1.22e-08 3.20e-13 6.93e-09 1.65e-10 -26Al 8.09e-07 1.46e-10 7.98e-07 1.50e-10 5.20e-07 5.55e-11 -32Si 4.10e-13 2.13e-13 5.85e-13 2.19e-13 5.18e-13 6.99e-12 -32P 3.87e-09 1.77e-09 3.93e-09 1.78e-09 4.29e-09 1.01e-08 -33P 1.58e-09 1.12e-09 1.63e-09 1.12e-09 1.78e-09 9.16e-09 -35S 8.28e-10 8.03e-10 8.54e-10 7.88e-10 9.10e-10 5.69e-09 -36Cl 8.25e-09 7.97e-09 8.24e-09 7.82e-09 8.67e-09 3.00e-08 -37Ar 1.63e-06 1.66e-06 1.62e-06 1.63e-06 1.65e-06 4.09e-06 -39Ar 4.45e-11 6.70e-11 4.50e-11 6.45e-11 5.23e-11 4.16e-10 -40K 3.04e-10 4.33e-10 3.00e-10 4.18e-10 3.91e-10 1.70e-09 -41Ca 3.19e-07 4.10e-07 3.21e-07 4.03e-07 4.78e-07 8.56e-07 -44Ti 2.68e-04 2.04e-05 2.68e-04 2.04e-05 2.78e-04 1.25e-05 -48V 1.28e-07 2.54e-08 1.28e-07 2.54e-08 2.28e-07 2.60e-08 -49V 4.58e-08 8.20e-08 4.62e-08 8.14e-08 7.37e-08 1.66e-07 -48Cr 5.30e-04 4.14e-04 5.32e-04 4.14e-04 5.96e-04 3.00e-04 -49Cr 9.11e-06 2.00e-05 9.16e-06 1.99e-05 1.11e-05 3.16e-05 -51Cr 3.81e-07 2.28e-07 3.79e-07 2.23e-07 4.86e-07 2.04e-06 -51Mn 8.48e-05 4.88e-05 8.46e-05 4.83e-05 7.91e-05 1.02e-04 -52Mn 1.10e-06 2.52e-06 1.11e-06 2.52e-06 1.47e-06 3.11e-06 -53Mn 1.66e-06 1.32e-05 1.67e-06 1.31e-05 2.55e-06 3.98e-05 -54Mn 1.71e-09 1.37e-09 1.76e-09 1.50e-09 1.12e-08 6.67e-08 -52Fe 1.96e-03 9.26e-03 1.97e-03 9.28e-03 2.05e-03 7.19e-03 -53Fe 5.34e-05 6.10e-04 5.36e-05 6.06e-04 6.39e-05 1.03e-03 -55Fe 1.77e-06 3.22e-06 1.80e-06 3.00e-06 3.65e-06 8.56e-05 -59Fe 7.84e-13 3.86e-10 5.87e-12 8.77e-16 4.55e-11 6.54e-11 -60Fe 1.60e-13 1.57e-09 9.65e-13 2.09e-17 1.60e-12 3.40e-11 -55Co 2.50e-04 3.16e-03 2.51e-04 3.13e-03 2.74e-04 7.15e-03 -56Co 7.09e-07 1.24e-05 7.17e-07 1.23e-05 9.47e-07 3.08e-05 -57Co 3.22e-07 1.17e-06 3.30e-07 1.12e-06 6.31e-07 1.19e-05 -58Co 3.28e-10 4.92e-10 4.63e-10 4.41e-10 5.09e-09 1.61e-08 -60Co 2.96e-13 6.85e-11 2.26e-12 4.86e-14 3.61e-11 7.93e-11 -56Ni 3.95e-02 7.45e-01 3.95e-02 7.45e-01 3.89e-02 6.52e-01 -57Ni 1.37e-03 1.41e-02 1.37e-03 1.40e-02 1.50e-03 2.49e-02 -59Ni 5.24e-05 6.09e-05 5.19e-05 6.04e-05 3.69e-05 1.41e-04 -63Ni 1.41e-13 2.85e-09 1.19e-12 4.59e-13 2.23e-11 1.61e-10 -62Zn 9.91e-05 2.25e-03 9.89e-05 2.21e-03 9.57e-05 6.05e-03 -65Zn 2.51e-08 1.19e-08 2.52e-08 1.19e-08 2.77e-08 1.01e-08 -65Ge 3.17e-06 1.42e-06 3.16e-06 1.42e-06 2.97e-06 1.13e-06 +14C 3.58e-14 7.47e-16 7.04e-14 7.84e-16 1.08e-12 2.09e-15 +22Na 1.25e-08 3.21e-13 1.22e-08 3.20e-13 6.93e-09 1.65e-10 +26Al 8.09e-07 1.46e-10 7.98e-07 1.50e-10 5.20e-07 5.55e-11 +32Si 4.10e-13 2.13e-13 5.85e-13 2.19e-13 5.18e-13 6.99e-12 +32P 3.87e-09 1.77e-09 3.93e-09 1.78e-09 4.29e-09 1.01e-08 +33P 1.58e-09 1.12e-09 1.63e-09 1.12e-09 1.78e-09 9.16e-09 +35S 8.28e-10 8.03e-10 8.54e-10 7.88e-10 9.10e-10 5.69e-09 +36Cl 8.25e-09 7.97e-09 8.24e-09 7.82e-09 8.67e-09 3.00e-08 +37Ar 1.63e-06 1.66e-06 1.62e-06 1.63e-06 1.65e-06 4.09e-06 +39Ar 4.45e-11 6.70e-11 4.50e-11 6.45e-11 5.23e-11 4.16e-10 +40K 3.04e-10 4.33e-10 3.00e-10 4.18e-10 3.91e-10 1.70e-09 +41Ca 3.19e-07 4.10e-07 3.21e-07 4.03e-07 4.78e-07 8.56e-07 +44Ti 2.68e-04 2.04e-05 2.68e-04 2.04e-05 2.78e-04 1.25e-05 +48V 1.28e-07 2.54e-08 1.28e-07 2.54e-08 2.28e-07 2.60e-08 +49V 4.58e-08 8.20e-08 4.62e-08 8.14e-08 7.37e-08 1.66e-07 +48Cr 5.30e-04 4.14e-04 5.32e-04 4.14e-04 5.96e-04 3.00e-04 +49Cr 9.11e-06 2.00e-05 9.16e-06 1.99e-05 1.11e-05 3.16e-05 +51Cr 3.81e-07 2.28e-07 3.79e-07 2.23e-07 4.86e-07 2.04e-06 +51Mn 8.48e-05 4.88e-05 8.46e-05 4.83e-05 7.91e-05 1.02e-04 +52Mn 1.10e-06 2.52e-06 1.11e-06 2.52e-06 1.47e-06 3.11e-06 +53Mn 1.66e-06 1.32e-05 1.67e-06 1.31e-05 2.55e-06 3.98e-05 +54Mn 1.71e-09 1.37e-09 1.76e-09 1.50e-09 1.12e-08 6.67e-08 +52Fe 1.96e-03 9.26e-03 1.97e-03 9.28e-03 2.05e-03 7.19e-03 +53Fe 5.34e-05 6.10e-04 5.36e-05 6.06e-04 6.39e-05 1.03e-03 +55Fe 1.77e-06 3.22e-06 1.80e-06 3.00e-06 3.65e-06 8.56e-05 +59Fe 7.84e-13 3.86e-10 5.87e-12 8.77e-16 4.55e-11 6.54e-11 +60Fe 1.60e-13 1.57e-09 9.65e-13 2.09e-17 1.60e-12 3.40e-11 +55Co 2.50e-04 3.16e-03 2.51e-04 3.13e-03 2.74e-04 7.15e-03 +56Co 7.09e-07 1.24e-05 7.17e-07 1.23e-05 9.47e-07 3.08e-05 +57Co 3.22e-07 1.17e-06 3.30e-07 1.12e-06 6.31e-07 1.19e-05 +58Co 3.28e-10 4.92e-10 4.63e-10 4.41e-10 5.09e-09 1.61e-08 +60Co 2.96e-13 6.85e-11 2.26e-12 4.86e-14 3.61e-11 7.93e-11 +56Ni 3.95e-02 7.45e-01 3.95e-02 7.45e-01 3.89e-02 6.52e-01 +57Ni 1.37e-03 1.41e-02 1.37e-03 1.40e-02 1.50e-03 2.49e-02 +59Ni 5.24e-05 6.09e-05 5.19e-05 6.04e-05 3.69e-05 1.41e-04 +63Ni 1.41e-13 2.85e-09 1.19e-12 4.59e-13 2.23e-11 1.61e-10 +62Zn 9.91e-05 2.25e-03 9.89e-05 2.21e-03 9.57e-05 6.05e-03 +65Zn 2.51e-08 1.19e-08 2.52e-08 1.19e-08 2.77e-08 1.01e-08 +65Ge 3.17e-06 1.42e-06 3.16e-06 1.42e-06 2.97e-06 1.13e-06 diff --git a/vice/yields/sneia/gronow21/raw/table22.dat b/vice/yields/sneia/gronow21/raw/table22.dat index 743084dc..7c46f16a 100644 --- a/vice/yields/sneia/gronow21/raw/table22.dat +++ b/vice/yields/sneia/gronow21/raw/table22.dat @@ -1,39 +1,39 @@ -14C 1.02e-12 1.39e-16 1.15e-12 1.46e-16 5.25e-12 4.72e-16 -22Na 7.64e-09 1.36e-13 7.56e-09 1.35e-13 6.16e-09 6.06e-10 -26Al 2.78e-07 3.39e-11 2.75e-07 3.48e-11 2.00e-07 1.71e-11 -32Si 5.17e-13 3.42e-14 5.32e-13 6.53e-14 6.65e-13 9.46e-13 -32P 5.12e-09 4.12e-10 5.18e-09 4.19e-10 5.77e-09 2.17e-09 -33P 1.91e-09 2.25e-10 1.94e-09 2.35e-10 2.18e-09 1.75e-09 -35S 1.04e-09 1.92e-10 1.05e-09 1.93e-10 1.18e-09 1.37e-09 -36Cl 1.24e-08 2.21e-09 1.24e-08 2.17e-09 1.36e-08 8.57e-09 -37Ar 3.56e-06 8.71e-07 3.56e-06 8.60e-07 3.93e-06 1.93e-06 -39Ar 6.85e-11 2.07e-11 6.88e-11 2.01e-11 8.86e-11 1.39e-10 -40K 6.61e-10 1.70e-10 6.62e-10 1.65e-10 8.37e-10 6.83e-10 -41Ca 9.97e-07 2.58e-07 1.00e-06 2.55e-07 1.30e-06 4.85e-07 -44Ti 1.53e-04 2.05e-05 1.53e-04 2.05e-05 1.74e-04 1.15e-05 -48V 9.25e-08 1.90e-08 9.44e-08 1.90e-08 1.85e-07 1.77e-08 -49V 6.15e-08 5.94e-08 6.21e-08 5.90e-08 9.53e-08 1.12e-07 -48Cr 7.16e-04 3.52e-04 7.19e-04 3.53e-04 8.03e-04 2.57e-04 -49Cr 1.38e-05 1.62e-05 1.39e-05 1.61e-05 1.66e-05 2.67e-05 -51Cr 2.25e-07 1.57e-07 2.29e-07 1.56e-07 4.43e-07 8.98e-07 -51Mn 3.12e-05 4.00e-05 3.14e-05 3.96e-05 3.59e-05 8.71e-05 -52Mn 8.78e-07 1.91e-06 8.86e-07 1.91e-06 1.17e-06 2.26e-06 -53Mn 2.42e-06 9.85e-06 2.44e-06 9.79e-06 3.72e-06 2.33e-05 -54Mn 4.42e-09 7.53e-10 4.64e-09 1.09e-09 1.98e-08 2.86e-08 -52Fe 2.04e-03 7.79e-03 2.04e-03 7.80e-03 2.23e-03 6.09e-03 -53Fe 6.94e-05 5.06e-04 6.97e-05 5.03e-04 7.79e-05 8.74e-04 -55Fe 4.55e-06 1.85e-06 4.60e-06 1.89e-06 7.97e-06 3.42e-05 -59Fe 5.94e-12 1.69e-17 4.37e-11 1.60e-16 1.46e-10 5.21e-11 -60Fe 2.83e-12 9.92e-20 1.68e-11 3.32e-18 1.14e-11 2.51e-11 -55Co 2.10e-04 2.63e-03 2.10e-04 2.61e-03 2.24e-04 6.11e-03 -56Co 8.28e-07 1.23e-05 8.35e-07 1.23e-05 1.04e-06 2.63e-05 -57Co 5.44e-07 1.13e-06 5.51e-07 1.15e-06 1.01e-06 5.85e-06 -58Co 9.70e-10 2.38e-10 1.16e-09 3.29e-10 7.19e-09 6.47e-09 -60Co 2.78e-12 4.02e-15 1.80e-11 1.46e-14 7.02e-11 5.90e-11 -56Ni 1.24e-02 8.47e-01 1.23e-02 8.48e-01 1.14e-02 7.46e-01 -57Ni 3.03e-04 1.77e-02 3.03e-04 1.76e-02 2.99e-04 3.35e-02 -59Ni 4.36e-06 7.82e-05 4.30e-06 7.76e-05 3.04e-06 2.24e-04 -63Ni 6.87e-13 8.60e-15 5.30e-12 8.55e-14 4.06e-11 1.12e-10 -62Zn 2.09e-05 3.08e-03 2.10e-05 3.04e-03 2.24e-05 7.57e-03 -65Zn 2.04e-09 1.43e-08 2.15e-09 1.43e-08 5.73e-09 1.12e-08 -65Ge 8.14e-07 2.04e-06 8.07e-07 2.04e-06 6.46e-07 1.53e-06 +14C 1.02e-12 1.39e-16 1.15e-12 1.46e-16 5.25e-12 4.72e-16 +22Na 7.64e-09 1.36e-13 7.56e-09 1.35e-13 6.16e-09 6.06e-10 +26Al 2.78e-07 3.39e-11 2.75e-07 3.48e-11 2.00e-07 1.71e-11 +32Si 5.17e-13 3.42e-14 5.32e-13 6.53e-14 6.65e-13 9.46e-13 +32P 5.12e-09 4.12e-10 5.18e-09 4.19e-10 5.77e-09 2.17e-09 +33P 1.91e-09 2.25e-10 1.94e-09 2.35e-10 2.18e-09 1.75e-09 +35S 1.04e-09 1.92e-10 1.05e-09 1.93e-10 1.18e-09 1.37e-09 +36Cl 1.24e-08 2.21e-09 1.24e-08 2.17e-09 1.36e-08 8.57e-09 +37Ar 3.56e-06 8.71e-07 3.56e-06 8.60e-07 3.93e-06 1.93e-06 +39Ar 6.85e-11 2.07e-11 6.88e-11 2.01e-11 8.86e-11 1.39e-10 +40K 6.61e-10 1.70e-10 6.62e-10 1.65e-10 8.37e-10 6.83e-10 +41Ca 9.97e-07 2.58e-07 1.00e-06 2.55e-07 1.30e-06 4.85e-07 +44Ti 1.53e-04 2.05e-05 1.53e-04 2.05e-05 1.74e-04 1.15e-05 +48V 9.25e-08 1.90e-08 9.44e-08 1.90e-08 1.85e-07 1.77e-08 +49V 6.15e-08 5.94e-08 6.21e-08 5.90e-08 9.53e-08 1.12e-07 +48Cr 7.16e-04 3.52e-04 7.19e-04 3.53e-04 8.03e-04 2.57e-04 +49Cr 1.38e-05 1.62e-05 1.39e-05 1.61e-05 1.66e-05 2.67e-05 +51Cr 2.25e-07 1.57e-07 2.29e-07 1.56e-07 4.43e-07 8.98e-07 +51Mn 3.12e-05 4.00e-05 3.14e-05 3.96e-05 3.59e-05 8.71e-05 +52Mn 8.78e-07 1.91e-06 8.86e-07 1.91e-06 1.17e-06 2.26e-06 +53Mn 2.42e-06 9.85e-06 2.44e-06 9.79e-06 3.72e-06 2.33e-05 +54Mn 4.42e-09 7.53e-10 4.64e-09 1.09e-09 1.98e-08 2.86e-08 +52Fe 2.04e-03 7.79e-03 2.04e-03 7.80e-03 2.23e-03 6.09e-03 +53Fe 6.94e-05 5.06e-04 6.97e-05 5.03e-04 7.79e-05 8.74e-04 +55Fe 4.55e-06 1.85e-06 4.60e-06 1.89e-06 7.97e-06 3.42e-05 +59Fe 5.94e-12 1.69e-17 4.37e-11 1.60e-16 1.46e-10 5.21e-11 +60Fe 2.83e-12 9.92e-20 1.68e-11 3.32e-18 1.14e-11 2.51e-11 +55Co 2.10e-04 2.63e-03 2.10e-04 2.61e-03 2.24e-04 6.11e-03 +56Co 8.28e-07 1.23e-05 8.35e-07 1.23e-05 1.04e-06 2.63e-05 +57Co 5.44e-07 1.13e-06 5.51e-07 1.15e-06 1.01e-06 5.85e-06 +58Co 9.70e-10 2.38e-10 1.16e-09 3.29e-10 7.19e-09 6.47e-09 +60Co 2.78e-12 4.02e-15 1.80e-11 1.46e-14 7.02e-11 5.90e-11 +56Ni 1.24e-02 8.47e-01 1.23e-02 8.48e-01 1.14e-02 7.46e-01 +57Ni 3.03e-04 1.77e-02 3.03e-04 1.76e-02 2.99e-04 3.35e-02 +59Ni 4.36e-06 7.82e-05 4.30e-06 7.76e-05 3.04e-06 2.24e-04 +63Ni 6.87e-13 8.60e-15 5.30e-12 8.55e-14 4.06e-11 1.12e-10 +62Zn 2.09e-05 3.08e-03 2.10e-05 3.04e-03 2.24e-05 7.57e-03 +65Zn 2.04e-09 1.43e-08 2.15e-09 1.43e-08 5.73e-09 1.12e-08 +65Ge 8.14e-07 2.04e-06 8.07e-07 2.04e-06 6.46e-07 1.53e-06 diff --git a/vice/yields/sneia/gronow21/raw/table3.dat b/vice/yields/sneia/gronow21/raw/table3.dat index 586e52b5..a047c5b9 100644 --- a/vice/yields/sneia/gronow21/raw/table3.dat +++ b/vice/yields/sneia/gronow21/raw/table3.dat @@ -1,68 +1,68 @@ -12C 1.18e-04 1.07e-03 1.17e-04 1.07e-03 1.17e-04 1.04e-03 -13C 7.87e-11 6.23e-11 7.69e-11 5.96e-11 4.72e-11 7.91e-10 -14N 1.62e-07 1.02e-08 1.22e-06 8.98e-09 3.53e-05 1.02e-07 -15N 1.00e-08 1.14e-09 1.05e-08 1.36e-09 2.70e-08 4.79e-10 -16O 9.09e-03 8.03e-02 9.10e-03 8.02e-02 9.60e-03 8.17e-02 -17O 1.86e-10 2.94e-09 1.58e-09 2.79e-09 4.65e-08 2.67e-08 -18O 8.37e-09 1.50e-10 1.62e-08 1.44e-10 2.67e-07 1.02e-09 -19F 4.11e-09 1.21e-11 4.42e-09 1.20e-11 1.41e-08 7.68e-11 -20Ne 1.56e-04 2.93e-03 1.55e-04 2.93e-03 1.60e-04 2.67e-03 -21Ne 1.51e-08 7.23e-08 1.65e-08 6.98e-08 6.13e-08 6.82e-07 -22Ne 1.21e-08 2.04e-08 3.11e-08 1.97e-08 6.44e-07 6.34e-07 -23Na 1.45e-06 1.36e-05 1.45e-06 1.36e-05 1.62e-06 2.86e-05 -24Mg 3.05e-03 7.07e-03 3.09e-03 7.26e-03 3.20e-03 3.22e-03 -25Mg 2.23e-06 1.99e-05 2.29e-06 1.94e-05 3.38e-06 9.07e-05 -26Mg 2.20e-06 3.30e-05 2.22e-06 3.22e-05 3.31e-06 1.41e-04 -27Al 7.63e-05 2.83e-04 7.71e-05 2.84e-04 7.98e-05 3.55e-04 -28Si 1.28e-02 1.91e-01 1.28e-02 1.91e-01 1.30e-02 1.90e-01 -29Si 8.93e-05 4.17e-04 8.96e-05 4.13e-04 9.29e-05 1.42e-03 -30Si 1.02e-04 6.09e-04 1.03e-04 6.02e-04 1.10e-04 3.28e-03 -31P 7.62e-05 3.17e-04 7.61e-05 3.13e-04 7.81e-05 8.81e-04 -32S 5.58e-03 1.13e-01 5.56e-03 1.13e-01 5.59e-03 9.62e-02 -33S 7.76e-05 2.51e-04 7.71e-05 2.48e-04 7.67e-05 4.72e-04 -34S 1.31e-04 1.33e-03 1.31e-04 1.30e-03 1.35e-04 6.24e-03 -36S 3.73e-09 3.36e-08 3.78e-09 3.25e-08 5.07e-09 3.29e-06 -35Cl 3.14e-05 8.59e-05 3.13e-05 8.35e-05 3.61e-05 2.29e-04 -37Cl 7.89e-06 1.88e-05 7.84e-06 1.84e-05 8.15e-06 3.65e-05 -36Ar 1.82e-03 2.10e-02 1.82e-03 2.10e-02 1.84e-03 1.55e-02 -38Ar 3.92e-05 5.76e-04 3.90e-05 5.57e-04 4.52e-05 2.64e-03 -40Ar 5.79e-10 3.76e-09 5.79e-10 3.78e-09 9.88e-10 2.07e-07 -39K 7.96e-05 4.67e-05 8.02e-05 4.56e-05 1.04e-04 1.04e-04 -41K 3.21e-06 3.27e-06 3.21e-06 3.21e-06 4.16e-06 5.72e-06 -40Ca 6.22e-03 1.91e-02 6.22e-03 1.91e-02 6.34e-03 1.36e-02 -42Ca 6.48e-06 1.50e-05 6.52e-06 1.44e-05 9.41e-06 6.28e-05 -43Ca 2.98e-05 1.39e-07 2.98e-05 1.38e-07 3.01e-05 3.13e-07 -44Ca 1.78e-03 1.52e-05 1.78e-03 1.52e-05 1.83e-03 1.10e-05 -46Ca 1.08e-12 5.56e-11 3.99e-12 3.29e-10 5.82e-11 9.89e-08 -48Ca 6.43e-12 1.58e-12 6.44e-11 1.12e-11 1.94e-09 4.61e-09 -45Sc 3.73e-06 1.73e-07 3.75e-06 1.70e-07 4.99e-06 4.48e-07 -46Ti 7.92e-06 5.71e-06 7.88e-06 5.51e-06 7.62e-06 2.14e-05 -47Ti 6.90e-05 4.01e-07 6.90e-05 3.95e-07 7.23e-05 1.28e-06 -48Ti 3.78e-03 3.68e-04 3.79e-03 3.69e-04 3.92e-03 2.58e-04 -49Ti 3.06e-05 2.01e-05 3.09e-05 2.00e-05 4.20e-05 2.92e-05 -50Ti 2.10e-11 8.20e-09 1.03e-10 1.51e-07 2.48e-09 4.25e-07 -50V 2.60e-10 2.91e-09 2.80e-10 3.23e-09 1.26e-09 1.14e-07 -51V 2.92e-04 4.96e-05 2.92e-04 4.91e-05 3.11e-04 1.03e-04 -50Cr 4.27e-05 1.21e-04 4.23e-05 1.19e-04 3.49e-05 6.06e-04 -52Cr 7.36e-03 7.93e-03 7.37e-03 7.94e-03 7.90e-03 6.23e-03 -53Cr 9.66e-05 5.68e-04 9.77e-05 5.65e-04 1.36e-04 9.99e-04 -54Cr 3.27e-10 3.32e-08 6.48e-10 1.94e-07 9.85e-09 8.86e-07 -55Mn 9.20e-04 2.83e-03 9.22e-04 2.81e-03 9.72e-04 6.29e-03 -54Fe 6.25e-05 1.30e-02 6.32e-05 1.28e-02 8.74e-05 5.57e-02 -56Fe 1.49e-02 3.24e-01 1.49e-02 3.24e-01 1.49e-02 2.79e-01 -57Fe 1.29e-03 4.50e-03 1.29e-03 4.47e-03 1.31e-03 7.84e-03 -58Fe 1.03e-09 1.76e-08 8.95e-09 1.18e-07 2.79e-07 2.70e-06 -59Co 4.16e-05 1.00e-04 4.18e-05 9.93e-05 5.33e-05 1.80e-04 -58Ni 1.74e-04 4.15e-03 1.76e-04 4.07e-03 2.47e-04 2.04e-02 -60Ni 1.59e-03 2.17e-03 1.59e-03 2.18e-03 1.57e-03 1.35e-03 -61Ni 2.97e-04 6.96e-05 2.97e-04 6.96e-05 2.86e-04 8.84e-05 -62Ni 1.24e-04 3.90e-04 1.26e-04 3.86e-04 1.80e-04 1.20e-03 -64Ni 3.95e-10 7.29e-09 3.78e-09 7.00e-08 8.19e-08 6.80e-06 -63Cu 5.67e-06 1.74e-07 5.72e-06 3.85e-07 6.82e-06 6.42e-06 -64Zn 1.43e-04 6.61e-06 1.42e-04 7.06e-06 1.13e-04 3.78e-06 -66Zn 1.56e-05 7.05e-06 1.61e-05 7.90e-06 2.39e-05 2.68e-05 -67Zn 1.34e-06 5.95e-09 1.50e-06 2.27e-08 4.03e-06 1.06e-06 -68Zn 8.78e-07 7.59e-09 1.37e-06 6.14e-08 4.36e-06 2.11e-06 -70Zn 1.60e-12 5.33e-11 1.55e-11 5.05e-10 3.57e-10 4.68e-08 -69Ga 5.31e-08 4.05e-09 1.03e-07 3.96e-08 3.10e-07 3.37e-07 -71Ga 3.32e-09 6.53e-10 8.27e-09 6.24e-09 2.68e-08 1.45e-07 +12C 1.18e-04 1.07e-03 1.17e-04 1.07e-03 1.17e-04 1.04e-03 +13C 7.87e-11 6.23e-11 7.69e-11 5.96e-11 4.72e-11 7.91e-10 +14N 1.62e-07 1.02e-08 1.22e-06 8.98e-09 3.53e-05 1.02e-07 +15N 1.00e-08 1.14e-09 1.05e-08 1.36e-09 2.70e-08 4.79e-10 +16O 9.09e-03 8.03e-02 9.10e-03 8.02e-02 9.60e-03 8.17e-02 +17O 1.86e-10 2.94e-09 1.58e-09 2.79e-09 4.65e-08 2.67e-08 +18O 8.37e-09 1.50e-10 1.62e-08 1.44e-10 2.67e-07 1.02e-09 +19F 4.11e-09 1.21e-11 4.42e-09 1.20e-11 1.41e-08 7.68e-11 +20Ne 1.56e-04 2.93e-03 1.55e-04 2.93e-03 1.60e-04 2.67e-03 +21Ne 1.51e-08 7.23e-08 1.65e-08 6.98e-08 6.13e-08 6.82e-07 +22Ne 1.21e-08 2.04e-08 3.11e-08 1.97e-08 6.44e-07 6.34e-07 +23Na 1.45e-06 1.36e-05 1.45e-06 1.36e-05 1.62e-06 2.86e-05 +24Mg 3.05e-03 7.07e-03 3.09e-03 7.26e-03 3.20e-03 3.22e-03 +25Mg 2.23e-06 1.99e-05 2.29e-06 1.94e-05 3.38e-06 9.07e-05 +26Mg 2.20e-06 3.30e-05 2.22e-06 3.22e-05 3.31e-06 1.41e-04 +27Al 7.63e-05 2.83e-04 7.71e-05 2.84e-04 7.98e-05 3.55e-04 +28Si 1.28e-02 1.91e-01 1.28e-02 1.91e-01 1.30e-02 1.90e-01 +29Si 8.93e-05 4.17e-04 8.96e-05 4.13e-04 9.29e-05 1.42e-03 +30Si 1.02e-04 6.09e-04 1.03e-04 6.02e-04 1.10e-04 3.28e-03 +31P 7.62e-05 3.17e-04 7.61e-05 3.13e-04 7.81e-05 8.81e-04 +32S 5.58e-03 1.13e-01 5.56e-03 1.13e-01 5.59e-03 9.62e-02 +33S 7.76e-05 2.51e-04 7.71e-05 2.48e-04 7.67e-05 4.72e-04 +34S 1.31e-04 1.33e-03 1.31e-04 1.30e-03 1.35e-04 6.24e-03 +36S 3.73e-09 3.36e-08 3.78e-09 3.25e-08 5.07e-09 3.29e-06 +35Cl 3.14e-05 8.59e-05 3.13e-05 8.35e-05 3.61e-05 2.29e-04 +37Cl 7.89e-06 1.88e-05 7.84e-06 1.84e-05 8.15e-06 3.65e-05 +36Ar 1.82e-03 2.10e-02 1.82e-03 2.10e-02 1.84e-03 1.55e-02 +38Ar 3.92e-05 5.76e-04 3.90e-05 5.57e-04 4.52e-05 2.64e-03 +40Ar 5.79e-10 3.76e-09 5.79e-10 3.78e-09 9.88e-10 2.07e-07 +39K 7.96e-05 4.67e-05 8.02e-05 4.56e-05 1.04e-04 1.04e-04 +41K 3.21e-06 3.27e-06 3.21e-06 3.21e-06 4.16e-06 5.72e-06 +40Ca 6.22e-03 1.91e-02 6.22e-03 1.91e-02 6.34e-03 1.36e-02 +42Ca 6.48e-06 1.50e-05 6.52e-06 1.44e-05 9.41e-06 6.28e-05 +43Ca 2.98e-05 1.39e-07 2.98e-05 1.38e-07 3.01e-05 3.13e-07 +44Ca 1.78e-03 1.52e-05 1.78e-03 1.52e-05 1.83e-03 1.10e-05 +46Ca 1.08e-12 5.56e-11 3.99e-12 3.29e-10 5.82e-11 9.89e-08 +48Ca 6.43e-12 1.58e-12 6.44e-11 1.12e-11 1.94e-09 4.61e-09 +45Sc 3.73e-06 1.73e-07 3.75e-06 1.70e-07 4.99e-06 4.48e-07 +46Ti 7.92e-06 5.71e-06 7.88e-06 5.51e-06 7.62e-06 2.14e-05 +47Ti 6.90e-05 4.01e-07 6.90e-05 3.95e-07 7.23e-05 1.28e-06 +48Ti 3.78e-03 3.68e-04 3.79e-03 3.69e-04 3.92e-03 2.58e-04 +49Ti 3.06e-05 2.01e-05 3.09e-05 2.00e-05 4.20e-05 2.92e-05 +50Ti 2.10e-11 8.20e-09 1.03e-10 1.51e-07 2.48e-09 4.25e-07 +50V 2.60e-10 2.91e-09 2.80e-10 3.23e-09 1.26e-09 1.14e-07 +51V 2.92e-04 4.96e-05 2.92e-04 4.91e-05 3.11e-04 1.03e-04 +50Cr 4.27e-05 1.21e-04 4.23e-05 1.19e-04 3.49e-05 6.06e-04 +52Cr 7.36e-03 7.93e-03 7.37e-03 7.94e-03 7.90e-03 6.23e-03 +53Cr 9.66e-05 5.68e-04 9.77e-05 5.65e-04 1.36e-04 9.99e-04 +54Cr 3.27e-10 3.32e-08 6.48e-10 1.94e-07 9.85e-09 8.86e-07 +55Mn 9.20e-04 2.83e-03 9.22e-04 2.81e-03 9.72e-04 6.29e-03 +54Fe 6.25e-05 1.30e-02 6.32e-05 1.28e-02 8.74e-05 5.57e-02 +56Fe 1.49e-02 3.24e-01 1.49e-02 3.24e-01 1.49e-02 2.79e-01 +57Fe 1.29e-03 4.50e-03 1.29e-03 4.47e-03 1.31e-03 7.84e-03 +58Fe 1.03e-09 1.76e-08 8.95e-09 1.18e-07 2.79e-07 2.70e-06 +59Co 4.16e-05 1.00e-04 4.18e-05 9.93e-05 5.33e-05 1.80e-04 +58Ni 1.74e-04 4.15e-03 1.76e-04 4.07e-03 2.47e-04 2.04e-02 +60Ni 1.59e-03 2.17e-03 1.59e-03 2.18e-03 1.57e-03 1.35e-03 +61Ni 2.97e-04 6.96e-05 2.97e-04 6.96e-05 2.86e-04 8.84e-05 +62Ni 1.24e-04 3.90e-04 1.26e-04 3.86e-04 1.80e-04 1.20e-03 +64Ni 3.95e-10 7.29e-09 3.78e-09 7.00e-08 8.19e-08 6.80e-06 +63Cu 5.67e-06 1.74e-07 5.72e-06 3.85e-07 6.82e-06 6.42e-06 +64Zn 1.43e-04 6.61e-06 1.42e-04 7.06e-06 1.13e-04 3.78e-06 +66Zn 1.56e-05 7.05e-06 1.61e-05 7.90e-06 2.39e-05 2.68e-05 +67Zn 1.34e-06 5.95e-09 1.50e-06 2.27e-08 4.03e-06 1.06e-06 +68Zn 8.78e-07 7.59e-09 1.37e-06 6.14e-08 4.36e-06 2.11e-06 +70Zn 1.60e-12 5.33e-11 1.55e-11 5.05e-10 3.57e-10 4.68e-08 +69Ga 5.31e-08 4.05e-09 1.03e-07 3.96e-08 3.10e-07 3.37e-07 +71Ga 3.32e-09 6.53e-10 8.27e-09 6.24e-09 2.68e-08 1.45e-07 diff --git a/vice/yields/sneia/gronow21/raw/table4.dat b/vice/yields/sneia/gronow21/raw/table4.dat index 0252afac..405f99bf 100644 --- a/vice/yields/sneia/gronow21/raw/table4.dat +++ b/vice/yields/sneia/gronow21/raw/table4.dat @@ -1,68 +1,68 @@ -12C 3.52e-03 4.94e-03 3.51e-03 4.94e-03 3.42e-03 4.74e-03 -13C 1.07e-09 6.50e-08 1.07e-09 6.18e-08 7.16e-10 3.37e-07 -14N 3.59e-07 3.81e-06 1.42e-06 3.67e-06 3.57e-05 5.32e-06 -15N 5.76e-08 8.09e-09 6.03e-08 7.90e-09 1.50e-07 1.03e-08 -16O 3.78e-03 9.17e-02 3.79e-03 9.15e-02 4.17e-03 9.31e-02 -17O 3.34e-08 1.01e-06 3.49e-08 9.85e-07 7.45e-08 1.30e-06 -18O 5.35e-08 1.55e-08 6.39e-08 1.49e-08 3.99e-07 2.23e-08 -19F 4.24e-08 3.01e-10 4.46e-08 2.90e-10 1.17e-07 1.05e-09 -20Ne 2.81e-03 3.43e-03 2.81e-03 3.43e-03 2.91e-03 3.02e-03 -21Ne 3.60e-07 1.25e-06 3.64e-07 1.19e-06 4.97e-07 4.64e-06 -22Ne 3.02e-07 2.56e-05 3.28e-07 2.47e-05 1.09e-06 2.05e-04 -23Na 1.92e-05 3.40e-05 1.92e-05 3.34e-05 1.90e-05 9.11e-05 -24Mg 3.12e-03 7.17e-03 3.12e-03 7.37e-03 3.23e-03 3.19e-03 -25Mg 3.09e-05 5.32e-05 3.10e-05 5.22e-05 3.80e-05 2.06e-04 -26Mg 4.71e-05 7.52e-05 4.70e-05 7.34e-05 4.58e-05 3.05e-04 -27Al 1.14e-04 2.84e-04 1.14e-04 2.85e-04 1.15e-04 3.62e-04 -28Si 5.76e-03 2.20e-01 5.77e-03 2.20e-01 5.88e-03 2.19e-01 -29Si 8.69e-05 4.69e-04 8.65e-05 4.65e-04 8.20e-05 1.47e-03 -30Si 8.52e-05 6.45e-04 8.51e-05 6.38e-04 8.51e-05 3.41e-03 -31P 7.16e-05 3.37e-04 7.16e-05 3.32e-04 7.29e-05 9.23e-04 -32S 2.74e-03 1.31e-01 2.74e-03 1.31e-01 2.88e-03 1.11e-01 -33S 2.41e-05 2.67e-04 2.40e-05 2.64e-04 2.39e-05 5.13e-04 -34S 1.29e-05 1.54e-03 1.29e-05 1.50e-03 1.36e-05 7.20e-03 -36S 1.15e-09 3.94e-08 3.30e-09 4.32e-08 2.87e-08 3.40e-06 -35Cl 3.86e-05 9.08e-05 3.88e-05 8.84e-05 4.64e-05 2.36e-04 -37Cl 3.00e-06 2.14e-05 3.00e-06 2.10e-05 3.15e-06 4.22e-05 -36Ar 1.10e-03 2.44e-02 1.11e-03 2.44e-02 1.21e-03 1.80e-02 -38Ar 3.39e-06 6.85e-04 3.43e-06 6.64e-04 5.14e-06 3.17e-03 -40Ar 4.34e-10 3.89e-09 3.34e-09 6.44e-09 2.66e-08 3.48e-07 -39K 6.89e-05 5.42e-05 6.96e-05 5.30e-05 9.54e-05 1.22e-04 -41K 1.04e-05 3.82e-06 1.03e-05 3.75e-06 1.10e-05 6.80e-06 -40Ca 3.95e-03 2.23e-02 3.95e-03 2.23e-02 4.07e-03 1.59e-02 -42Ca 3.92e-06 1.75e-05 4.00e-06 1.68e-05 7.15e-06 7.50e-05 -43Ca 8.68e-06 6.57e-08 8.78e-06 6.51e-08 1.39e-05 3.38e-07 -44Ca 7.50e-04 1.58e-05 7.47e-04 1.58e-05 6.50e-04 1.19e-05 -46Ca 1.20e-10 1.74e-10 1.15e-09 1.54e-09 1.01e-08 1.64e-07 -48Ca 2.09e-11 1.32e-11 1.99e-10 1.25e-10 3.60e-09 1.48e-08 -45Sc 4.60e-06 1.92e-07 4.63e-06 1.91e-07 5.30e-06 5.30e-07 -46Ti 2.23e-06 6.73e-06 2.25e-06 6.51e-06 3.17e-06 2.53e-05 -47Ti 4.07e-05 3.13e-07 4.07e-05 3.08e-07 4.13e-05 1.38e-06 -48Ti 1.26e-04 4.29e-04 1.24e-04 4.30e-04 7.52e-05 3.02e-04 -49Ti 3.70e-06 2.34e-05 3.69e-06 2.32e-05 3.17e-06 3.39e-05 -50Ti 1.07e-10 7.98e-10 1.09e-09 1.98e-09 3.77e-08 3.97e-07 -50V 3.04e-10 2.57e-09 3.74e-10 3.13e-09 4.33e-09 1.08e-07 -51V 5.48e-06 5.72e-05 5.42e-06 5.67e-05 3.74e-06 1.19e-04 -50Cr 1.37e-06 1.41e-04 1.37e-06 1.38e-04 1.34e-06 7.01e-04 -52Cr 5.26e-06 9.50e-03 5.17e-06 9.51e-03 3.14e-06 7.45e-03 -53Cr 4.67e-07 6.72e-04 4.65e-07 6.67e-04 4.37e-07 1.18e-03 -54Cr 3.18e-10 2.14e-08 2.99e-09 2.24e-08 1.25e-07 1.01e-06 -55Mn 2.61e-07 3.37e-03 2.76e-07 3.34e-03 9.72e-07 7.50e-03 -54Fe 1.53e-07 1.55e-02 1.88e-07 1.52e-02 1.45e-06 6.63e-02 -56Fe 8.12e-07 3.43e-01 1.38e-06 3.43e-01 2.62e-05 2.95e-01 -57Fe 1.09e-07 4.05e-03 2.14e-07 4.02e-03 7.64e-06 7.28e-03 -58Fe 1.13e-08 2.32e-08 1.23e-07 1.19e-07 8.69e-06 4.88e-06 -59Co 4.38e-08 5.84e-05 3.01e-07 5.81e-05 1.19e-05 9.69e-05 -58Ni 4.99e-08 3.78e-03 2.37e-07 3.71e-03 1.28e-05 1.77e-02 -60Ni 1.35e-07 1.04e-03 7.78e-07 1.05e-03 9.88e-06 5.98e-04 -61Ni 3.92e-08 3.14e-05 2.69e-07 3.16e-05 2.54e-06 4.02e-05 -62Ni 5.63e-08 1.84e-04 4.65e-07 1.83e-04 3.87e-06 4.98e-04 -64Ni 1.54e-09 7.28e-09 1.57e-08 7.06e-08 2.79e-07 6.07e-06 -63Cu 8.89e-09 8.71e-08 7.59e-08 3.12e-07 8.26e-07 5.90e-06 -64Zn 1.85e-08 2.15e-06 4.00e-08 2.54e-06 2.35e-07 1.79e-06 -66Zn 6.70e-09 2.45e-06 4.80e-08 3.34e-06 2.77e-07 1.49e-05 -67Zn 1.15e-09 2.93e-09 9.15e-09 1.83e-08 4.25e-08 8.87e-07 -68Zn 1.10e-09 5.97e-09 8.89e-09 5.40e-08 5.31e-08 1.88e-06 -70Zn 8.56e-12 5.68e-11 9.59e-11 5.51e-10 9.23e-09 3.93e-08 -69Ga 1.03e-10 3.47e-09 9.17e-10 3.39e-08 1.85e-08 3.09e-07 -71Ga 6.12e-11 4.95e-10 6.04e-10 4.74e-09 1.09e-08 1.23e-07 +12C 3.52e-03 4.94e-03 3.51e-03 4.94e-03 3.42e-03 4.74e-03 +13C 1.07e-09 6.50e-08 1.07e-09 6.18e-08 7.16e-10 3.37e-07 +14N 3.59e-07 3.81e-06 1.42e-06 3.67e-06 3.57e-05 5.32e-06 +15N 5.76e-08 8.09e-09 6.03e-08 7.90e-09 1.50e-07 1.03e-08 +16O 3.78e-03 9.17e-02 3.79e-03 9.15e-02 4.17e-03 9.31e-02 +17O 3.34e-08 1.01e-06 3.49e-08 9.85e-07 7.45e-08 1.30e-06 +18O 5.35e-08 1.55e-08 6.39e-08 1.49e-08 3.99e-07 2.23e-08 +19F 4.24e-08 3.01e-10 4.46e-08 2.90e-10 1.17e-07 1.05e-09 +20Ne 2.81e-03 3.43e-03 2.81e-03 3.43e-03 2.91e-03 3.02e-03 +21Ne 3.60e-07 1.25e-06 3.64e-07 1.19e-06 4.97e-07 4.64e-06 +22Ne 3.02e-07 2.56e-05 3.28e-07 2.47e-05 1.09e-06 2.05e-04 +23Na 1.92e-05 3.40e-05 1.92e-05 3.34e-05 1.90e-05 9.11e-05 +24Mg 3.12e-03 7.17e-03 3.12e-03 7.37e-03 3.23e-03 3.19e-03 +25Mg 3.09e-05 5.32e-05 3.10e-05 5.22e-05 3.80e-05 2.06e-04 +26Mg 4.71e-05 7.52e-05 4.70e-05 7.34e-05 4.58e-05 3.05e-04 +27Al 1.14e-04 2.84e-04 1.14e-04 2.85e-04 1.15e-04 3.62e-04 +28Si 5.76e-03 2.20e-01 5.77e-03 2.20e-01 5.88e-03 2.19e-01 +29Si 8.69e-05 4.69e-04 8.65e-05 4.65e-04 8.20e-05 1.47e-03 +30Si 8.52e-05 6.45e-04 8.51e-05 6.38e-04 8.51e-05 3.41e-03 +31P 7.16e-05 3.37e-04 7.16e-05 3.32e-04 7.29e-05 9.23e-04 +32S 2.74e-03 1.31e-01 2.74e-03 1.31e-01 2.88e-03 1.11e-01 +33S 2.41e-05 2.67e-04 2.40e-05 2.64e-04 2.39e-05 5.13e-04 +34S 1.29e-05 1.54e-03 1.29e-05 1.50e-03 1.36e-05 7.20e-03 +36S 1.15e-09 3.94e-08 3.30e-09 4.32e-08 2.87e-08 3.40e-06 +35Cl 3.86e-05 9.08e-05 3.88e-05 8.84e-05 4.64e-05 2.36e-04 +37Cl 3.00e-06 2.14e-05 3.00e-06 2.10e-05 3.15e-06 4.22e-05 +36Ar 1.10e-03 2.44e-02 1.11e-03 2.44e-02 1.21e-03 1.80e-02 +38Ar 3.39e-06 6.85e-04 3.43e-06 6.64e-04 5.14e-06 3.17e-03 +40Ar 4.34e-10 3.89e-09 3.34e-09 6.44e-09 2.66e-08 3.48e-07 +39K 6.89e-05 5.42e-05 6.96e-05 5.30e-05 9.54e-05 1.22e-04 +41K 1.04e-05 3.82e-06 1.03e-05 3.75e-06 1.10e-05 6.80e-06 +40Ca 3.95e-03 2.23e-02 3.95e-03 2.23e-02 4.07e-03 1.59e-02 +42Ca 3.92e-06 1.75e-05 4.00e-06 1.68e-05 7.15e-06 7.50e-05 +43Ca 8.68e-06 6.57e-08 8.78e-06 6.51e-08 1.39e-05 3.38e-07 +44Ca 7.50e-04 1.58e-05 7.47e-04 1.58e-05 6.50e-04 1.19e-05 +46Ca 1.20e-10 1.74e-10 1.15e-09 1.54e-09 1.01e-08 1.64e-07 +48Ca 2.09e-11 1.32e-11 1.99e-10 1.25e-10 3.60e-09 1.48e-08 +45Sc 4.60e-06 1.92e-07 4.63e-06 1.91e-07 5.30e-06 5.30e-07 +46Ti 2.23e-06 6.73e-06 2.25e-06 6.51e-06 3.17e-06 2.53e-05 +47Ti 4.07e-05 3.13e-07 4.07e-05 3.08e-07 4.13e-05 1.38e-06 +48Ti 1.26e-04 4.29e-04 1.24e-04 4.30e-04 7.52e-05 3.02e-04 +49Ti 3.70e-06 2.34e-05 3.69e-06 2.32e-05 3.17e-06 3.39e-05 +50Ti 1.07e-10 7.98e-10 1.09e-09 1.98e-09 3.77e-08 3.97e-07 +50V 3.04e-10 2.57e-09 3.74e-10 3.13e-09 4.33e-09 1.08e-07 +51V 5.48e-06 5.72e-05 5.42e-06 5.67e-05 3.74e-06 1.19e-04 +50Cr 1.37e-06 1.41e-04 1.37e-06 1.38e-04 1.34e-06 7.01e-04 +52Cr 5.26e-06 9.50e-03 5.17e-06 9.51e-03 3.14e-06 7.45e-03 +53Cr 4.67e-07 6.72e-04 4.65e-07 6.67e-04 4.37e-07 1.18e-03 +54Cr 3.18e-10 2.14e-08 2.99e-09 2.24e-08 1.25e-07 1.01e-06 +55Mn 2.61e-07 3.37e-03 2.76e-07 3.34e-03 9.72e-07 7.50e-03 +54Fe 1.53e-07 1.55e-02 1.88e-07 1.52e-02 1.45e-06 6.63e-02 +56Fe 8.12e-07 3.43e-01 1.38e-06 3.43e-01 2.62e-05 2.95e-01 +57Fe 1.09e-07 4.05e-03 2.14e-07 4.02e-03 7.64e-06 7.28e-03 +58Fe 1.13e-08 2.32e-08 1.23e-07 1.19e-07 8.69e-06 4.88e-06 +59Co 4.38e-08 5.84e-05 3.01e-07 5.81e-05 1.19e-05 9.69e-05 +58Ni 4.99e-08 3.78e-03 2.37e-07 3.71e-03 1.28e-05 1.77e-02 +60Ni 1.35e-07 1.04e-03 7.78e-07 1.05e-03 9.88e-06 5.98e-04 +61Ni 3.92e-08 3.14e-05 2.69e-07 3.16e-05 2.54e-06 4.02e-05 +62Ni 5.63e-08 1.84e-04 4.65e-07 1.83e-04 3.87e-06 4.98e-04 +64Ni 1.54e-09 7.28e-09 1.57e-08 7.06e-08 2.79e-07 6.07e-06 +63Cu 8.89e-09 8.71e-08 7.59e-08 3.12e-07 8.26e-07 5.90e-06 +64Zn 1.85e-08 2.15e-06 4.00e-08 2.54e-06 2.35e-07 1.79e-06 +66Zn 6.70e-09 2.45e-06 4.80e-08 3.34e-06 2.77e-07 1.49e-05 +67Zn 1.15e-09 2.93e-09 9.15e-09 1.83e-08 4.25e-08 8.87e-07 +68Zn 1.10e-09 5.97e-09 8.89e-09 5.40e-08 5.31e-08 1.88e-06 +70Zn 8.56e-12 5.68e-11 9.59e-11 5.51e-10 9.23e-09 3.93e-08 +69Ga 1.03e-10 3.47e-09 9.17e-10 3.39e-08 1.85e-08 3.09e-07 +71Ga 6.12e-11 4.95e-10 6.04e-10 4.74e-09 1.09e-08 1.23e-07 diff --git a/vice/yields/sneia/gronow21/raw/table5.dat b/vice/yields/sneia/gronow21/raw/table5.dat index 9e89af93..5073e70a 100644 --- a/vice/yields/sneia/gronow21/raw/table5.dat +++ b/vice/yields/sneia/gronow21/raw/table5.dat @@ -1,68 +1,68 @@ -12C 4.37e-04 2.67e-03 4.36e-04 2.66e-03 4.29e-04 2.58e-03 -13C 2.49e-11 3.02e-09 2.40e-11 2.83e-09 1.87e-11 3.17e-08 -14N 1.66e-07 4.48e-07 1.23e-06 4.26e-07 3.54e-05 1.70e-06 -15N 1.00e-08 2.92e-09 1.06e-08 2.93e-09 2.67e-08 4.12e-09 -16O 7.12e-03 7.73e-02 7.14e-03 7.71e-02 7.61e-03 7.86e-02 -17O 6.28e-10 9.49e-08 2.03e-09 9.06e-08 4.70e-08 2.48e-07 -18O 7.88e-09 2.76e-09 1.57e-08 2.65e-09 2.67e-07 9.41e-09 -19F 5.20e-09 7.40e-11 5.58e-09 7.09e-11 1.71e-08 3.94e-10 -20Ne 1.05e-03 3.65e-03 1.04e-03 3.65e-03 1.03e-03 3.26e-03 -21Ne 2.89e-08 3.53e-07 3.03e-08 3.33e-07 7.42e-08 2.49e-06 -22Ne 1.88e-08 9.32e-07 3.82e-08 8.74e-07 6.58e-07 2.48e-05 -23Na 5.44e-06 2.20e-05 5.41e-06 2.17e-05 5.55e-06 5.77e-05 -24Mg 3.19e-03 6.48e-03 3.20e-03 6.66e-03 3.28e-03 2.89e-03 -25Mg 6.19e-06 3.29e-05 6.24e-06 3.21e-05 7.53e-06 1.58e-04 -26Mg 1.00e-05 5.66e-05 1.00e-05 5.51e-05 1.10e-05 2.68e-04 -27Al 1.08e-04 2.58e-04 1.08e-04 2.59e-04 1.12e-04 3.32e-04 -28Si 9.96e-03 1.91e-01 9.97e-03 1.91e-01 1.01e-02 1.90e-01 -29Si 9.01e-05 4.23e-04 9.00e-05 4.19e-04 9.22e-05 1.38e-03 -30Si 9.47e-05 5.68e-04 9.49e-05 5.62e-04 1.00e-04 2.96e-03 -31P 8.31e-05 2.93e-04 8.31e-05 2.89e-04 8.59e-05 8.01e-04 -32S 4.46e-03 1.14e-01 4.46e-03 1.14e-01 4.49e-03 9.72e-02 -33S 6.94e-05 2.28e-04 6.92e-05 2.24e-04 6.91e-05 4.37e-04 -34S 5.41e-05 1.30e-03 5.41e-05 1.27e-03 5.88e-05 6.11e-03 -36S 2.52e-09 3.43e-08 2.55e-09 3.49e-08 4.77e-09 3.12e-06 -35Cl 3.74e-05 8.04e-05 3.74e-05 7.83e-05 4.21e-05 2.09e-04 -37Cl 9.44e-06 1.82e-05 9.41e-06 1.78e-05 9.55e-06 3.61e-05 -36Ar 1.53e-03 2.15e-02 1.53e-03 2.15e-02 1.56e-03 1.60e-02 -38Ar 2.13e-05 5.80e-04 2.14e-05 5.62e-04 2.67e-05 2.69e-03 -40Ar 6.19e-10 3.38e-09 7.13e-10 4.48e-09 2.21e-09 2.99e-07 -39K 8.48e-05 4.65e-05 8.54e-05 4.55e-05 1.07e-04 1.05e-04 -41K 6.35e-06 3.26e-06 6.35e-06 3.20e-06 7.10e-06 5.83e-06 -40Ca 5.08e-03 1.99e-02 5.08e-03 1.99e-02 5.22e-03 1.44e-02 -42Ca 7.13e-06 1.48e-05 7.19e-06 1.42e-05 1.01e-05 6.38e-05 -43Ca 2.44e-05 1.50e-07 2.43e-05 1.49e-07 2.49e-05 3.22e-07 -44Ca 1.99e-03 1.65e-05 2.00e-03 1.66e-05 2.13e-03 1.18e-05 -46Ca 6.66e-12 1.08e-10 5.97e-11 9.20e-10 6.68e-10 1.58e-07 -48Ca 6.87e-12 4.52e-12 6.85e-11 4.15e-11 2.00e-09 1.20e-08 -45Sc 4.00e-06 1.68e-07 4.02e-06 1.67e-07 5.34e-06 4.76e-07 -46Ti 3.56e-06 5.70e-06 3.60e-06 5.51e-06 5.23e-06 2.16e-05 -47Ti 5.47e-05 4.25e-07 5.50e-05 4.21e-07 6.80e-05 1.30e-06 -48Ti 4.48e-03 4.03e-04 4.49e-03 4.04e-04 4.97e-03 2.86e-04 -49Ti 4.11e-05 2.16e-05 4.14e-05 2.15e-05 5.48e-05 3.19e-05 -50Ti 1.92e-11 3.30e-10 1.53e-10 1.32e-09 4.80e-09 3.44e-07 -50V 1.25e-10 2.16e-09 2.15e-10 2.76e-09 2.43e-09 9.38e-08 -51V 3.73e-04 5.30e-05 3.74e-04 5.25e-05 4.23e-04 1.11e-04 -50Cr 1.83e-05 1.25e-04 1.85e-05 1.22e-04 2.49e-05 6.20e-04 -52Cr 5.09e-03 8.80e-03 5.10e-03 8.81e-03 5.27e-03 6.91e-03 -53Cr 1.36e-04 6.21e-04 1.37e-04 6.17e-04 1.72e-04 1.09e-03 -54Cr 2.85e-10 1.61e-08 7.55e-10 1.86e-08 1.84e-08 8.47e-07 -55Mn 4.12e-04 3.10e-03 4.12e-04 3.07e-03 3.95e-04 6.94e-03 -54Fe 8.26e-05 1.38e-02 8.31e-05 1.35e-02 9.72e-05 5.93e-02 -56Fe 2.13e-03 3.98e-01 2.12e-03 3.98e-01 1.72e-03 3.45e-01 -57Fe 1.38e-04 5.79e-03 1.38e-04 5.76e-03 1.31e-04 1.01e-02 -58Fe 1.67e-09 1.16e-08 1.52e-08 7.01e-08 1.05e-06 3.01e-06 -59Co 1.22e-05 1.45e-04 1.25e-05 1.44e-04 2.37e-05 2.55e-04 -58Ni 7.34e-05 5.47e-03 7.42e-05 5.36e-03 1.12e-04 2.72e-02 -60Ni 7.56e-05 3.21e-03 7.56e-05 3.22e-03 6.70e-05 1.89e-03 -61Ni 1.00e-05 1.01e-04 1.01e-05 1.01e-04 1.27e-05 1.19e-04 -62Ni 1.30e-05 5.82e-04 1.37e-05 5.75e-04 3.05e-05 1.70e-03 -64Ni 1.17e-09 7.32e-09 1.12e-08 7.10e-08 2.05e-07 5.24e-06 -63Cu 5.36e-07 2.40e-07 6.37e-07 4.51e-07 3.07e-06 6.80e-06 -64Zn 1.48e-06 9.50e-06 1.66e-06 9.89e-06 4.52e-06 4.26e-06 -66Zn 9.24e-07 1.04e-05 1.21e-06 1.10e-05 6.33e-06 3.04e-05 -67Zn 2.57e-07 7.43e-09 3.69e-07 2.34e-08 2.21e-06 8.20e-07 -68Zn 3.75e-07 6.68e-09 6.45e-07 4.70e-08 2.59e-06 1.54e-06 -70Zn 6.03e-12 6.02e-11 5.60e-11 5.82e-10 1.73e-09 3.47e-08 -69Ga 3.35e-08 2.96e-09 6.63e-08 2.90e-08 2.23e-07 2.67e-07 -71Ga 2.83e-09 4.88e-10 7.19e-09 4.69e-09 3.17e-08 1.02e-07 +12C 4.37e-04 2.67e-03 4.36e-04 2.66e-03 4.29e-04 2.58e-03 +13C 2.49e-11 3.02e-09 2.40e-11 2.83e-09 1.87e-11 3.17e-08 +14N 1.66e-07 4.48e-07 1.23e-06 4.26e-07 3.54e-05 1.70e-06 +15N 1.00e-08 2.92e-09 1.06e-08 2.93e-09 2.67e-08 4.12e-09 +16O 7.12e-03 7.73e-02 7.14e-03 7.71e-02 7.61e-03 7.86e-02 +17O 6.28e-10 9.49e-08 2.03e-09 9.06e-08 4.70e-08 2.48e-07 +18O 7.88e-09 2.76e-09 1.57e-08 2.65e-09 2.67e-07 9.41e-09 +19F 5.20e-09 7.40e-11 5.58e-09 7.09e-11 1.71e-08 3.94e-10 +20Ne 1.05e-03 3.65e-03 1.04e-03 3.65e-03 1.03e-03 3.26e-03 +21Ne 2.89e-08 3.53e-07 3.03e-08 3.33e-07 7.42e-08 2.49e-06 +22Ne 1.88e-08 9.32e-07 3.82e-08 8.74e-07 6.58e-07 2.48e-05 +23Na 5.44e-06 2.20e-05 5.41e-06 2.17e-05 5.55e-06 5.77e-05 +24Mg 3.19e-03 6.48e-03 3.20e-03 6.66e-03 3.28e-03 2.89e-03 +25Mg 6.19e-06 3.29e-05 6.24e-06 3.21e-05 7.53e-06 1.58e-04 +26Mg 1.00e-05 5.66e-05 1.00e-05 5.51e-05 1.10e-05 2.68e-04 +27Al 1.08e-04 2.58e-04 1.08e-04 2.59e-04 1.12e-04 3.32e-04 +28Si 9.96e-03 1.91e-01 9.97e-03 1.91e-01 1.01e-02 1.90e-01 +29Si 9.01e-05 4.23e-04 9.00e-05 4.19e-04 9.22e-05 1.38e-03 +30Si 9.47e-05 5.68e-04 9.49e-05 5.62e-04 1.00e-04 2.96e-03 +31P 8.31e-05 2.93e-04 8.31e-05 2.89e-04 8.59e-05 8.01e-04 +32S 4.46e-03 1.14e-01 4.46e-03 1.14e-01 4.49e-03 9.72e-02 +33S 6.94e-05 2.28e-04 6.92e-05 2.24e-04 6.91e-05 4.37e-04 +34S 5.41e-05 1.30e-03 5.41e-05 1.27e-03 5.88e-05 6.11e-03 +36S 2.52e-09 3.43e-08 2.55e-09 3.49e-08 4.77e-09 3.12e-06 +35Cl 3.74e-05 8.04e-05 3.74e-05 7.83e-05 4.21e-05 2.09e-04 +37Cl 9.44e-06 1.82e-05 9.41e-06 1.78e-05 9.55e-06 3.61e-05 +36Ar 1.53e-03 2.15e-02 1.53e-03 2.15e-02 1.56e-03 1.60e-02 +38Ar 2.13e-05 5.80e-04 2.14e-05 5.62e-04 2.67e-05 2.69e-03 +40Ar 6.19e-10 3.38e-09 7.13e-10 4.48e-09 2.21e-09 2.99e-07 +39K 8.48e-05 4.65e-05 8.54e-05 4.55e-05 1.07e-04 1.05e-04 +41K 6.35e-06 3.26e-06 6.35e-06 3.20e-06 7.10e-06 5.83e-06 +40Ca 5.08e-03 1.99e-02 5.08e-03 1.99e-02 5.22e-03 1.44e-02 +42Ca 7.13e-06 1.48e-05 7.19e-06 1.42e-05 1.01e-05 6.38e-05 +43Ca 2.44e-05 1.50e-07 2.43e-05 1.49e-07 2.49e-05 3.22e-07 +44Ca 1.99e-03 1.65e-05 2.00e-03 1.66e-05 2.13e-03 1.18e-05 +46Ca 6.66e-12 1.08e-10 5.97e-11 9.20e-10 6.68e-10 1.58e-07 +48Ca 6.87e-12 4.52e-12 6.85e-11 4.15e-11 2.00e-09 1.20e-08 +45Sc 4.00e-06 1.68e-07 4.02e-06 1.67e-07 5.34e-06 4.76e-07 +46Ti 3.56e-06 5.70e-06 3.60e-06 5.51e-06 5.23e-06 2.16e-05 +47Ti 5.47e-05 4.25e-07 5.50e-05 4.21e-07 6.80e-05 1.30e-06 +48Ti 4.48e-03 4.03e-04 4.49e-03 4.04e-04 4.97e-03 2.86e-04 +49Ti 4.11e-05 2.16e-05 4.14e-05 2.15e-05 5.48e-05 3.19e-05 +50Ti 1.92e-11 3.30e-10 1.53e-10 1.32e-09 4.80e-09 3.44e-07 +50V 1.25e-10 2.16e-09 2.15e-10 2.76e-09 2.43e-09 9.38e-08 +51V 3.73e-04 5.30e-05 3.74e-04 5.25e-05 4.23e-04 1.11e-04 +50Cr 1.83e-05 1.25e-04 1.85e-05 1.22e-04 2.49e-05 6.20e-04 +52Cr 5.09e-03 8.80e-03 5.10e-03 8.81e-03 5.27e-03 6.91e-03 +53Cr 1.36e-04 6.21e-04 1.37e-04 6.17e-04 1.72e-04 1.09e-03 +54Cr 2.85e-10 1.61e-08 7.55e-10 1.86e-08 1.84e-08 8.47e-07 +55Mn 4.12e-04 3.10e-03 4.12e-04 3.07e-03 3.95e-04 6.94e-03 +54Fe 8.26e-05 1.38e-02 8.31e-05 1.35e-02 9.72e-05 5.93e-02 +56Fe 2.13e-03 3.98e-01 2.12e-03 3.98e-01 1.72e-03 3.45e-01 +57Fe 1.38e-04 5.79e-03 1.38e-04 5.76e-03 1.31e-04 1.01e-02 +58Fe 1.67e-09 1.16e-08 1.52e-08 7.01e-08 1.05e-06 3.01e-06 +59Co 1.22e-05 1.45e-04 1.25e-05 1.44e-04 2.37e-05 2.55e-04 +58Ni 7.34e-05 5.47e-03 7.42e-05 5.36e-03 1.12e-04 2.72e-02 +60Ni 7.56e-05 3.21e-03 7.56e-05 3.22e-03 6.70e-05 1.89e-03 +61Ni 1.00e-05 1.01e-04 1.01e-05 1.01e-04 1.27e-05 1.19e-04 +62Ni 1.30e-05 5.82e-04 1.37e-05 5.75e-04 3.05e-05 1.70e-03 +64Ni 1.17e-09 7.32e-09 1.12e-08 7.10e-08 2.05e-07 5.24e-06 +63Cu 5.36e-07 2.40e-07 6.37e-07 4.51e-07 3.07e-06 6.80e-06 +64Zn 1.48e-06 9.50e-06 1.66e-06 9.89e-06 4.52e-06 4.26e-06 +66Zn 9.24e-07 1.04e-05 1.21e-06 1.10e-05 6.33e-06 3.04e-05 +67Zn 2.57e-07 7.43e-09 3.69e-07 2.34e-08 2.21e-06 8.20e-07 +68Zn 3.75e-07 6.68e-09 6.45e-07 4.70e-08 2.59e-06 1.54e-06 +70Zn 6.03e-12 6.02e-11 5.60e-11 5.82e-10 1.73e-09 3.47e-08 +69Ga 3.35e-08 2.96e-09 6.63e-08 2.90e-08 2.23e-07 2.67e-07 +71Ga 2.83e-09 4.88e-10 7.19e-09 4.69e-09 3.17e-08 1.02e-07 diff --git a/vice/yields/sneia/gronow21/raw/table6.dat b/vice/yields/sneia/gronow21/raw/table6.dat index 064bd0ee..45e3e492 100644 --- a/vice/yields/sneia/gronow21/raw/table6.dat +++ b/vice/yields/sneia/gronow21/raw/table6.dat @@ -1,68 +1,68 @@ -12C 3.82e-05 1.36e-04 3.82e-05 1.35e-04 3.80e-05 1.32e-04 -13C 1.89e-09 5.87e-12 1.88e-09 5.74e-12 1.55e-09 2.21e-11 -14N 2.49e-07 1.93e-10 1.31e-06 1.93e-10 3.55e-05 4.65e-10 -15N 1.39e-08 3.94e-10 1.47e-08 4.25e-10 3.74e-08 2.34e-10 -16O 8.36e-03 5.46e-02 8.37e-03 5.45e-02 8.82e-03 5.55e-02 -17O 2.08e-10 2.45e-11 1.61e-09 2.37e-11 4.67e-08 1.29e-10 -18O 1.69e-08 1.80e-12 2.53e-08 1.31e-12 2.93e-07 4.78e-12 -19F 4.86e-09 5.08e-13 5.22e-09 4.89e-13 1.62e-08 3.78e-12 -20Ne 8.63e-06 6.41e-04 8.84e-06 6.38e-04 1.82e-05 5.90e-04 -21Ne 1.95e-08 1.31e-08 2.13e-08 1.27e-08 7.74e-08 7.73e-08 -22Ne 1.11e-08 6.66e-09 3.03e-08 6.32e-09 6.47e-07 8.89e-09 -23Na 1.93e-07 3.57e-06 1.98e-07 3.39e-06 3.95e-07 6.21e-06 -24Mg 2.37e-03 4.04e-03 2.40e-03 4.16e-03 2.51e-03 1.80e-03 -25Mg 5.95e-07 5.91e-06 6.37e-07 5.81e-06 1.72e-06 2.01e-05 -26Mg 4.63e-07 7.57e-06 5.03e-07 7.32e-06 1.60e-06 2.48e-05 -27Al 3.59e-05 1.52e-04 3.65e-05 1.53e-04 3.82e-05 1.86e-04 -28Si 1.26e-02 1.54e-01 1.26e-02 1.55e-01 1.28e-02 1.54e-01 -29Si 6.67e-05 2.44e-04 6.71e-05 2.42e-04 7.00e-05 7.32e-04 -30Si 8.74e-05 3.80e-04 8.87e-05 3.76e-04 9.40e-05 2.09e-03 -31P 4.43e-05 2.17e-04 4.44e-05 2.14e-04 4.56e-05 5.96e-04 -32S 4.37e-03 9.47e-02 4.35e-03 9.46e-02 4.31e-03 8.07e-02 -33S 4.66e-05 1.78e-04 4.63e-05 1.76e-04 4.58e-05 3.44e-04 -34S 2.28e-04 9.94e-04 2.26e-04 9.70e-04 2.21e-04 4.67e-03 -36S 3.24e-09 2.00e-08 3.32e-09 1.97e-08 4.56e-09 1.42e-06 -35Cl 1.90e-05 5.96e-05 1.90e-05 5.79e-05 2.06e-05 1.54e-04 -37Cl 3.61e-06 1.44e-05 3.58e-06 1.41e-05 3.77e-06 2.80e-05 -36Ar 1.24e-03 1.83e-02 1.24e-03 1.82e-02 1.25e-03 1.37e-02 -38Ar 6.03e-05 4.42e-04 5.98e-05 4.28e-04 6.11e-05 2.04e-03 -40Ar 1.73e-10 2.39e-09 1.79e-10 2.38e-09 5.15e-10 7.22e-08 -39K 3.80e-05 3.69e-05 3.82e-05 3.60e-05 4.97e-05 8.22e-05 -41K 1.14e-06 2.59e-06 1.15e-06 2.54e-06 1.74e-06 4.58e-06 -40Ca 4.70e-03 1.72e-02 4.70e-03 1.72e-02 4.81e-03 1.26e-02 -42Ca 3.54e-06 1.16e-05 3.54e-06 1.11e-05 4.91e-06 4.90e-05 -43Ca 1.36e-05 3.10e-07 1.36e-05 3.10e-07 1.34e-05 2.68e-07 -44Ca 8.70e-04 1.81e-05 8.71e-04 1.81e-05 9.07e-04 1.18e-05 -46Ca 6.34e-13 4.57e-11 2.14e-12 1.43e-10 4.49e-11 1.99e-08 -48Ca 6.43e-12 4.24e-12 6.43e-11 6.42e-12 1.94e-09 4.36e-08 -45Sc 8.47e-07 1.44e-07 8.58e-07 1.41e-07 1.53e-06 3.01e-07 -46Ti 4.17e-05 4.43e-06 4.13e-05 4.28e-06 3.06e-05 1.69e-05 -47Ti 5.70e-05 6.54e-07 5.68e-05 6.48e-07 5.25e-05 1.09e-06 -48Ti 1.88e-03 3.74e-04 1.88e-03 3.74e-04 1.99e-03 2.63e-04 -49Ti 2.04e-05 1.96e-05 2.07e-05 1.95e-05 2.80e-05 2.91e-05 -50Ti 2.12e-11 4.05e-10 8.87e-11 1.64e-09 2.25e-09 1.10e-06 -50V 2.00e-10 1.88e-09 1.99e-10 1.94e-09 5.53e-10 6.62e-08 -51V 2.67e-04 4.88e-05 2.66e-04 4.83e-05 2.50e-04 1.02e-04 -50Cr 2.26e-04 1.07e-04 2.25e-04 1.05e-04 1.86e-04 5.33e-04 -52Cr 3.98e-03 8.10e-03 3.98e-03 8.12e-03 4.08e-03 6.35e-03 -53Cr 6.05e-05 5.69e-04 6.11e-05 5.66e-04 8.41e-05 9.98e-04 -54Cr 2.57e-10 1.63e-08 4.38e-10 2.02e-08 7.17e-09 1.03e-06 -55Mn 3.68e-04 2.89e-03 3.69e-04 2.86e-03 3.83e-04 6.49e-03 -54Fe 4.00e-05 1.20e-02 4.05e-05 1.18e-02 6.01e-05 5.23e-02 -56Fe 2.60e-02 4.93e-01 2.60e-02 4.93e-01 2.65e-02 4.29e-01 -57Fe 2.40e-03 8.62e-03 2.40e-03 8.57e-03 2.42e-03 1.45e-02 -58Fe 4.63e-10 1.17e-08 3.79e-09 4.41e-08 1.12e-07 1.66e-06 -59Co 3.57e-04 2.81e-04 3.56e-04 2.79e-04 3.01e-04 4.97e-04 -58Ni 6.69e-04 8.16e-03 6.68e-04 7.99e-03 6.42e-04 4.14e-02 -60Ni 2.70e-03 6.39e-03 2.70e-03 6.41e-03 2.68e-03 3.82e-03 -61Ni 3.93e-04 2.11e-04 3.92e-04 2.10e-04 3.75e-04 2.39e-04 -62Ni 1.65e-04 1.19e-03 1.65e-04 1.18e-03 1.68e-04 3.50e-03 -64Ni 5.11e-11 2.43e-09 5.06e-10 2.14e-08 1.29e-08 3.72e-06 -63Cu 1.36e-05 4.85e-07 1.36e-05 5.66e-07 1.35e-05 4.08e-06 -64Zn 2.59e-04 2.11e-05 2.59e-04 2.15e-05 2.71e-04 8.70e-06 -66Zn 2.44e-05 2.32e-05 2.46e-05 2.35e-05 3.08e-05 5.69e-05 -67Zn 9.43e-07 1.43e-08 1.00e-06 1.91e-08 2.02e-06 5.60e-07 -68Zn 5.22e-07 8.47e-09 7.67e-07 3.93e-08 2.09e-06 1.53e-06 -70Zn 4.77e-13 1.48e-11 4.59e-12 1.35e-10 1.11e-10 2.51e-08 -69Ga 3.26e-08 2.50e-09 5.93e-08 2.43e-08 1.37e-07 2.72e-07 -71Ga 2.18e-09 2.99e-10 4.92e-09 2.84e-09 9.66e-09 1.11e-07 +12C 3.82e-05 1.36e-04 3.82e-05 1.35e-04 3.80e-05 1.32e-04 +13C 1.89e-09 5.87e-12 1.88e-09 5.74e-12 1.55e-09 2.21e-11 +14N 2.49e-07 1.93e-10 1.31e-06 1.93e-10 3.55e-05 4.65e-10 +15N 1.39e-08 3.94e-10 1.47e-08 4.25e-10 3.74e-08 2.34e-10 +16O 8.36e-03 5.46e-02 8.37e-03 5.45e-02 8.82e-03 5.55e-02 +17O 2.08e-10 2.45e-11 1.61e-09 2.37e-11 4.67e-08 1.29e-10 +18O 1.69e-08 1.80e-12 2.53e-08 1.31e-12 2.93e-07 4.78e-12 +19F 4.86e-09 5.08e-13 5.22e-09 4.89e-13 1.62e-08 3.78e-12 +20Ne 8.63e-06 6.41e-04 8.84e-06 6.38e-04 1.82e-05 5.90e-04 +21Ne 1.95e-08 1.31e-08 2.13e-08 1.27e-08 7.74e-08 7.73e-08 +22Ne 1.11e-08 6.66e-09 3.03e-08 6.32e-09 6.47e-07 8.89e-09 +23Na 1.93e-07 3.57e-06 1.98e-07 3.39e-06 3.95e-07 6.21e-06 +24Mg 2.37e-03 4.04e-03 2.40e-03 4.16e-03 2.51e-03 1.80e-03 +25Mg 5.95e-07 5.91e-06 6.37e-07 5.81e-06 1.72e-06 2.01e-05 +26Mg 4.63e-07 7.57e-06 5.03e-07 7.32e-06 1.60e-06 2.48e-05 +27Al 3.59e-05 1.52e-04 3.65e-05 1.53e-04 3.82e-05 1.86e-04 +28Si 1.26e-02 1.54e-01 1.26e-02 1.55e-01 1.28e-02 1.54e-01 +29Si 6.67e-05 2.44e-04 6.71e-05 2.42e-04 7.00e-05 7.32e-04 +30Si 8.74e-05 3.80e-04 8.87e-05 3.76e-04 9.40e-05 2.09e-03 +31P 4.43e-05 2.17e-04 4.44e-05 2.14e-04 4.56e-05 5.96e-04 +32S 4.37e-03 9.47e-02 4.35e-03 9.46e-02 4.31e-03 8.07e-02 +33S 4.66e-05 1.78e-04 4.63e-05 1.76e-04 4.58e-05 3.44e-04 +34S 2.28e-04 9.94e-04 2.26e-04 9.70e-04 2.21e-04 4.67e-03 +36S 3.24e-09 2.00e-08 3.32e-09 1.97e-08 4.56e-09 1.42e-06 +35Cl 1.90e-05 5.96e-05 1.90e-05 5.79e-05 2.06e-05 1.54e-04 +37Cl 3.61e-06 1.44e-05 3.58e-06 1.41e-05 3.77e-06 2.80e-05 +36Ar 1.24e-03 1.83e-02 1.24e-03 1.82e-02 1.25e-03 1.37e-02 +38Ar 6.03e-05 4.42e-04 5.98e-05 4.28e-04 6.11e-05 2.04e-03 +40Ar 1.73e-10 2.39e-09 1.79e-10 2.38e-09 5.15e-10 7.22e-08 +39K 3.80e-05 3.69e-05 3.82e-05 3.60e-05 4.97e-05 8.22e-05 +41K 1.14e-06 2.59e-06 1.15e-06 2.54e-06 1.74e-06 4.58e-06 +40Ca 4.70e-03 1.72e-02 4.70e-03 1.72e-02 4.81e-03 1.26e-02 +42Ca 3.54e-06 1.16e-05 3.54e-06 1.11e-05 4.91e-06 4.90e-05 +43Ca 1.36e-05 3.10e-07 1.36e-05 3.10e-07 1.34e-05 2.68e-07 +44Ca 8.70e-04 1.81e-05 8.71e-04 1.81e-05 9.07e-04 1.18e-05 +46Ca 6.34e-13 4.57e-11 2.14e-12 1.43e-10 4.49e-11 1.99e-08 +48Ca 6.43e-12 4.24e-12 6.43e-11 6.42e-12 1.94e-09 4.36e-08 +45Sc 8.47e-07 1.44e-07 8.58e-07 1.41e-07 1.53e-06 3.01e-07 +46Ti 4.17e-05 4.43e-06 4.13e-05 4.28e-06 3.06e-05 1.69e-05 +47Ti 5.70e-05 6.54e-07 5.68e-05 6.48e-07 5.25e-05 1.09e-06 +48Ti 1.88e-03 3.74e-04 1.88e-03 3.74e-04 1.99e-03 2.63e-04 +49Ti 2.04e-05 1.96e-05 2.07e-05 1.95e-05 2.80e-05 2.91e-05 +50Ti 2.12e-11 4.05e-10 8.87e-11 1.64e-09 2.25e-09 1.10e-06 +50V 2.00e-10 1.88e-09 1.99e-10 1.94e-09 5.53e-10 6.62e-08 +51V 2.67e-04 4.88e-05 2.66e-04 4.83e-05 2.50e-04 1.02e-04 +50Cr 2.26e-04 1.07e-04 2.25e-04 1.05e-04 1.86e-04 5.33e-04 +52Cr 3.98e-03 8.10e-03 3.98e-03 8.12e-03 4.08e-03 6.35e-03 +53Cr 6.05e-05 5.69e-04 6.11e-05 5.66e-04 8.41e-05 9.98e-04 +54Cr 2.57e-10 1.63e-08 4.38e-10 2.02e-08 7.17e-09 1.03e-06 +55Mn 3.68e-04 2.89e-03 3.69e-04 2.86e-03 3.83e-04 6.49e-03 +54Fe 4.00e-05 1.20e-02 4.05e-05 1.18e-02 6.01e-05 5.23e-02 +56Fe 2.60e-02 4.93e-01 2.60e-02 4.93e-01 2.65e-02 4.29e-01 +57Fe 2.40e-03 8.62e-03 2.40e-03 8.57e-03 2.42e-03 1.45e-02 +58Fe 4.63e-10 1.17e-08 3.79e-09 4.41e-08 1.12e-07 1.66e-06 +59Co 3.57e-04 2.81e-04 3.56e-04 2.79e-04 3.01e-04 4.97e-04 +58Ni 6.69e-04 8.16e-03 6.68e-04 7.99e-03 6.42e-04 4.14e-02 +60Ni 2.70e-03 6.39e-03 2.70e-03 6.41e-03 2.68e-03 3.82e-03 +61Ni 3.93e-04 2.11e-04 3.92e-04 2.10e-04 3.75e-04 2.39e-04 +62Ni 1.65e-04 1.19e-03 1.65e-04 1.18e-03 1.68e-04 3.50e-03 +64Ni 5.11e-11 2.43e-09 5.06e-10 2.14e-08 1.29e-08 3.72e-06 +63Cu 1.36e-05 4.85e-07 1.36e-05 5.66e-07 1.35e-05 4.08e-06 +64Zn 2.59e-04 2.11e-05 2.59e-04 2.15e-05 2.71e-04 8.70e-06 +66Zn 2.44e-05 2.32e-05 2.46e-05 2.35e-05 3.08e-05 5.69e-05 +67Zn 9.43e-07 1.43e-08 1.00e-06 1.91e-08 2.02e-06 5.60e-07 +68Zn 5.22e-07 8.47e-09 7.67e-07 3.93e-08 2.09e-06 1.53e-06 +70Zn 4.77e-13 1.48e-11 4.59e-12 1.35e-10 1.11e-10 2.51e-08 +69Ga 3.26e-08 2.50e-09 5.93e-08 2.43e-08 1.37e-07 2.72e-07 +71Ga 2.18e-09 2.99e-10 4.92e-09 2.84e-09 9.66e-09 1.11e-07 diff --git a/vice/yields/sneia/gronow21/raw/table7.dat b/vice/yields/sneia/gronow21/raw/table7.dat index b8ca7656..2d073688 100644 --- a/vice/yields/sneia/gronow21/raw/table7.dat +++ b/vice/yields/sneia/gronow21/raw/table7.dat @@ -1,68 +1,68 @@ -12C 1.69e-03 1.97e-03 1.69e-03 1.97e-03 1.65e-03 1.90e-03 -13C 3.51e-10 1.77e-08 3.50e-10 1.67e-08 2.44e-10 9.78e-08 -14N 2.02e-07 9.45e-07 1.25e-06 9.07e-07 3.50e-05 1.55e-06 -15N 2.72e-08 2.50e-09 2.85e-08 2.46e-09 6.99e-08 3.17e-09 -16O 1.77e-03 5.67e-02 1.78e-03 5.66e-02 2.02e-03 5.76e-02 -17O 8.79e-09 2.32e-07 1.02e-08 2.26e-07 5.32e-08 3.20e-07 -18O 2.43e-08 3.93e-09 3.29e-08 3.77e-09 3.11e-07 6.90e-09 -19F 1.96e-08 8.79e-11 2.07e-08 8.47e-11 5.59e-08 3.43e-10 -20Ne 1.30e-03 1.96e-03 1.30e-03 1.96e-03 1.35e-03 1.75e-03 -21Ne 1.16e-07 3.91e-07 1.19e-07 3.73e-07 2.00e-07 1.84e-06 -22Ne 9.70e-08 5.45e-06 1.19e-07 5.24e-06 7.90e-07 5.14e-05 -23Na 8.84e-06 1.44e-05 8.83e-06 1.42e-05 8.92e-06 3.84e-05 -24Mg 1.50e-03 4.27e-03 1.50e-03 4.38e-03 1.56e-03 1.86e-03 -25Mg 1.32e-05 2.23e-05 1.32e-05 2.18e-05 1.68e-05 9.46e-05 -26Mg 2.03e-05 3.49e-05 2.03e-05 3.40e-05 2.11e-05 1.51e-04 -27Al 5.56e-05 1.62e-04 5.56e-05 1.63e-04 5.68e-05 2.03e-04 -28Si 2.92e-03 1.70e-01 2.92e-03 1.70e-01 3.00e-03 1.70e-01 -29Si 4.44e-05 2.86e-04 4.42e-05 2.83e-04 4.23e-05 8.85e-04 -30Si 4.46e-05 3.99e-04 4.46e-05 3.94e-04 4.46e-05 2.05e-03 -31P 3.79e-05 2.12e-04 3.79e-05 2.09e-04 3.89e-05 5.81e-04 -32S 1.58e-03 1.05e-01 1.58e-03 1.05e-01 1.67e-03 8.95e-02 -33S 1.37e-05 1.67e-04 1.36e-05 1.65e-04 1.38e-05 3.35e-04 -34S 1.14e-05 1.02e-03 1.13e-05 9.91e-04 1.05e-05 4.80e-03 -36S 6.19e-10 2.33e-08 1.46e-09 2.41e-08 1.22e-08 1.98e-06 -35Cl 2.35e-05 6.10e-05 2.36e-05 5.95e-05 2.92e-05 1.62e-04 -37Cl 1.96e-06 1.47e-05 1.96e-06 1.44e-05 2.22e-06 3.03e-05 -36Ar 7.64e-04 2.06e-02 7.66e-04 2.06e-02 8.49e-04 1.55e-02 -38Ar 2.12e-06 4.68e-04 2.14e-06 4.54e-04 3.20e-06 2.23e-03 -40Ar 1.89e-10 2.40e-09 1.38e-09 3.27e-09 1.15e-08 1.79e-07 -39K 4.79e-05 3.91e-05 4.85e-05 3.83e-05 7.02e-05 9.01e-05 -41K 4.61e-06 2.77e-06 4.61e-06 2.72e-06 5.18e-06 5.09e-06 -40Ca 2.32e-03 1.96e-02 2.33e-03 1.97e-02 2.52e-03 1.44e-02 -42Ca 1.74e-06 1.19e-05 1.78e-06 1.14e-05 3.18e-06 5.33e-05 -43Ca 4.35e-06 2.86e-07 4.39e-06 2.86e-07 6.67e-06 2.78e-07 -44Ca 5.72e-04 1.99e-05 5.72e-04 1.99e-05 5.54e-04 1.31e-05 -46Ca 5.62e-11 7.27e-11 5.40e-10 6.29e-10 4.78e-09 9.12e-08 -48Ca 1.25e-11 4.35e-12 1.21e-10 4.08e-11 2.68e-09 7.35e-09 -45Sc 2.18e-06 1.50e-07 2.20e-06 1.49e-07 2.95e-06 3.62e-07 -46Ti 1.08e-06 4.71e-06 1.09e-06 4.56e-06 1.58e-06 1.85e-05 -47Ti 2.73e-05 6.31e-07 2.75e-05 6.28e-07 3.15e-05 1.18e-06 -48Ti 2.53e-04 4.32e-04 2.51e-04 4.33e-04 1.95e-04 3.06e-04 -49Ti 3.65e-06 2.25e-05 3.67e-06 2.24e-05 4.30e-06 3.35e-05 -50Ti 5.78e-11 2.10e-10 5.92e-10 8.31e-10 1.99e-08 2.21e-07 -50V 8.61e-11 1.41e-09 1.26e-10 1.80e-09 2.34e-09 6.25e-08 -51V 1.10e-05 5.55e-05 1.10e-05 5.50e-05 9.88e-06 1.16e-04 -50Cr 1.36e-06 1.20e-04 1.37e-06 1.18e-04 1.64e-06 6.02e-04 -52Cr 2.92e-05 9.50e-03 2.89e-05 9.51e-03 1.98e-05 7.44e-03 -53Cr 1.29e-06 6.62e-04 1.29e-06 6.57e-04 1.35e-06 1.16e-03 -54Cr 1.73e-10 1.38e-08 1.59e-09 1.55e-08 6.43e-08 7.00e-07 -55Mn 1.28e-06 3.34e-03 1.29e-06 3.30e-03 1.62e-06 7.51e-03 -54Fe 5.00e-07 1.38e-02 5.30e-07 1.35e-02 1.55e-06 6.04e-02 -56Fe 1.87e-06 5.59e-01 2.33e-06 5.59e-01 2.03e-05 4.87e-01 -57Fe 3.03e-07 9.28e-03 3.85e-07 9.23e-03 5.05e-06 1.59e-02 -58Fe 5.78e-09 8.59e-09 6.29e-08 4.47e-08 4.29e-06 2.23e-06 -59Co 7.96e-08 2.94e-04 2.56e-07 2.91e-04 7.37e-06 5.20e-04 -58Ni 9.22e-08 8.91e-03 2.53e-07 8.73e-03 9.67e-06 4.55e-02 -60Ni 1.35e-07 6.90e-03 4.66e-07 6.92e-03 5.31e-06 4.05e-03 -61Ni 5.07e-08 2.20e-04 1.76e-07 2.19e-04 1.65e-06 2.49e-04 -62Ni 5.97e-08 1.27e-03 2.99e-07 1.26e-03 2.41e-06 3.73e-03 -64Ni 7.97e-10 4.46e-09 8.13e-09 4.33e-08 1.40e-07 3.16e-06 -63Cu 8.85e-09 5.00e-07 4.80e-08 6.27e-07 4.93e-07 5.56e-06 -64Zn 1.29e-08 2.24e-05 2.74e-08 2.28e-05 1.78e-07 8.56e-06 -66Zn 6.43e-09 2.46e-05 3.23e-08 2.48e-05 1.63e-07 5.70e-05 -67Zn 1.59e-09 1.47e-08 8.25e-09 2.44e-08 3.43e-08 5.27e-07 -68Zn 1.62e-09 7.74e-09 9.24e-09 3.17e-08 3.89e-08 9.38e-07 -70Zn 4.88e-12 3.38e-11 5.42e-11 3.26e-10 4.69e-09 2.05e-08 -69Ga 1.26e-10 1.82e-09 8.43e-10 1.78e-08 1.03e-08 1.60e-07 -71Ga 4.64e-11 3.03e-10 3.95e-10 2.90e-09 6.05e-09 6.13e-08 +12C 1.69e-03 1.97e-03 1.69e-03 1.97e-03 1.65e-03 1.90e-03 +13C 3.51e-10 1.77e-08 3.50e-10 1.67e-08 2.44e-10 9.78e-08 +14N 2.02e-07 9.45e-07 1.25e-06 9.07e-07 3.50e-05 1.55e-06 +15N 2.72e-08 2.50e-09 2.85e-08 2.46e-09 6.99e-08 3.17e-09 +16O 1.77e-03 5.67e-02 1.78e-03 5.66e-02 2.02e-03 5.76e-02 +17O 8.79e-09 2.32e-07 1.02e-08 2.26e-07 5.32e-08 3.20e-07 +18O 2.43e-08 3.93e-09 3.29e-08 3.77e-09 3.11e-07 6.90e-09 +19F 1.96e-08 8.79e-11 2.07e-08 8.47e-11 5.59e-08 3.43e-10 +20Ne 1.30e-03 1.96e-03 1.30e-03 1.96e-03 1.35e-03 1.75e-03 +21Ne 1.16e-07 3.91e-07 1.19e-07 3.73e-07 2.00e-07 1.84e-06 +22Ne 9.70e-08 5.45e-06 1.19e-07 5.24e-06 7.90e-07 5.14e-05 +23Na 8.84e-06 1.44e-05 8.83e-06 1.42e-05 8.92e-06 3.84e-05 +24Mg 1.50e-03 4.27e-03 1.50e-03 4.38e-03 1.56e-03 1.86e-03 +25Mg 1.32e-05 2.23e-05 1.32e-05 2.18e-05 1.68e-05 9.46e-05 +26Mg 2.03e-05 3.49e-05 2.03e-05 3.40e-05 2.11e-05 1.51e-04 +27Al 5.56e-05 1.62e-04 5.56e-05 1.63e-04 5.68e-05 2.03e-04 +28Si 2.92e-03 1.70e-01 2.92e-03 1.70e-01 3.00e-03 1.70e-01 +29Si 4.44e-05 2.86e-04 4.42e-05 2.83e-04 4.23e-05 8.85e-04 +30Si 4.46e-05 3.99e-04 4.46e-05 3.94e-04 4.46e-05 2.05e-03 +31P 3.79e-05 2.12e-04 3.79e-05 2.09e-04 3.89e-05 5.81e-04 +32S 1.58e-03 1.05e-01 1.58e-03 1.05e-01 1.67e-03 8.95e-02 +33S 1.37e-05 1.67e-04 1.36e-05 1.65e-04 1.38e-05 3.35e-04 +34S 1.14e-05 1.02e-03 1.13e-05 9.91e-04 1.05e-05 4.80e-03 +36S 6.19e-10 2.33e-08 1.46e-09 2.41e-08 1.22e-08 1.98e-06 +35Cl 2.35e-05 6.10e-05 2.36e-05 5.95e-05 2.92e-05 1.62e-04 +37Cl 1.96e-06 1.47e-05 1.96e-06 1.44e-05 2.22e-06 3.03e-05 +36Ar 7.64e-04 2.06e-02 7.66e-04 2.06e-02 8.49e-04 1.55e-02 +38Ar 2.12e-06 4.68e-04 2.14e-06 4.54e-04 3.20e-06 2.23e-03 +40Ar 1.89e-10 2.40e-09 1.38e-09 3.27e-09 1.15e-08 1.79e-07 +39K 4.79e-05 3.91e-05 4.85e-05 3.83e-05 7.02e-05 9.01e-05 +41K 4.61e-06 2.77e-06 4.61e-06 2.72e-06 5.18e-06 5.09e-06 +40Ca 2.32e-03 1.96e-02 2.33e-03 1.97e-02 2.52e-03 1.44e-02 +42Ca 1.74e-06 1.19e-05 1.78e-06 1.14e-05 3.18e-06 5.33e-05 +43Ca 4.35e-06 2.86e-07 4.39e-06 2.86e-07 6.67e-06 2.78e-07 +44Ca 5.72e-04 1.99e-05 5.72e-04 1.99e-05 5.54e-04 1.31e-05 +46Ca 5.62e-11 7.27e-11 5.40e-10 6.29e-10 4.78e-09 9.12e-08 +48Ca 1.25e-11 4.35e-12 1.21e-10 4.08e-11 2.68e-09 7.35e-09 +45Sc 2.18e-06 1.50e-07 2.20e-06 1.49e-07 2.95e-06 3.62e-07 +46Ti 1.08e-06 4.71e-06 1.09e-06 4.56e-06 1.58e-06 1.85e-05 +47Ti 2.73e-05 6.31e-07 2.75e-05 6.28e-07 3.15e-05 1.18e-06 +48Ti 2.53e-04 4.32e-04 2.51e-04 4.33e-04 1.95e-04 3.06e-04 +49Ti 3.65e-06 2.25e-05 3.67e-06 2.24e-05 4.30e-06 3.35e-05 +50Ti 5.78e-11 2.10e-10 5.92e-10 8.31e-10 1.99e-08 2.21e-07 +50V 8.61e-11 1.41e-09 1.26e-10 1.80e-09 2.34e-09 6.25e-08 +51V 1.10e-05 5.55e-05 1.10e-05 5.50e-05 9.88e-06 1.16e-04 +50Cr 1.36e-06 1.20e-04 1.37e-06 1.18e-04 1.64e-06 6.02e-04 +52Cr 2.92e-05 9.50e-03 2.89e-05 9.51e-03 1.98e-05 7.44e-03 +53Cr 1.29e-06 6.62e-04 1.29e-06 6.57e-04 1.35e-06 1.16e-03 +54Cr 1.73e-10 1.38e-08 1.59e-09 1.55e-08 6.43e-08 7.00e-07 +55Mn 1.28e-06 3.34e-03 1.29e-06 3.30e-03 1.62e-06 7.51e-03 +54Fe 5.00e-07 1.38e-02 5.30e-07 1.35e-02 1.55e-06 6.04e-02 +56Fe 1.87e-06 5.59e-01 2.33e-06 5.59e-01 2.03e-05 4.87e-01 +57Fe 3.03e-07 9.28e-03 3.85e-07 9.23e-03 5.05e-06 1.59e-02 +58Fe 5.78e-09 8.59e-09 6.29e-08 4.47e-08 4.29e-06 2.23e-06 +59Co 7.96e-08 2.94e-04 2.56e-07 2.91e-04 7.37e-06 5.20e-04 +58Ni 9.22e-08 8.91e-03 2.53e-07 8.73e-03 9.67e-06 4.55e-02 +60Ni 1.35e-07 6.90e-03 4.66e-07 6.92e-03 5.31e-06 4.05e-03 +61Ni 5.07e-08 2.20e-04 1.76e-07 2.19e-04 1.65e-06 2.49e-04 +62Ni 5.97e-08 1.27e-03 2.99e-07 1.26e-03 2.41e-06 3.73e-03 +64Ni 7.97e-10 4.46e-09 8.13e-09 4.33e-08 1.40e-07 3.16e-06 +63Cu 8.85e-09 5.00e-07 4.80e-08 6.27e-07 4.93e-07 5.56e-06 +64Zn 1.29e-08 2.24e-05 2.74e-08 2.28e-05 1.78e-07 8.56e-06 +66Zn 6.43e-09 2.46e-05 3.23e-08 2.48e-05 1.63e-07 5.70e-05 +67Zn 1.59e-09 1.47e-08 8.25e-09 2.44e-08 3.43e-08 5.27e-07 +68Zn 1.62e-09 7.74e-09 9.24e-09 3.17e-08 3.89e-08 9.38e-07 +70Zn 4.88e-12 3.38e-11 5.42e-11 3.26e-10 4.69e-09 2.05e-08 +69Ga 1.26e-10 1.82e-09 8.43e-10 1.78e-08 1.03e-08 1.60e-07 +71Ga 4.64e-11 3.03e-10 3.95e-10 2.90e-09 6.05e-09 6.13e-08 diff --git a/vice/yields/sneia/gronow21/raw/table8.dat b/vice/yields/sneia/gronow21/raw/table8.dat index 54ac3bd7..19b0c130 100644 --- a/vice/yields/sneia/gronow21/raw/table8.dat +++ b/vice/yields/sneia/gronow21/raw/table8.dat @@ -1,68 +1,68 @@ -12C 7.71e-04 1.24e-03 7.68e-04 1.24e-03 7.55e-04 1.20e-03 -13C 4.95e-11 1.12e-09 4.92e-11 1.04e-09 3.96e-11 1.19e-08 -14N 1.71e-07 1.37e-07 1.22e-06 1.29e-07 3.51e-05 5.12e-07 -15N 1.27e-08 1.12e-09 1.33e-08 1.12e-09 3.35e-08 1.27e-09 -16O 6.60e-03 4.85e-02 6.62e-03 4.84e-02 7.09e-03 4.93e-02 -17O 1.55e-09 3.01e-08 2.94e-09 2.87e-08 4.73e-08 8.03e-08 -18O 1.11e-08 8.35e-10 1.91e-08 7.95e-10 2.74e-07 2.83e-09 -19F 6.87e-09 2.58e-11 7.33e-09 2.47e-11 2.16e-08 1.52e-10 -20Ne 1.70e-03 1.83e-03 1.69e-03 1.83e-03 1.68e-03 1.64e-03 -21Ne 4.93e-08 1.34e-07 5.10e-08 1.27e-07 1.02e-07 1.03e-06 -22Ne 2.89e-08 3.28e-07 4.84e-08 3.08e-07 6.70e-07 8.38e-06 -23Na 8.08e-06 1.04e-05 8.05e-06 1.03e-05 8.14e-06 2.59e-05 -24Mg 3.44e-03 3.71e-03 3.45e-03 3.80e-03 3.51e-03 1.61e-03 -25Mg 9.30e-06 1.52e-05 9.34e-06 1.48e-05 1.09e-05 7.31e-05 -26Mg 1.65e-05 2.64e-05 1.64e-05 2.57e-05 1.73e-05 1.25e-04 -27Al 1.25e-04 1.40e-04 1.25e-04 1.40e-04 1.29e-04 1.76e-04 -28Si 8.88e-03 1.51e-01 8.88e-03 1.51e-01 8.96e-03 1.50e-01 -29Si 9.37e-05 2.48e-04 9.36e-05 2.46e-04 9.48e-05 7.82e-04 -30Si 9.79e-05 3.42e-04 9.80e-05 3.38e-04 1.02e-04 1.76e-03 -31P 8.39e-05 1.83e-04 8.39e-05 1.81e-04 8.71e-05 5.04e-04 -32S 3.70e-03 9.38e-02 3.70e-03 9.38e-02 3.74e-03 7.98e-02 -33S 5.85e-05 1.45e-04 5.83e-05 1.43e-04 5.79e-05 2.93e-04 -34S 2.87e-05 8.86e-04 2.87e-05 8.66e-04 3.07e-05 4.20e-03 -36S 2.22e-09 1.92e-08 2.39e-09 1.91e-08 6.01e-09 1.65e-06 -35Cl 2.93e-05 5.36e-05 2.94e-05 5.23e-05 3.32e-05 1.42e-04 -37Cl 7.94e-06 1.32e-05 7.92e-06 1.29e-05 7.96e-06 2.70e-05 -36Ar 1.20e-03 1.84e-02 1.20e-03 1.84e-02 1.25e-03 1.39e-02 -38Ar 1.20e-05 4.18e-04 1.20e-05 4.06e-04 1.49e-05 1.99e-03 -40Ar 5.42e-10 1.97e-09 7.76e-10 2.38e-09 3.60e-09 1.47e-07 -39K 4.00e-05 3.56e-05 4.04e-05 3.49e-05 5.93e-05 8.11e-05 -41K 6.33e-06 2.52e-06 6.32e-06 2.48e-06 6.70e-06 4.60e-06 -40Ca 3.19e-03 1.77e-02 3.20e-03 1.77e-02 3.46e-03 1.30e-02 -42Ca 2.59e-06 1.07e-05 2.63e-06 1.03e-05 4.11e-06 4.77e-05 -43Ca 5.19e-06 3.56e-07 5.20e-06 3.57e-07 6.40e-06 2.65e-07 -44Ca 1.05e-03 2.01e-05 1.05e-03 2.02e-05 1.17e-03 1.27e-05 -46Ca 1.51e-11 4.74e-11 1.43e-10 3.95e-10 1.49e-09 7.98e-08 -48Ca 7.45e-12 1.82e-12 7.39e-11 1.66e-11 2.06e-09 5.89e-09 -45Sc 2.97e-06 1.37e-07 2.98e-06 1.36e-07 3.77e-06 3.22e-07 -46Ti 1.94e-06 4.27e-06 1.96e-06 4.14e-06 2.76e-06 1.67e-05 -47Ti 3.38e-05 7.36e-07 3.41e-05 7.33e-07 4.74e-05 1.12e-06 -48Ti 1.71e-03 4.03e-04 1.71e-03 4.04e-04 1.55e-03 2.86e-04 -49Ti 1.14e-05 2.07e-05 1.14e-05 2.06e-05 1.39e-05 3.12e-05 -50Ti 2.46e-11 1.73e-10 2.31e-10 6.26e-10 7.80e-09 1.83e-07 -50V 7.62e-11 1.19e-09 1.93e-10 1.52e-09 2.91e-09 5.25e-08 -51V 6.08e-05 5.14e-05 6.09e-05 5.09e-05 6.20e-05 1.08e-04 -50Cr 3.87e-06 1.08e-04 3.90e-06 1.06e-04 5.06e-06 5.40e-04 -52Cr 7.32e-04 8.74e-03 7.25e-04 8.76e-03 5.14e-04 6.87e-03 -53Cr 1.27e-05 6.09e-04 1.27e-05 6.05e-04 1.22e-05 1.07e-03 -54Cr 1.23e-10 1.27e-08 7.42e-10 1.42e-08 2.83e-08 6.21e-07 -55Mn 1.74e-05 3.07e-03 1.73e-05 3.04e-03 1.44e-05 6.94e-03 -54Fe 4.67e-06 1.24e-02 4.69e-06 1.22e-02 5.33e-06 5.44e-02 -56Fe 6.96e-05 6.10e-01 6.90e-05 6.11e-01 5.93e-05 5.33e-01 -57Fe 3.40e-06 1.11e-02 3.45e-06 1.10e-02 7.22e-06 1.87e-02 -58Fe 2.26e-09 7.07e-09 2.40e-08 3.25e-08 2.06e-06 1.59e-06 -59Co 3.87e-07 3.88e-04 6.65e-07 3.85e-04 1.39e-05 6.88e-04 -58Ni 2.33e-06 1.08e-02 2.56e-06 1.06e-02 2.22e-05 5.49e-02 -60Ni 8.46e-07 8.97e-03 1.67e-06 9.00e-03 1.82e-05 5.24e-03 -61Ni 2.10e-07 2.91e-04 4.06e-07 2.90e-04 4.42e-06 3.25e-04 -62Ni 2.62e-07 1.69e-03 7.12e-07 1.67e-03 6.75e-06 4.85e-03 -64Ni 1.36e-09 3.80e-09 1.34e-08 3.69e-08 2.30e-07 2.61e-06 -63Cu 3.34e-08 6.63e-07 1.57e-07 7.67e-07 1.76e-06 5.94e-06 -64Zn 8.45e-08 2.91e-05 2.39e-07 2.95e-05 2.16e-06 1.06e-05 -66Zn 3.27e-08 3.25e-05 1.12e-07 3.25e-05 8.35e-07 6.99e-05 -67Zn 8.82e-09 1.92e-08 2.68e-08 2.73e-08 1.76e-07 4.57e-07 -68Zn 1.18e-08 9.11e-09 4.01e-08 2.89e-08 1.78e-07 7.86e-07 -70Zn 6.94e-12 3.01e-11 6.98e-11 2.91e-10 2.80e-09 1.69e-08 -69Ga 1.17e-09 1.49e-09 5.73e-09 1.45e-08 4.70e-08 1.35e-07 -71Ga 2.42e-10 2.50e-10 1.33e-09 2.40e-09 1.42e-08 4.95e-08 +12C 7.71e-04 1.24e-03 7.68e-04 1.24e-03 7.55e-04 1.20e-03 +13C 4.95e-11 1.12e-09 4.92e-11 1.04e-09 3.96e-11 1.19e-08 +14N 1.71e-07 1.37e-07 1.22e-06 1.29e-07 3.51e-05 5.12e-07 +15N 1.27e-08 1.12e-09 1.33e-08 1.12e-09 3.35e-08 1.27e-09 +16O 6.60e-03 4.85e-02 6.62e-03 4.84e-02 7.09e-03 4.93e-02 +17O 1.55e-09 3.01e-08 2.94e-09 2.87e-08 4.73e-08 8.03e-08 +18O 1.11e-08 8.35e-10 1.91e-08 7.95e-10 2.74e-07 2.83e-09 +19F 6.87e-09 2.58e-11 7.33e-09 2.47e-11 2.16e-08 1.52e-10 +20Ne 1.70e-03 1.83e-03 1.69e-03 1.83e-03 1.68e-03 1.64e-03 +21Ne 4.93e-08 1.34e-07 5.10e-08 1.27e-07 1.02e-07 1.03e-06 +22Ne 2.89e-08 3.28e-07 4.84e-08 3.08e-07 6.70e-07 8.38e-06 +23Na 8.08e-06 1.04e-05 8.05e-06 1.03e-05 8.14e-06 2.59e-05 +24Mg 3.44e-03 3.71e-03 3.45e-03 3.80e-03 3.51e-03 1.61e-03 +25Mg 9.30e-06 1.52e-05 9.34e-06 1.48e-05 1.09e-05 7.31e-05 +26Mg 1.65e-05 2.64e-05 1.64e-05 2.57e-05 1.73e-05 1.25e-04 +27Al 1.25e-04 1.40e-04 1.25e-04 1.40e-04 1.29e-04 1.76e-04 +28Si 8.88e-03 1.51e-01 8.88e-03 1.51e-01 8.96e-03 1.50e-01 +29Si 9.37e-05 2.48e-04 9.36e-05 2.46e-04 9.48e-05 7.82e-04 +30Si 9.79e-05 3.42e-04 9.80e-05 3.38e-04 1.02e-04 1.76e-03 +31P 8.39e-05 1.83e-04 8.39e-05 1.81e-04 8.71e-05 5.04e-04 +32S 3.70e-03 9.38e-02 3.70e-03 9.38e-02 3.74e-03 7.98e-02 +33S 5.85e-05 1.45e-04 5.83e-05 1.43e-04 5.79e-05 2.93e-04 +34S 2.87e-05 8.86e-04 2.87e-05 8.66e-04 3.07e-05 4.20e-03 +36S 2.22e-09 1.92e-08 2.39e-09 1.91e-08 6.01e-09 1.65e-06 +35Cl 2.93e-05 5.36e-05 2.94e-05 5.23e-05 3.32e-05 1.42e-04 +37Cl 7.94e-06 1.32e-05 7.92e-06 1.29e-05 7.96e-06 2.70e-05 +36Ar 1.20e-03 1.84e-02 1.20e-03 1.84e-02 1.25e-03 1.39e-02 +38Ar 1.20e-05 4.18e-04 1.20e-05 4.06e-04 1.49e-05 1.99e-03 +40Ar 5.42e-10 1.97e-09 7.76e-10 2.38e-09 3.60e-09 1.47e-07 +39K 4.00e-05 3.56e-05 4.04e-05 3.49e-05 5.93e-05 8.11e-05 +41K 6.33e-06 2.52e-06 6.32e-06 2.48e-06 6.70e-06 4.60e-06 +40Ca 3.19e-03 1.77e-02 3.20e-03 1.77e-02 3.46e-03 1.30e-02 +42Ca 2.59e-06 1.07e-05 2.63e-06 1.03e-05 4.11e-06 4.77e-05 +43Ca 5.19e-06 3.56e-07 5.20e-06 3.57e-07 6.40e-06 2.65e-07 +44Ca 1.05e-03 2.01e-05 1.05e-03 2.02e-05 1.17e-03 1.27e-05 +46Ca 1.51e-11 4.74e-11 1.43e-10 3.95e-10 1.49e-09 7.98e-08 +48Ca 7.45e-12 1.82e-12 7.39e-11 1.66e-11 2.06e-09 5.89e-09 +45Sc 2.97e-06 1.37e-07 2.98e-06 1.36e-07 3.77e-06 3.22e-07 +46Ti 1.94e-06 4.27e-06 1.96e-06 4.14e-06 2.76e-06 1.67e-05 +47Ti 3.38e-05 7.36e-07 3.41e-05 7.33e-07 4.74e-05 1.12e-06 +48Ti 1.71e-03 4.03e-04 1.71e-03 4.04e-04 1.55e-03 2.86e-04 +49Ti 1.14e-05 2.07e-05 1.14e-05 2.06e-05 1.39e-05 3.12e-05 +50Ti 2.46e-11 1.73e-10 2.31e-10 6.26e-10 7.80e-09 1.83e-07 +50V 7.62e-11 1.19e-09 1.93e-10 1.52e-09 2.91e-09 5.25e-08 +51V 6.08e-05 5.14e-05 6.09e-05 5.09e-05 6.20e-05 1.08e-04 +50Cr 3.87e-06 1.08e-04 3.90e-06 1.06e-04 5.06e-06 5.40e-04 +52Cr 7.32e-04 8.74e-03 7.25e-04 8.76e-03 5.14e-04 6.87e-03 +53Cr 1.27e-05 6.09e-04 1.27e-05 6.05e-04 1.22e-05 1.07e-03 +54Cr 1.23e-10 1.27e-08 7.42e-10 1.42e-08 2.83e-08 6.21e-07 +55Mn 1.74e-05 3.07e-03 1.73e-05 3.04e-03 1.44e-05 6.94e-03 +54Fe 4.67e-06 1.24e-02 4.69e-06 1.22e-02 5.33e-06 5.44e-02 +56Fe 6.96e-05 6.10e-01 6.90e-05 6.11e-01 5.93e-05 5.33e-01 +57Fe 3.40e-06 1.11e-02 3.45e-06 1.10e-02 7.22e-06 1.87e-02 +58Fe 2.26e-09 7.07e-09 2.40e-08 3.25e-08 2.06e-06 1.59e-06 +59Co 3.87e-07 3.88e-04 6.65e-07 3.85e-04 1.39e-05 6.88e-04 +58Ni 2.33e-06 1.08e-02 2.56e-06 1.06e-02 2.22e-05 5.49e-02 +60Ni 8.46e-07 8.97e-03 1.67e-06 9.00e-03 1.82e-05 5.24e-03 +61Ni 2.10e-07 2.91e-04 4.06e-07 2.90e-04 4.42e-06 3.25e-04 +62Ni 2.62e-07 1.69e-03 7.12e-07 1.67e-03 6.75e-06 4.85e-03 +64Ni 1.36e-09 3.80e-09 1.34e-08 3.69e-08 2.30e-07 2.61e-06 +63Cu 3.34e-08 6.63e-07 1.57e-07 7.67e-07 1.76e-06 5.94e-06 +64Zn 8.45e-08 2.91e-05 2.39e-07 2.95e-05 2.16e-06 1.06e-05 +66Zn 3.27e-08 3.25e-05 1.12e-07 3.25e-05 8.35e-07 6.99e-05 +67Zn 8.82e-09 1.92e-08 2.68e-08 2.73e-08 1.76e-07 4.57e-07 +68Zn 1.18e-08 9.11e-09 4.01e-08 2.89e-08 1.78e-07 7.86e-07 +70Zn 6.94e-12 3.01e-11 6.98e-11 2.91e-10 2.80e-09 1.69e-08 +69Ga 1.17e-09 1.49e-09 5.73e-09 1.45e-08 4.70e-08 1.35e-07 +71Ga 2.42e-10 2.50e-10 1.33e-09 2.40e-09 1.42e-08 4.95e-08 diff --git a/vice/yields/sneia/gronow21/raw/table9.dat b/vice/yields/sneia/gronow21/raw/table9.dat index c9c4a613..b27bec95 100644 --- a/vice/yields/sneia/gronow21/raw/table9.dat +++ b/vice/yields/sneia/gronow21/raw/table9.dat @@ -1,68 +1,68 @@ -12C 3.96e-05 4.45e-04 3.95e-05 4.43e-04 3.97e-05 4.30e-04 -13C 1.91e-10 1.25e-10 1.88e-10 1.20e-10 9.33e-11 7.98e-10 -14N 1.49e-07 2.49e-08 1.21e-06 2.40e-08 3.55e-05 7.19e-08 -15N 4.65e-09 5.90e-10 4.93e-09 1.08e-09 1.25e-08 7.36e-10 -16O 9.17e-03 6.04e-02 9.18e-03 6.03e-02 9.67e-03 6.15e-02 -17O 1.81e-10 6.15e-09 1.58e-09 5.94e-09 4.67e-08 1.72e-08 -18O 6.40e-09 1.93e-10 1.42e-08 1.83e-10 2.63e-07 5.29e-10 -19F 1.60e-09 5.51e-12 1.80e-09 5.44e-12 7.77e-09 2.81e-11 -20Ne 1.42e-05 1.54e-03 1.44e-05 1.53e-03 2.26e-05 1.41e-03 -21Ne 7.07e-09 3.61e-08 8.12e-09 3.58e-08 3.97e-08 2.66e-07 -22Ne 6.14e-09 1.18e-07 2.51e-08 1.15e-07 6.34e-07 9.70e-07 -23Na 3.58e-07 7.28e-06 3.62e-07 7.30e-06 5.55e-07 1.41e-05 -24Mg 2.82e-03 5.14e-03 2.86e-03 5.27e-03 2.98e-03 2.31e-03 -25Mg 8.31e-07 1.15e-05 8.73e-07 1.13e-05 1.87e-06 4.73e-05 -26Mg 6.27e-07 1.71e-05 6.66e-07 1.67e-05 1.73e-06 6.51e-05 -27Al 4.93e-05 2.08e-04 5.01e-05 2.09e-04 5.23e-05 2.56e-04 -28Si 1.31e-02 1.61e-01 1.31e-02 1.62e-01 1.32e-02 1.60e-01 -29Si 7.85e-05 2.98e-04 7.90e-05 2.95e-04 8.22e-05 9.91e-04 -30Si 9.60e-05 4.52e-04 9.74e-05 4.47e-04 1.04e-04 2.43e-03 -31P 5.55e-05 2.50e-04 5.55e-05 2.47e-04 5.67e-05 6.91e-04 -32S 4.98e-03 9.88e-02 4.95e-03 9.87e-02 4.94e-03 8.43e-02 -33S 6.19e-05 1.96e-04 6.14e-05 1.93e-04 6.09e-05 3.73e-04 -34S 1.71e-04 1.02e-03 1.70e-04 9.94e-04 1.73e-04 4.85e-03 -36S 3.94e-09 2.43e-08 4.02e-09 2.35e-08 5.29e-09 2.18e-06 -35Cl 1.58e-05 7.05e-05 1.57e-05 6.86e-05 1.82e-05 1.86e-04 -37Cl 5.46e-06 1.52e-05 5.41e-06 1.49e-05 5.67e-06 2.98e-05 -36Ar 1.39e-03 1.90e-02 1.38e-03 1.90e-02 1.40e-03 1.43e-02 -38Ar 4.51e-05 4.56e-04 4.47e-05 4.43e-04 4.97e-05 2.12e-03 -40Ar 2.52e-10 3.04e-09 2.56e-10 2.97e-09 5.93e-10 1.26e-07 -39K 4.03e-05 4.09e-05 4.06e-05 4.00e-05 5.21e-05 8.75e-05 -41K 1.84e-06 2.74e-06 1.84e-06 2.69e-06 2.43e-06 4.82e-06 -40Ca 4.26e-03 1.79e-02 4.26e-03 1.79e-02 4.31e-03 1.31e-02 -42Ca 4.59e-06 1.24e-05 4.58e-06 1.20e-05 6.16e-06 5.11e-05 -43Ca 1.38e-05 7.77e-07 1.38e-05 7.77e-07 1.35e-05 4.92e-07 -44Ca 7.79e-04 2.42e-05 7.80e-04 2.43e-05 8.10e-04 1.41e-05 -46Ca 7.74e-13 2.41e-11 2.15e-12 1.09e-10 4.35e-11 4.89e-08 -48Ca 6.33e-12 1.31e-12 6.33e-11 4.67e-12 1.90e-09 1.74e-09 -45Sc 2.19e-06 1.56e-07 2.19e-06 1.53e-07 2.87e-06 3.59e-07 -46Ti 5.21e-06 4.64e-06 5.20e-06 4.49e-06 5.46e-06 1.76e-05 -47Ti 3.15e-05 9.28e-07 3.15e-05 9.23e-07 3.33e-05 1.29e-06 -48Ti 2.06e-03 3.95e-04 2.06e-03 3.96e-04 2.15e-03 2.77e-04 -49Ti 2.05e-05 2.03e-05 2.07e-05 2.02e-05 2.64e-05 3.03e-05 -50Ti 2.22e-11 2.29e-10 8.62e-11 6.06e-10 2.17e-09 2.66e-07 -50V 2.45e-10 2.02e-09 2.41e-10 2.22e-09 6.34e-10 8.63e-08 -51V 1.48e-04 5.05e-05 1.48e-04 5.00e-05 1.59e-04 1.06e-04 -50Cr 2.56e-05 1.11e-04 2.54e-05 1.08e-04 2.13e-05 5.51e-04 -52Cr 4.02e-03 8.43e-03 4.03e-03 8.44e-03 4.37e-03 6.61e-03 -53Cr 5.77e-05 5.91e-04 5.83e-05 5.87e-04 7.91e-05 1.04e-03 -54Cr 2.97e-10 1.39e-08 4.68e-10 1.69e-08 6.75e-09 7.03e-07 -55Mn 4.78e-04 2.98e-03 4.79e-04 2.95e-03 4.94e-04 6.71e-03 -54Fe 3.50e-05 1.24e-02 3.54e-05 1.22e-02 4.98e-05 5.43e-02 -56Fe 8.32e-03 5.56e-01 8.31e-03 5.57e-01 8.10e-03 4.85e-01 -57Fe 5.75e-04 1.01e-02 5.76e-04 1.00e-02 5.73e-04 1.69e-02 -58Fe 3.88e-10 7.81e-09 3.23e-09 3.34e-08 1.31e-07 2.03e-06 -59Co 2.75e-05 3.67e-04 2.75e-05 3.63e-04 3.03e-05 6.40e-04 -58Ni 1.02e-04 9.59e-03 1.03e-04 9.40e-03 1.44e-04 4.89e-02 -60Ni 7.48e-04 9.15e-03 7.48e-04 9.17e-03 7.29e-04 5.44e-03 -61Ni 1.20e-04 2.92e-04 1.20e-04 2.92e-04 1.12e-04 3.28e-04 -62Ni 5.98e-05 1.57e-03 6.07e-05 1.55e-03 8.78e-05 4.54e-03 -64Ni 7.39e-11 3.84e-09 7.39e-10 3.63e-08 1.77e-08 4.93e-06 -63Cu 5.17e-06 8.00e-07 5.17e-06 9.36e-07 4.87e-06 6.29e-06 -64Zn 6.41e-05 3.05e-05 6.37e-05 3.11e-05 4.88e-05 1.19e-05 -66Zn 7.08e-06 3.22e-05 7.35e-06 3.25e-05 1.21e-05 7.46e-05 -67Zn 5.48e-07 2.13e-08 6.18e-07 2.98e-08 1.73e-06 8.28e-07 -68Zn 3.67e-07 1.05e-08 5.71e-07 4.54e-08 1.86e-06 1.66e-06 -70Zn 4.68e-13 2.51e-11 4.60e-12 2.29e-10 1.18e-10 3.56e-08 -69Ga 2.39e-08 3.16e-09 4.57e-08 3.08e-08 1.43e-07 3.10e-07 -71Ga 1.47e-09 4.21e-10 3.43e-09 4.00e-09 9.10e-09 1.37e-07 +12C 3.96e-05 4.45e-04 3.95e-05 4.43e-04 3.97e-05 4.30e-04 +13C 1.91e-10 1.25e-10 1.88e-10 1.20e-10 9.33e-11 7.98e-10 +14N 1.49e-07 2.49e-08 1.21e-06 2.40e-08 3.55e-05 7.19e-08 +15N 4.65e-09 5.90e-10 4.93e-09 1.08e-09 1.25e-08 7.36e-10 +16O 9.17e-03 6.04e-02 9.18e-03 6.03e-02 9.67e-03 6.15e-02 +17O 1.81e-10 6.15e-09 1.58e-09 5.94e-09 4.67e-08 1.72e-08 +18O 6.40e-09 1.93e-10 1.42e-08 1.83e-10 2.63e-07 5.29e-10 +19F 1.60e-09 5.51e-12 1.80e-09 5.44e-12 7.77e-09 2.81e-11 +20Ne 1.42e-05 1.54e-03 1.44e-05 1.53e-03 2.26e-05 1.41e-03 +21Ne 7.07e-09 3.61e-08 8.12e-09 3.58e-08 3.97e-08 2.66e-07 +22Ne 6.14e-09 1.18e-07 2.51e-08 1.15e-07 6.34e-07 9.70e-07 +23Na 3.58e-07 7.28e-06 3.62e-07 7.30e-06 5.55e-07 1.41e-05 +24Mg 2.82e-03 5.14e-03 2.86e-03 5.27e-03 2.98e-03 2.31e-03 +25Mg 8.31e-07 1.15e-05 8.73e-07 1.13e-05 1.87e-06 4.73e-05 +26Mg 6.27e-07 1.71e-05 6.66e-07 1.67e-05 1.73e-06 6.51e-05 +27Al 4.93e-05 2.08e-04 5.01e-05 2.09e-04 5.23e-05 2.56e-04 +28Si 1.31e-02 1.61e-01 1.31e-02 1.62e-01 1.32e-02 1.60e-01 +29Si 7.85e-05 2.98e-04 7.90e-05 2.95e-04 8.22e-05 9.91e-04 +30Si 9.60e-05 4.52e-04 9.74e-05 4.47e-04 1.04e-04 2.43e-03 +31P 5.55e-05 2.50e-04 5.55e-05 2.47e-04 5.67e-05 6.91e-04 +32S 4.98e-03 9.88e-02 4.95e-03 9.87e-02 4.94e-03 8.43e-02 +33S 6.19e-05 1.96e-04 6.14e-05 1.93e-04 6.09e-05 3.73e-04 +34S 1.71e-04 1.02e-03 1.70e-04 9.94e-04 1.73e-04 4.85e-03 +36S 3.94e-09 2.43e-08 4.02e-09 2.35e-08 5.29e-09 2.18e-06 +35Cl 1.58e-05 7.05e-05 1.57e-05 6.86e-05 1.82e-05 1.86e-04 +37Cl 5.46e-06 1.52e-05 5.41e-06 1.49e-05 5.67e-06 2.98e-05 +36Ar 1.39e-03 1.90e-02 1.38e-03 1.90e-02 1.40e-03 1.43e-02 +38Ar 4.51e-05 4.56e-04 4.47e-05 4.43e-04 4.97e-05 2.12e-03 +40Ar 2.52e-10 3.04e-09 2.56e-10 2.97e-09 5.93e-10 1.26e-07 +39K 4.03e-05 4.09e-05 4.06e-05 4.00e-05 5.21e-05 8.75e-05 +41K 1.84e-06 2.74e-06 1.84e-06 2.69e-06 2.43e-06 4.82e-06 +40Ca 4.26e-03 1.79e-02 4.26e-03 1.79e-02 4.31e-03 1.31e-02 +42Ca 4.59e-06 1.24e-05 4.58e-06 1.20e-05 6.16e-06 5.11e-05 +43Ca 1.38e-05 7.77e-07 1.38e-05 7.77e-07 1.35e-05 4.92e-07 +44Ca 7.79e-04 2.42e-05 7.80e-04 2.43e-05 8.10e-04 1.41e-05 +46Ca 7.74e-13 2.41e-11 2.15e-12 1.09e-10 4.35e-11 4.89e-08 +48Ca 6.33e-12 1.31e-12 6.33e-11 4.67e-12 1.90e-09 1.74e-09 +45Sc 2.19e-06 1.56e-07 2.19e-06 1.53e-07 2.87e-06 3.59e-07 +46Ti 5.21e-06 4.64e-06 5.20e-06 4.49e-06 5.46e-06 1.76e-05 +47Ti 3.15e-05 9.28e-07 3.15e-05 9.23e-07 3.33e-05 1.29e-06 +48Ti 2.06e-03 3.95e-04 2.06e-03 3.96e-04 2.15e-03 2.77e-04 +49Ti 2.05e-05 2.03e-05 2.07e-05 2.02e-05 2.64e-05 3.03e-05 +50Ti 2.22e-11 2.29e-10 8.62e-11 6.06e-10 2.17e-09 2.66e-07 +50V 2.45e-10 2.02e-09 2.41e-10 2.22e-09 6.34e-10 8.63e-08 +51V 1.48e-04 5.05e-05 1.48e-04 5.00e-05 1.59e-04 1.06e-04 +50Cr 2.56e-05 1.11e-04 2.54e-05 1.08e-04 2.13e-05 5.51e-04 +52Cr 4.02e-03 8.43e-03 4.03e-03 8.44e-03 4.37e-03 6.61e-03 +53Cr 5.77e-05 5.91e-04 5.83e-05 5.87e-04 7.91e-05 1.04e-03 +54Cr 2.97e-10 1.39e-08 4.68e-10 1.69e-08 6.75e-09 7.03e-07 +55Mn 4.78e-04 2.98e-03 4.79e-04 2.95e-03 4.94e-04 6.71e-03 +54Fe 3.50e-05 1.24e-02 3.54e-05 1.22e-02 4.98e-05 5.43e-02 +56Fe 8.32e-03 5.56e-01 8.31e-03 5.57e-01 8.10e-03 4.85e-01 +57Fe 5.75e-04 1.01e-02 5.76e-04 1.00e-02 5.73e-04 1.69e-02 +58Fe 3.88e-10 7.81e-09 3.23e-09 3.34e-08 1.31e-07 2.03e-06 +59Co 2.75e-05 3.67e-04 2.75e-05 3.63e-04 3.03e-05 6.40e-04 +58Ni 1.02e-04 9.59e-03 1.03e-04 9.40e-03 1.44e-04 4.89e-02 +60Ni 7.48e-04 9.15e-03 7.48e-04 9.17e-03 7.29e-04 5.44e-03 +61Ni 1.20e-04 2.92e-04 1.20e-04 2.92e-04 1.12e-04 3.28e-04 +62Ni 5.98e-05 1.57e-03 6.07e-05 1.55e-03 8.78e-05 4.54e-03 +64Ni 7.39e-11 3.84e-09 7.39e-10 3.63e-08 1.77e-08 4.93e-06 +63Cu 5.17e-06 8.00e-07 5.17e-06 9.36e-07 4.87e-06 6.29e-06 +64Zn 6.41e-05 3.05e-05 6.37e-05 3.11e-05 4.88e-05 1.19e-05 +66Zn 7.08e-06 3.22e-05 7.35e-06 3.25e-05 1.21e-05 7.46e-05 +67Zn 5.48e-07 2.13e-08 6.18e-07 2.98e-08 1.73e-06 8.28e-07 +68Zn 3.67e-07 1.05e-08 5.71e-07 4.54e-08 1.86e-06 1.66e-06 +70Zn 4.68e-13 2.51e-11 4.60e-12 2.29e-10 1.18e-10 3.56e-08 +69Ga 2.39e-08 3.16e-09 4.57e-08 3.08e-08 1.43e-07 3.10e-07 +71Ga 1.47e-09 4.21e-10 3.43e-09 4.00e-09 9.10e-09 1.37e-07