From dde18cb6f1bc02d88900a2e07ea31ad4fb2f29e6 Mon Sep 17 00:00:00 2001
From: Sterling Harper <smharper@mit.edu>
Date: Wed, 2 Nov 2016 19:33:11 -0400
Subject: [PATCH] Revert "Show me your secrets, Travis"

This reverts commit 48678c92b9a46fddb88370f7ba1d3cf741e8e42c.
---
 src/tally.F90                            |   3 -
 tests/run_tests.py                       |   8 --
 tests/test_diff_tally/inputs_true.dat    |   2 +-
 tests/test_diff_tally/results_true.dat   | 168 +++++++++++------------
 tests/test_diff_tally/test_diff_tally.py |   2 +-
 tests/testing_harness.py                 |   4 -
 tests/travis.sh                          |   2 +-
 7 files changed, 87 insertions(+), 102 deletions(-)

diff --git a/src/tally.F90 b/src/tally.F90
index 503b6772b5..8aa6c4ef08 100644
--- a/src/tally.F90
+++ b/src/tally.F90
@@ -3416,7 +3416,6 @@ contains
               ! (1 / phi) * (d_phi / d_rho) = 1 / rho
               deriv % flux_deriv = deriv % flux_deriv &
                    + ONE / mat % density_gpcc
-              write(*, *) 'dens', deriv % flux_deriv
             end if
           end associate
 
@@ -3438,7 +3437,6 @@ contains
               ! (1 / phi) * (d_phi / d_N) = 1 / N
               deriv % flux_deriv = deriv % flux_deriv &
                    + ONE / mat % atom_density(j)
-              write(*, *) 'nucd', deriv % flux_deriv
             end if
           end associate
 
@@ -3465,7 +3463,6 @@ contains
                       deriv % flux_deriv = deriv % flux_deriv &
                            + dsigA / micro_xs(mat % nuclide(l)) % absorption
                     end select
-                    write(*, *) 'temp', deriv % flux_deriv
                   end if
                 end associate
               end do
diff --git a/tests/run_tests.py b/tests/run_tests.py
index a1a32a0b7c..28bedab0dc 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -38,8 +38,6 @@ parser.add_option("-u", "--update", action="store_true", dest="update",
 parser.add_option("-s", "--script", action="store_true", dest="script",
                   help="Activate CTest scripting mode for coverage, valgrind\
                         and dashboard capability.")
-parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
-                  help='Print all test results to stdout.')
 (options, args) = parser.parse_args()
 
 # Default compiler paths
@@ -484,12 +482,6 @@ for key in iter(tests):
         logfilename = logfilename + '_{0}.log'.format(test.name)
         shutil.copy(logfile[0], logfilename)
 
-    # Print tests
-    if options.verbose:
-        if len(logfile) > 0:
-            with open(logfilename) as fh:
-                print(fh.read())
-
     # For coverage builds, use lcov to generate HTML output
     if test.coverage:
         if which('lcov') is None or which('genhtml') is None:
diff --git a/tests/test_diff_tally/inputs_true.dat b/tests/test_diff_tally/inputs_true.dat
index 1739982016..a82c8bca86 100644
--- a/tests/test_diff_tally/inputs_true.dat
+++ b/tests/test_diff_tally/inputs_true.dat
@@ -1 +1 @@
-6e7d555be9bb40c372932d6b60f06c2dc2bf4076c6aabd1fce64d98fdbda47aaabf155aee6830730e1c6fbae21e84c961d36ef18da652d43c0f36111b3cd3b80
\ No newline at end of file
+58a47bc1cce52a90cb7d0ed5e8143fe0ac2a3208fb7b4c050647ab2c2f3486272250138b7e548b2bee912085b4a70d818833760e1f90e9ad6aa713caa12473bf
\ No newline at end of file
diff --git a/tests/test_diff_tally/results_true.dat b/tests/test_diff_tally/results_true.dat
index 7062ec2ba4..9342c5a0e4 100644
--- a/tests/test_diff_tally/results_true.dat
+++ b/tests/test_diff_tally/results_true.dat
@@ -1,128 +1,128 @@
 d_material,d_nuclide,d_variable,score,mean,std. dev.
-1,,density,nu-fission,-2.29e-02,1.60e-02
-1,,density,nu-fission,-2.93e-02,1.78e-02
-1,,density,nu-fission,-1.20e-01,3.66e-02
-1,,density,nu-fission,-1.25e-01,3.36e-02
+1,,density,nu-fission,1.05e-02,3.37e-03
+1,,density,nu-fission,8.74e-03,3.45e-03
+1,,density,nu-fission,1.30e-02,4.36e-03
+1,,density,nu-fission,8.97e-03,4.48e-03
 1,,density,nu-fission,0.00e+00,0.00e+00
 1,,density,nu-fission,0.00e+00,0.00e+00
 1,,density,nu-fission,0.00e+00,0.00e+00
 1,,density,nu-fission,0.00e+00,0.00e+00
-1,O16,nuclide_density,nu-fission,-2.09e+00,2.40e+00
-1,O16,nuclide_density,nu-fission,-6.76e+00,3.03e+00
+1,O16,nuclide_density,nu-fission,3.03e-01,4.44e-01
+1,O16,nuclide_density,nu-fission,4.94e-01,3.73e-01
 1,O16,nuclide_density,nu-fission,0.00e+00,0.00e+00
 1,O16,nuclide_density,nu-fission,0.00e+00,0.00e+00
-1,U235,nuclide_density,nu-fission,2.47e+02,9.53e+01
-1,U235,nuclide_density,nu-fission,2.24e+02,2.28e+02
+1,U235,nuclide_density,nu-fission,2.27e+02,1.86e+01
+1,U235,nuclide_density,nu-fission,5.37e+02,4.27e+01
 1,U235,nuclide_density,nu-fission,0.00e+00,0.00e+00
 1,U235,nuclide_density,nu-fission,0.00e+00,0.00e+00
-1,,temperature,nu-fission,-1.77e-04,2.70e-04
-1,,temperature,nu-fission,-4.43e-04,2.77e-04
+1,,temperature,nu-fission,1.69e-06,9.41e-06
+1,,temperature,nu-fission,-3.74e-05,1.96e-05
 1,,temperature,nu-fission,0.00e+00,0.00e+00
 1,,temperature,nu-fission,0.00e+00,0.00e+00
-3,,density,flux,-9.23e-01,6.00e+00
-3,,density,flux,6.27e+00,6.44e+00
-1,,density,flux,-1.17e+00,2.12e-01
-1,,density,flux,-4.74e-01,4.05e-01
-1,O16,nuclide_density,flux,-5.61e+01,2.63e+01
-1,O16,nuclide_density,flux,-2.83e+01,4.48e+01
-1,U235,nuclide_density,flux,-3.21e+03,1.25e+03
-1,U235,nuclide_density,flux,-2.20e+03,7.78e+02
-1,,temperature,flux,-2.31e-03,1.54e-03
-1,,temperature,flux,-9.64e-04,1.50e-03
-3,,density,total,3.69e-01,2.52e+00
-3,,density,absorption,3.58e-01,3.72e-01
-3,,density,fission,2.70e-01,1.75e-01
-3,,density,nu-fission,6.52e-01,4.28e-01
-3,,density,total,3.72e-01,2.30e-01
-3,,density,absorption,3.63e-01,2.08e-01
-3,,density,fission,2.93e-01,1.71e-01
-3,,density,nu-fission,7.12e-01,4.17e-01
-3,,density,total,2.70e+01,6.62e+00
-3,,density,absorption,4.95e-01,1.51e-01
+3,,density,flux,-7.17e+00,8.72e-01
+3,,density,flux,-1.43e+01,1.05e+00
+1,,density,flux,-3.06e-01,2.93e-02
+1,,density,flux,-2.98e-01,4.72e-02
+1,O16,nuclide_density,flux,-5.61e+00,1.02e+01
+1,O16,nuclide_density,flux,-3.41e-01,1.02e+01
+1,U235,nuclide_density,flux,-2.43e+03,1.53e+02
+1,U235,nuclide_density,flux,-2.36e+03,2.22e+02
+1,,temperature,flux,-1.35e-04,1.54e-04
+1,,temperature,flux,-1.94e-04,2.52e-04
+3,,density,total,-2.92e+00,3.41e-01
+3,,density,absorption,-1.20e-01,4.49e-02
+3,,density,fission,-1.06e-02,3.67e-02
+3,,density,nu-fission,-3.03e-02,8.97e-02
+3,,density,total,-3.40e-02,4.56e-02
+3,,density,absorption,-2.20e-03,4.26e-02
+3,,density,fission,3.33e-03,3.58e-02
+3,,density,nu-fission,7.83e-03,8.71e-02
+3,,density,total,6.37e+00,2.19e+00
+3,,density,absorption,1.18e-01,5.76e-02
 3,,density,fission,0.00e+00,0.00e+00
 3,,density,nu-fission,0.00e+00,0.00e+00
 3,,density,total,0.00e+00,0.00e+00
 3,,density,absorption,0.00e+00,0.00e+00
 3,,density,fission,0.00e+00,0.00e+00
 3,,density,nu-fission,0.00e+00,0.00e+00
-1,,density,total,-4.02e-02,7.34e-02
-1,,density,absorption,-9.92e-02,2.47e-02
-1,,density,fission,-5.73e-02,1.69e-02
-1,,density,nu-fission,-1.39e-01,4.11e-02
-1,,density,total,-7.20e-02,2.20e-02
-1,,density,absorption,-7.14e-02,2.11e-02
-1,,density,fission,-5.82e-02,1.71e-02
-1,,density,nu-fission,-1.42e-01,4.16e-02
-1,,density,total,-6.72e-01,5.72e-01
-1,,density,absorption,-1.44e-02,1.23e-02
+1,,density,total,4.23e-01,1.29e-02
+1,,density,absorption,2.07e-02,4.64e-03
+1,,density,fission,8.69e-03,2.42e-03
+1,,density,nu-fission,2.19e-02,5.91e-03
+1,,density,total,1.38e-02,2.91e-03
+1,,density,absorption,9.11e-03,2.82e-03
+1,,density,fission,6.72e-03,2.37e-03
+1,,density,nu-fission,1.64e-02,5.78e-03
+1,,density,total,-3.98e-01,8.90e-02
+1,,density,absorption,-8.83e-03,2.05e-03
 1,,density,fission,0.00e+00,0.00e+00
 1,,density,nu-fission,0.00e+00,0.00e+00
 1,,density,total,0.00e+00,0.00e+00
 1,,density,absorption,0.00e+00,0.00e+00
 1,,density,fission,0.00e+00,0.00e+00
 1,,density,nu-fission,0.00e+00,0.00e+00
-1,O16,nuclide_density,total,1.67e+01,1.41e+01
-1,O16,nuclide_density,absorption,-7.07e+00,3.32e+00
-1,O16,nuclide_density,fission,-3.84e+00,2.40e+00
-1,O16,nuclide_density,nu-fission,-9.42e+00,5.85e+00
-1,O16,nuclide_density,total,-4.67e+00,2.90e+00
-1,O16,nuclide_density,absorption,-4.33e+00,2.83e+00
-1,O16,nuclide_density,fission,-3.65e+00,2.42e+00
-1,O16,nuclide_density,nu-fission,-8.90e+00,5.90e+00
-1,O16,nuclide_density,total,-2.49e+01,6.00e+01
-1,O16,nuclide_density,absorption,-2.50e-01,9.96e-01
+1,O16,nuclide_density,total,4.60e+01,4.63e+00
+1,O16,nuclide_density,absorption,5.47e-01,6.81e-01
+1,O16,nuclide_density,fission,3.14e-01,3.63e-01
+1,O16,nuclide_density,nu-fission,7.49e-01,8.88e-01
+1,O16,nuclide_density,total,3.95e-01,4.83e-01
+1,O16,nuclide_density,absorption,4.18e-01,4.31e-01
+1,O16,nuclide_density,fission,3.50e-01,3.49e-01
+1,O16,nuclide_density,nu-fission,8.52e-01,8.51e-01
+1,O16,nuclide_density,total,6.03e+00,1.43e+01
+1,O16,nuclide_density,absorption,1.71e-01,2.75e-01
 1,O16,nuclide_density,fission,0.00e+00,0.00e+00
 1,O16,nuclide_density,nu-fission,0.00e+00,0.00e+00
 1,O16,nuclide_density,total,0.00e+00,0.00e+00
 1,O16,nuclide_density,absorption,0.00e+00,0.00e+00
 1,O16,nuclide_density,fission,0.00e+00,0.00e+00
 1,O16,nuclide_density,nu-fission,0.00e+00,0.00e+00
-1,U235,nuclide_density,total,-9.93e+02,6.71e+02
-1,U235,nuclide_density,absorption,8.10e+01,1.51e+02
-1,U235,nuclide_density,fission,2.19e+02,9.08e+01
-1,U235,nuclide_density,nu-fission,5.34e+02,2.21e+02
-1,U235,nuclide_density,total,4.09e+02,9.76e+01
-1,U235,nuclide_density,absorption,2.96e+02,9.63e+01
-1,U235,nuclide_density,fission,2.21e+02,9.10e+01
-1,U235,nuclide_density,nu-fission,5.40e+02,2.22e+02
-1,U235,nuclide_density,total,-4.43e+03,2.01e+03
-1,U235,nuclide_density,absorption,-1.09e+02,5.87e+01
+1,U235,nuclide_density,total,-5.91e+02,6.23e+01
+1,U235,nuclide_density,absorption,2.38e+02,1.22e+01
+1,U235,nuclide_density,fission,3.11e+02,8.54e+00
+1,U235,nuclide_density,nu-fission,7.59e+02,2.07e+01
+1,U235,nuclide_density,total,5.06e+02,1.04e+01
+1,U235,nuclide_density,absorption,3.90e+02,1.01e+01
+1,U235,nuclide_density,fission,3.11e+02,8.69e+00
+1,U235,nuclide_density,nu-fission,7.60e+02,2.11e+01
+1,U235,nuclide_density,total,-4.81e+03,2.90e+02
+1,U235,nuclide_density,absorption,-1.19e+02,5.73e+00
 1,U235,nuclide_density,fission,0.00e+00,0.00e+00
 1,U235,nuclide_density,nu-fission,0.00e+00,0.00e+00
 1,U235,nuclide_density,total,0.00e+00,0.00e+00
 1,U235,nuclide_density,absorption,0.00e+00,0.00e+00
 1,U235,nuclide_density,fission,0.00e+00,0.00e+00
 1,U235,nuclide_density,nu-fission,0.00e+00,0.00e+00
-1,,temperature,total,-1.18e-03,8.09e-04
-1,,temperature,absorption,-3.65e-04,1.78e-04
-1,,temperature,fission,-2.22e-04,1.10e-04
-1,,temperature,nu-fission,-5.41e-04,2.69e-04
-1,,temperature,total,-3.36e-04,1.85e-04
-1,,temperature,absorption,-3.17e-04,1.73e-04
-1,,temperature,fission,-2.22e-04,1.10e-04
-1,,temperature,nu-fission,-5.41e-04,2.69e-04
-1,,temperature,total,-1.94e-03,2.26e-03
-1,,temperature,absorption,-4.80e-05,4.10e-05
+1,,temperature,total,6.14e-05,7.41e-05
+1,,temperature,absorption,1.36e-05,1.81e-05
+1,,temperature,fission,-1.97e-05,7.53e-06
+1,,temperature,nu-fission,-4.80e-05,1.84e-05
+1,,temperature,total,-2.32e-05,1.07e-05
+1,,temperature,absorption,-2.22e-05,9.83e-06
+1,,temperature,fission,-1.97e-05,7.53e-06
+1,,temperature,nu-fission,-4.81e-05,1.84e-05
+1,,temperature,total,-2.92e-04,3.88e-04
+1,,temperature,absorption,-4.89e-06,7.21e-06
 1,,temperature,fission,0.00e+00,0.00e+00
 1,,temperature,nu-fission,0.00e+00,0.00e+00
 1,,temperature,total,0.00e+00,0.00e+00
 1,,temperature,absorption,0.00e+00,0.00e+00
 1,,temperature,fission,0.00e+00,0.00e+00
 1,,temperature,nu-fission,0.00e+00,0.00e+00
-3,,density,absorption,-3.13e-01,2.77e-01
-3,,density,absorption,7.16e-01,3.10e-01
-1,,density,absorption,-7.32e-02,1.62e-02
-1,,density,absorption,5.35e-03,7.84e-03
-1,O16,nuclide_density,absorption,-6.14e+00,4.05e+00
-1,O16,nuclide_density,absorption,1.12e+00,1.19e+00
-1,U235,nuclide_density,absorption,1.61e+02,1.81e+02
-1,U235,nuclide_density,absorption,-6.52e+01,3.42e+01
-1,,temperature,absorption,-4.02e-04,2.28e-04
-1,,temperature,absorption,-1.41e-06,3.96e-06
-3,,density,nu-fission,1.23e-01,1.54e-01
-3,,density,nu-fission,1.23e-01,1.54e-01
-3,,density,nu-fission,-3.86e-01,2.25e-01
-3,,density,nu-fission,-3.78e-01,2.19e-01
+3,,density,absorption,-1.21e-01,6.43e-02
+3,,density,absorption,1.74e-01,6.67e-02
+1,,density,absorption,2.06e-02,3.05e-03
+1,,density,absorption,-9.56e-03,1.86e-03
+1,O16,nuclide_density,absorption,2.49e-01,6.73e-01
+1,O16,nuclide_density,absorption,2.89e-02,1.36e-01
+1,U235,nuclide_density,absorption,2.42e+02,1.74e+01
+1,U235,nuclide_density,absorption,-1.12e+02,1.48e+01
+1,,temperature,absorption,-5.27e-06,2.03e-05
+1,,temperature,absorption,-8.73e-06,7.87e-06
+3,,density,nu-fission,-2.62e-02,9.06e-02
+3,,density,nu-fission,-1.80e-02,8.91e-02
+3,,density,nu-fission,-3.13e-02,9.12e-02
+3,,density,nu-fission,-6.37e-03,9.48e-02
 3,,density,nu-fission,0.00e+00,0.00e+00
 3,,density,nu-fission,0.00e+00,0.00e+00
 3,,density,nu-fission,0.00e+00,0.00e+00
diff --git a/tests/test_diff_tally/test_diff_tally.py b/tests/test_diff_tally/test_diff_tally.py
index 17774e4002..ce5b4a68ef 100644
--- a/tests/test_diff_tally/test_diff_tally.py
+++ b/tests/test_diff_tally/test_diff_tally.py
@@ -22,7 +22,7 @@ class DiffTallyTestHarness(PyAPITestHarness):
         # Set settings explicitly
         self._input_set.settings.batches = 5
         self._input_set.settings.inactive = 0
-        self._input_set.settings.particles = 10
+        self._input_set.settings.particles = 400
         self._input_set.settings.source = openmc.Source(space=openmc.stats.Box(
             [-160, -160, -183], [160, 160, 183]))
         self._input_set.settings.temperature['multipole'] = True
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 9aa7b55662..150d124c8c 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -129,10 +129,6 @@ class TestHarness(object):
         compare = filecmp.cmp('results_test.dat', 'results_true.dat')
         if not compare:
             os.rename('results_test.dat', 'results_error.dat')
-            with open('results_error.dat') as fh: print(fh.read())
-            from subprocess import Popen
-            p = Popen(('diff', 'results_error.dat', 'results_true.dat'))
-            p.wait()
         assert compare, 'Results do not agree.'
 
     def _cleanup(self):
diff --git a/tests/travis.sh b/tests/travis.sh
index 3dd3e5e662..443e951cc9 100755
--- a/tests/travis.sh
+++ b/tests/travis.sh
@@ -5,7 +5,7 @@ set -ev
 # Run all debug tests
 ./check_source.py
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  ./run_tests.py -C "^hdf5-debug$|^omp-hdf5-debug|^mpi-hdf5-debug|^phdf5-debug$|^phdf5-omp-debug$" -j 2 -s -R "diff" -v
+  ./run_tests.py -C "^hdf5-debug$|^omp-hdf5-debug|^mpi-hdf5-debug|^phdf5-debug$|^phdf5-omp-debug$" -j 2 -s
 else
   ./run_tests.py -C "^hdf5-debug$" -j 2
 fi