Redo 3D plots results with consistent FSR numbering, avoid deepcopy o…

…f SPH lib
mit-crpg · Jun 15, 2020 · 44896ff · 44896ff
1 parent 9de20b4
commit 44896ff
Show file tree

Hide file tree

Showing 33 changed files with 9 additions and 8 deletions.
diff --git a/tests/test_plot_3D_cmfd_cells/true-0.png b/tests/test_plot_3D_cmfd_cells/true-0.png
diff --git a/tests/test_plot_3D_fission_rates/true-0.png b/tests/test_plot_3D_fission_rates/true-0.png
diff --git a/tests/test_plot_3D_fission_rates/true-1.png b/tests/test_plot_3D_fission_rates/true-1.png
diff --git a/tests/test_plot_3D_fission_rates/true-2.png b/tests/test_plot_3D_fission_rates/true-2.png
diff --git a/tests/test_plot_3D_fission_rates/true-3.png b/tests/test_plot_3D_fission_rates/true-3.png
diff --git a/tests/test_plot_3D_fsrs/true-0.png b/tests/test_plot_3D_fsrs/true-0.png
diff --git a/tests/test_plot_3D_fsrs/true-1.png b/tests/test_plot_3D_fsrs/true-1.png
diff --git a/tests/test_plot_3D_fsrs/true-2.png b/tests/test_plot_3D_fsrs/true-2.png
diff --git a/tests/test_plot_3D_fsrs/true-3.png b/tests/test_plot_3D_fsrs/true-3.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-0.png b/tests/test_plot_3D_spatial_fluxes/true-0.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-1.png b/tests/test_plot_3D_spatial_fluxes/true-1.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-10.png b/tests/test_plot_3D_spatial_fluxes/true-10.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-11.png b/tests/test_plot_3D_spatial_fluxes/true-11.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-12.png b/tests/test_plot_3D_spatial_fluxes/true-12.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-13.png b/tests/test_plot_3D_spatial_fluxes/true-13.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-14.png b/tests/test_plot_3D_spatial_fluxes/true-14.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-15.png b/tests/test_plot_3D_spatial_fluxes/true-15.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-16.png b/tests/test_plot_3D_spatial_fluxes/true-16.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-17.png b/tests/test_plot_3D_spatial_fluxes/true-17.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-18.png b/tests/test_plot_3D_spatial_fluxes/true-18.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-19.png b/tests/test_plot_3D_spatial_fluxes/true-19.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-2.png b/tests/test_plot_3D_spatial_fluxes/true-2.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-3.png b/tests/test_plot_3D_spatial_fluxes/true-3.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-4.png b/tests/test_plot_3D_spatial_fluxes/true-4.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-5.png b/tests/test_plot_3D_spatial_fluxes/true-5.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-6.png b/tests/test_plot_3D_spatial_fluxes/true-6.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-7.png b/tests/test_plot_3D_spatial_fluxes/true-7.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-8.png b/tests/test_plot_3D_spatial_fluxes/true-8.png
diff --git a/tests/test_plot_3D_spatial_fluxes/true-9.png b/tests/test_plot_3D_spatial_fluxes/true-9.png
diff --git a/tests/test_plot_3D_tracks/true-0.png b/tests/test_plot_3D_tracks/true-0.png
diff --git a/tests/test_superhomogenization_cell/test_superhomogenization_cell.py b/tests/test_superhomogenization_cell/test_superhomogenization_cell.py
@@ -74,7 +74,8 @@ def _run_openmoc(self):
                 mgxs_lib, azim_spacing=self.azim_spacing,
                 num_azim=self.num_azim, num_threads=self.num_threads,
                 solver=self.solver, track_generator=track_generator,
-                geometry=openmoc_geometry, sph_domains=sph_domains)
+                geometry=openmoc_geometry, sph_domains=sph_domains,
+                return_library=False)
 
     def _get_results(self, num_iters=True, keff=True, fluxes=True,
                      num_fsrs=False, num_tracks=False, num_segments=False,

diff --git a/tests/testing_harness.py b/tests/testing_harness.py
@@ -380,12 +380,12 @@ def _compare_images(self, img1, img2):
         rgba2 = np.array(img2)
 
         # Compute histograms of each images pixels
-        hr1, bins1 = np.histogram(rgba1[...,0], bins=256, normed=True)
-        hg1, bins1 = np.histogram(rgba1[...,1], bins=256, normed=True)
-        hb1, bins1 = np.histogram(rgba1[...,2], bins=256, normed=True)
-        hr2, bins2 = np.histogram(rgba2[...,0], bins=256, normed=True)
-        hg2, bins2 = np.histogram(rgba2[...,1], bins=256, normed=True)
-        hb2, bins2 = np.histogram(rgba2[...,2], bins=256, normed=True)
+        hr1, bins1 = np.histogram(rgba1[...,0], bins=256, density=True)
+        hg1, bins1 = np.histogram(rgba1[...,1], bins=256, density=True)
+        hb1, bins1 = np.histogram(rgba1[...,2], bins=256, density=True)
+        hr2, bins2 = np.histogram(rgba2[...,0], bins=256, density=True)
+        hg2, bins2 = np.histogram(rgba2[...,1], bins=256, density=True)
+        hb2, bins2 = np.histogram(rgba2[...,2], bins=256, density=True)
         hist1 = np.array([hr1, hg1, hb1]).ravel()
         hist2 = np.array([hr2, hg2, hb2]).ravel()
 

diff --git a/tests/travis.sh b/tests/travis.sh
@@ -3,4 +3,4 @@
 set -ev
 
 # Run all tests
-./run_tests.py --coverage --verbose
+./run_tests.py --coverage