Skip to content

Commit ce605fa

Browse files
author
skywalker_cn
committed
Merge remote-tracking branch 'gitee/develop' into virtual_lattice_0.15.2
2 parents 02fe13b + 055ea15 commit ce605fa

81 files changed

Lines changed: 1519 additions & 869 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
LIBMESH: ${{ matrix.libmesh }}
7676
NPY_DISABLE_CPU_FEATURES: "AVX512F AVX512_SKX"
7777
OPENBLAS_NUM_THREADS: 1
78+
PYTEST_ADDOPTS: --cov=openmc --cov-report=lcov:coverage-python.lcov
7879
# libfabric complains about fork() as a result of using Python multiprocessing.
7980
# We can work around it with RDMAV_FORK_SAFE=1 in libfabric < 1.13 and with
8081
# FI_EFA_FORK_SAFE=1 in more recent versions.
@@ -171,11 +172,37 @@ jobs:
171172
uses: mxschmitt/action-tmate@v3
172173
timeout-minutes: 10
173174

174-
- name: after_success
175+
- name: Generate C++ coverage (gcovr)
175176
shell: bash
176177
run: |
177-
cpp-coveralls -i src -i include -e src/external --exclude-pattern "/usr/*" --dump cpp_cov.json
178-
coveralls --merge=cpp_cov.json --service=github
178+
# Produce LCOV directly from gcov data in the build tree
179+
gcovr \
180+
--root "$GITHUB_WORKSPACE" \
181+
--object-directory "$GITHUB_WORKSPACE/build" \
182+
--filter "$GITHUB_WORKSPACE/src" \
183+
--filter "$GITHUB_WORKSPACE/include" \
184+
--exclude "$GITHUB_WORKSPACE/src/external/.*" \
185+
--exclude "$GITHUB_WORKSPACE/src/include/openmc/external/.*" \
186+
--gcov-ignore-errors source_not_found \
187+
--gcov-ignore-errors output_error \
188+
--gcov-ignore-parse-errors suspicious_hits.warn \
189+
--print-summary \
190+
--lcov -o coverage-cpp.lcov || true
191+
192+
- name: Merge C++ and Python coverage
193+
shell: bash
194+
run: |
195+
# Merge C++ and Python LCOV into a single file for upload
196+
cat coverage-cpp.lcov coverage-python.lcov > coverage.lcov
197+
198+
- name: Upload coverage to Coveralls
199+
if: ${{ hashFiles('coverage.lcov') != '' }}
200+
uses: coverallsapp/github-action@v2
201+
with:
202+
github-token: ${{ secrets.GITHUB_TOKEN }}
203+
parallel: true
204+
flag-name: C++ and Python
205+
path-to-lcov: coverage.lcov
179206

180207
finish:
181208
needs: main
@@ -184,5 +211,5 @@ jobs:
184211
- name: Coveralls Finished
185212
uses: coverallsapp/github-action@v2
186213
with:
187-
github-token: ${{ secrets.github_token }}
214+
github-token: ${{ secrets.GITHUB_TOKEN }}
188215
parallel-finished: true

docs/source/io_formats/depletion_chain.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,27 @@ attributes:
5656

5757
.. _io_chain_reaction:
5858

59+
--------------------
60+
``<source>`` Element
61+
--------------------
62+
63+
The ``<source>`` element represents photon and electron sources associated with
64+
the decay of a nuclide and contains information to construct an
65+
:class:`openmc.stats.Univariate` object that represents this emission as an
66+
energy distribution. This element has the following attributes:
67+
68+
:type:
69+
The type of :class:`openmc.stats.Univariate` source term.
70+
71+
:particle:
72+
The type of particle emitted, e.g., 'photon' or 'electron'
73+
74+
:parameters:
75+
The parameters of the source term, e.g., for a
76+
:class:`openmc.stats.Discrete` source, the energies (in [eV]) at which the
77+
particles are emitted and their relative intensities in [Bq/atom] (in other
78+
words, decay constants).
79+
5980
----------------------
6081
``<reaction>`` Element
6182
----------------------

docs/source/io_formats/settings.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,16 @@ history-based parallelism.
178178

179179
*Default*: false
180180

181+
--------------------------------
182+
``<free_gas_threshold>`` Element
183+
--------------------------------
184+
185+
The ``<free_gas_threshold>`` element specifies the energy multiplier, expressed
186+
in units of :math:`kT`, that determines when the free gas scattering approach is
187+
used for elastic scattering. Values must be positive.
188+
189+
*Default*: 400.0
190+
181191
-----------------------------------
182192
``<generations_per_batch>`` Element
183193
-----------------------------------

0 commit comments

Comments
 (0)