Commit ef228502 authored by Jingang Liang's avatar Jingang Liang Committed by GitHub

Merge pull request #1215 from paulromano/glibc228-fixes

Model changes to get regression tests to pass on Ubuntu 18.10
parents 02a28188 12655ea2
......@@ -425,39 +425,39 @@ cmfd entropy
3.233193E+00
3.232564E+00
cmfd balance
4.009062E-03
4.431773E-03
3.152666E-03
3.510383E-03
2.052089E-03
2.068651E-03
1.502427E-03
1.589825E-03
1.566020E-03
1.170009E-03
9.507594E-04
9.072590E-04
1.009003E-03
1.064703E-03
1.163610E-03
9.756308E-04
4.00906E-03
4.43177E-03
3.15267E-03
3.51038E-03
2.05209E-03
2.06865E-03
1.50243E-03
1.58983E-03
1.56602E-03
1.17001E-03
9.50759E-04
9.07259E-04
1.00900E-03
1.06470E-03
1.16361E-03
9.75631E-04
cmfd dominance ratio
5.397E-01
5.425E-01
5.481E-01
5.473E-01
5.503E-01
5.502E-01
5.483E-01
5.520E-01
5.505E-01
3.216E-01
5.373E-01
5.517E-01
5.508E-01
5.524E-01
5.524E-01
5.523E-01
5.397E-01
5.425E-01
5.481E-01
5.473E-01
5.503E-01
5.502E-01
5.483E-01
5.520E-01
5.505E-01
3.216E-01
5.373E-01
5.517E-01
5.508E-01
5.524E-01
5.524E-01
5.523E-01
cmfd openmc source comparison
6.959834E-03
5.655657E-03
......
......@@ -373,39 +373,39 @@ cmfd entropy
1.999998E+00
1.999984E+00
cmfd balance
3.993043E-04
4.168558E-04
6.384693E-04
3.928217E-04
3.789833E-04
2.684860E-04
4.849910E-04
1.084019E-03
1.091775E-03
5.459767E-04
4.455545E-04
4.011468E-04
3.710248E-04
3.577152E-04
3.845993E-04
3.900672E-04
3.99304E-04
4.16856E-04
6.38469E-04
3.92822E-04
3.78983E-04
2.68486E-04
4.84991E-04
1.08402E-03
1.09178E-03
5.45977E-04
4.45554E-04
4.01147E-04
3.71025E-04
3.57715E-04
3.84599E-04
3.90067E-04
cmfd dominance ratio
6.239E-03
6.303E-03
6.347E-03
6.388E-03
6.340E-03
6.334E-03
6.270E-03
6.173E-03
6.068E-03
6.061E-03
6.016E-03
6.108E-03
6.117E-03
6.074E-03
6.005E-03
5.996E-03
6.239E-03
6.303E-03
6.347E-03
6.388E-03
6.340E-03
6.334E-03
6.270E-03
6.173E-03
6.068E-03
6.061E-03
6.016E-03
6.108E-03
6.117E-03
6.074E-03
6.005E-03
5.996E-03
cmfd openmc source comparison
1.931386E-05
2.839162E-05
......
......@@ -5,7 +5,7 @@
<run_mode>eigenvalue</run_mode>
<batches>20</batches>
<inactive>10</inactive>
<particles>1000</particles>
<particles>600</particles>
<!-- Starting source -->
<source strength="1.0">
......
......@@ -425,39 +425,39 @@ cmfd entropy
3.221580E+00
3.220523E+00
cmfd balance
4.009062E-03
4.869661E-03
2.997290E-03
2.711191E-03
1.688329E-03
1.855396E-03
1.403979E-03
1.398429E-03
1.818398E-03
1.458254E-03
1.437876E-03
1.276844E-03
1.289036E-03
1.330300E-03
1.139999E-03
1.233647E-03
4.00906E-03
4.86966E-03
2.99729E-03
2.71119E-03
1.68833E-03
1.85540E-03
1.40398E-03
1.39843E-03
1.81840E-03
1.45825E-03
1.43788E-03
1.27684E-03
1.28904E-03
1.33030E-03
1.14000E-03
1.23365E-03
cmfd dominance ratio
5.397E-01
5.405E-01
5.412E-01
5.428E-01
5.460E-01
4.530E-01
5.528E-01
5.531E-01
5.493E-01
5.468E-01
5.482E-01
5.487E-01
5.471E-01
5.465E-01
5.461E-01
5.443E-01
5.397E-01
5.405E-01
5.412E-01
5.428E-01
5.460E-01
4.530E-01
5.528E-01
5.531E-01
5.493E-01
5.468E-01
5.482E-01
5.487E-01
5.471E-01
5.465E-01
5.461E-01
5.443E-01
cmfd openmc source comparison
6.959834E-03
5.494667E-03
......
......@@ -5,6 +5,7 @@
<density value="4.5" units="g/cc" />
<nuclide name="U238" ao="1.0" />
<nuclide name="U235" ao="0.06" />
<nuclide name="H1" ao="1.0" />
</material>
</materials>
k-combined:
1.005538E+00 3.374726E-03
1.083927E+00 7.465752E-03
......@@ -2,8 +2,8 @@
<settings>
<run_mode>eigenvalue</run_mode>
<batches>10</batches>
<inactive>5</inactive>
<batches>4</batches>
<inactive>0</inactive>
<particles>1000</particles>
<source>
......
......@@ -2,5 +2,5 @@ from tests.testing_harness import TestHarness
def test_quadric_surfaces():
harness = TestHarness('statepoint.10.h5')
harness = TestHarness('statepoint.4.h5')
harness.main()
......@@ -432,7 +432,7 @@
<settings>
<run_mode>eigenvalue</run_mode>
<particles>100</particles>
<batches>5</batches>
<batches>4</batches>
<inactive>0</inactive>
<source strength="1.0">
<space type="point">
......
k-combined:
1.683226E+00 7.383559E-02
1.707485E+00 9.795497E-02
......@@ -82,7 +82,7 @@ class TRISOTestHarness(PyAPITestHarness):
geom.export_to_xml()
settings = openmc.Settings()
settings.batches = 5
settings.batches = 4
settings.inactive = 0
settings.particles = 100
settings.source = openmc.Source(space=openmc.stats.Point())
......@@ -93,5 +93,5 @@ class TRISOTestHarness(PyAPITestHarness):
def test_triso():
harness = TRISOTestHarness('statepoint.5.h5')
harness = TRISOTestHarness('statepoint.4.h5')
harness.main()
......@@ -134,27 +134,27 @@ class CMFDTestHarness(TestHarness):
"""Specialized TestHarness for running OpenMC CMFD tests."""
def __init__(self, statepoint_name, cmfd_run):
self._sp_name = statepoint_name
super().__init__(statepoint_name)
self._create_cmfd_result_str(cmfd_run)
def _create_cmfd_result_str(self, cmfd_run):
"""Create CMFD result string from variables of CMFDRun instance"""
outstr = 'cmfd indices\n'
outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run.indices])
outstr += '\n'.join(['{:.6E}'.format(x) for x in cmfd_run.indices])
outstr += '\nk cmfd\n'
outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run.k_cmfd])
outstr += '\n'.join(['{:.6E}'.format(x) for x in cmfd_run.k_cmfd])
outstr += '\ncmfd entropy\n'
outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run.entropy])
outstr += '\n'.join(['{:.6E}'.format(x) for x in cmfd_run.entropy])
outstr += '\ncmfd balance\n'
outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run.balance])
outstr += '\n'.join(['{:.5E}'.format(x) for x in cmfd_run.balance])
outstr += '\ncmfd dominance ratio\n'
outstr += '\n'.join(['{0:10.3E}'.format(x) for x in cmfd_run.dom])
outstr += '\n'.join(['{:.3E}'.format(x) for x in cmfd_run.dom])
outstr += '\ncmfd openmc source comparison\n'
outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run.src_cmp])
outstr += '\n'.join(['{:.6E}'.format(x) for x in cmfd_run.src_cmp])
outstr += '\ncmfd source\n'
cmfdsrc = np.reshape(cmfd_run.cmfd_src, np.product(cmfd_run.indices),
order='F')
outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfdsrc])
outstr += '\n'.join(['{:.6E}'.format(x) for x in cmfdsrc])
outstr += '\n'
self._cmfdrun_results = outstr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment