crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-25 12:35:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

rebase to resovle conflicts

Browse source
This commit is contained in:
Jingang Liang 2020-10-09 22:58:02 +08:00
parent 2f9aaff767
commit 76e0c19ac6
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -39,11 +39,9 @@ matrix:
env: OMP=n MPI=n PHDF5=n
- python: "3.8"
env: OMP=y MPI=n PHDF5=n
- python: "3.8"
env: OMP=n MPI=y PHDF5=n
- python: "3.8"
env: OMP=n MPI=y PHDF5=n VECTFIT=y
- python: "3.7"
- python: "3.8"
env: OMP=n MPI=y PHDF5=y
- python: "3.8"
env: OMP=y MPI=y PHDF5=y DAGMC=y

4
openmc/data/multipole.py
View file

@ -20,8 +20,6 @@ from .data import K_BOLTZMANN
from .neutron import IncidentNeutron
from .resonance import ResonanceRange
import vectfit as vf
# Constants that determine which value to access
_MP_EA = 0 # Pole
@ -353,7 +351,7 @@ def _vectfit_xs(energy, ce_xs, mts, rtol=1e-3, atol=1e-5, orders=None,
if log:
print("Found {} real poles and {} conjugate complex pairs.".format(
len(real_idx), len(conj_idx)))
mp_poles = best_poles[real_idx+conj_idx]
mp_poles = best_poles[real_idx + conj_idx]
mp_residues = np.concatenate((best_residues[:, real_idx],
best_residues[:, conj_idx]*2), axis=1)/1j
if log: