From a9cc674cbc617c140c2cbcdaf88e6a4b11ce66df Mon Sep 17 00:00:00 2001 From: Shikhar Kumar Date: Wed, 12 Dec 2018 12:45:20 -0500 Subject: [PATCH] Use public accessor functions in CMFD test suite --- tests/regression_tests/cmfd_feed/test.py | 14 +++++++------- tests/regression_tests/cmfd_feed_2g/test.py | 14 +++++++------- tests/regression_tests/cmfd_feed_ng/test.py | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/regression_tests/cmfd_feed/test.py b/tests/regression_tests/cmfd_feed/test.py index 61d4ae2ef..242ae3d1e 100644 --- a/tests/regression_tests/cmfd_feed/test.py +++ b/tests/regression_tests/cmfd_feed/test.py @@ -131,19 +131,19 @@ def test_cmfd_feed(): # Create output string of all CMFD results to pass into testing harness outstr = 'cmfd indices\n' - outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run._indices]) + outstr += '\n'.join(['{0:12.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(['{0:12.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(['{0:12.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(['{0:12.6E}'.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(['{0:10.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(['{0:12.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), + 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' diff --git a/tests/regression_tests/cmfd_feed_2g/test.py b/tests/regression_tests/cmfd_feed_2g/test.py index 8377e208a..dba70809b 100644 --- a/tests/regression_tests/cmfd_feed_2g/test.py +++ b/tests/regression_tests/cmfd_feed_2g/test.py @@ -24,19 +24,19 @@ def test_cmfd_feed_2g(): # Create output string of all CMFD results to pass into testing harness outstr = 'cmfd indices\n' - outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run._indices]) + outstr += '\n'.join(['{0:12.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(['{0:12.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(['{0:12.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(['{0:12.6E}'.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(['{0:10.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(['{0:12.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), + 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' diff --git a/tests/regression_tests/cmfd_feed_ng/test.py b/tests/regression_tests/cmfd_feed_ng/test.py index e49f912aa..fec9cceab 100644 --- a/tests/regression_tests/cmfd_feed_ng/test.py +++ b/tests/regression_tests/cmfd_feed_ng/test.py @@ -25,19 +25,19 @@ def test_cmfd_feed_ng(): # Create output string of all CMFD results to pass into testing harness outstr = 'cmfd indices\n' - outstr += '\n'.join(['{0:12.6E}'.format(x) for x in cmfd_run._indices]) + outstr += '\n'.join(['{0:12.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(['{0:12.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(['{0:12.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(['{0:12.6E}'.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(['{0:10.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(['{0:12.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), + 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'