Merge branch 'develop' into documentation

Author: gridley

.travis.yml

@@ -15,6 +15,8 @@ notifications:
   webhooks: https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN
 matrix:
   include:
+    - python: "3.10"
+      env: OMP=n MPI=n
     - python: "3.6"
       env: OMP=n MPI=n
     - python: "3.6"

LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2012-2023 Massachusetts Institute of Technology 
+and OpenMOC contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.rst

@@ -70,7 +70,7 @@ Please cite OpenMOC in your publications if it helps your research:
 License
 -------
 
-OpenMOC is approved for distribution under the MIT/X license_.
+OpenMOC is approved for distribution under the MIT license_.
 
 .. _installation instructions: https://mit-crpg.github.io/OpenMOC/usersguide/install.html
 .. _license: https://mit-crpg.github.io/OpenMOC/license.html

docs/source/license.rst

@@ -4,7 +4,7 @@
 License Agreement
 =================
 
-Copyright © 2012-2019 Massachusetts Institute of Technology
+Copyright © 2012-2023 Massachusetts Institute of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

openmoc/checkvalue.py

@@ -16,6 +16,11 @@
 else:
     from openmoc.log import *
 
+if sys.version_info >= (3, 3):
+    from collections.abc import Iterable
+else:
+    from collections import Iterable
+
 
 def _isinstance(value, expected_type):
     """A Numpy-aware replacement for isinstance
@@ -206,7 +211,7 @@ def check_value(name, value, accepted_values):
     ----------
     name : str
         Description of value being checked
-    value : collections.Iterable
+    value : Iterable
         Object to check
     accepted_values : collections.Container
         Container of acceptable values

openmoc/materialize.py

@@ -761,7 +761,7 @@ def compute_sph_factors(mgxs_lib, max_sph_iters=30, sph_tol=1E-5,
         solver.resetFixedSources()
 
     # Collect SPH factors for each FSR, energy group
-    fsrs_to_sph = np.ones((num_fsrs, num_groups), dtype=np.float)
+    fsrs_to_sph = np.ones((num_fsrs, num_groups), dtype=np.float64)
     for i, openmc_domain in enumerate(mgxs_lib.domains):
         if openmc_domain.id in openmoc_domains:
             if openmc_domain.id in sph_domains:

openmoc/plotter.py

@@ -1,19 +1,23 @@
 import os
 import sys
 from numbers import Integral, Real
-
 try:
     from collections import Iterable
 except ImportError: # changed in python 3.3
     from collections.abc import Iterable
-
 import warnings
 
 import numpy as np
 import numpy.random
 import matplotlib
 from mpl_toolkits.mplot3d import Axes3D
 
+# For Python 3.3.X and above
+if sys.version_info >= (3, 3):
+    from collections.abc import Iterable
+else:
+    from collections import Iterable
+
 # Force headless backend for plotting on clusters
 if "DISPLAY" not in os.environ:
     matplotlib.use('Agg')
@@ -609,7 +613,7 @@ def plot_flat_source_regions(geometry, gridsize=250, xlim=None, ylim=None,
         if centroids:
 
             # Populate a NumPy array with the FSR centroid coordinates
-            centroids = np.zeros((num_fsrs, 2), dtype=np.float)
+            centroids = np.zeros((num_fsrs, 2), dtype=np.float64)
             for fsr_id in range(num_fsrs):
                 coords = geometry.getGlobalFSRCentroidData(fsr_id)
                 if plane == 'xy':
@@ -952,7 +956,7 @@ def plot_energy_fluxes(solver, fsrs, group_bounds=None, norm=True,
     for fsr in fsrs:
 
         # Allocate memory for an array of this FSR's fluxes
-        fluxes = np.zeros(num_groups, dtype=np.float)
+        fluxes = np.zeros(num_groups, dtype=np.float64)
 
         # Extract the flux in each energy group
         for group in range(num_groups):
@@ -1317,7 +1321,7 @@ def plot_spatial_data(domains_to_data, plot_params, get_figure=False):
             surface = domains_to_data.take(domains.flatten())
         # If domains-to-data was input as a Python dictionary
         else:
-            surface = np.zeros(domains.shape, dtype=np.float)
+            surface = np.zeros(domains.shape, dtype=np.float64)
             for domain_id in domains_to_data:
                 indices = np.where(domains == domain_id)
                 surface[indices] = domains_to_data[domain_id]
@@ -1947,7 +1951,7 @@ def _get_pil_image(array, plot_params):
     from PIL import Image
 
     # Convert array to a normalized array of floating point values
-    float_array = np.zeros(array.shape, dtype=np.float)
+    float_array = np.zeros(array.shape, dtype=np.float64)
     float_array[:,:] = array[:,:]
     float_array[:,:] /= np.max(float_array)
 

openmoc/process.py

@@ -6,12 +6,10 @@
 import datetime
 import operator
 from numbers import Integral, Real
-
 try:
     from collections import Iterable
 except ImportError: # changed in python 3.3
     from collections.abc import Iterable
-
 import pickle
 
 import numpy as np
@@ -28,6 +26,11 @@
     from openmoc.log import *
     import openmoc.checkvalue as cv
 
+if sys.version_info >= (3, 3):
+    from collections.abc import Iterable
+else:
+    from collections import Iterable
+
 # Store viable OpenMOC solver types for type checking
 solver_types = (openmoc.Solver,)
 # Store implemented reaction types for value checking
@@ -994,7 +997,7 @@ def tally_fission_rates(self, solver, volume='integrated', nu=False):
             solver.computeFSRFissionRates(int(geometry.getNumTotalFSRs()), nu)
 
         # Initialize a 2D or 3D NumPy array in which to tally
-        tally = np.zeros(tuple(self.dimension), dtype=np.float)
+        tally = np.zeros(tuple(self.dimension), dtype=np.float64)
 
         # Tally the fission rates in each FSR to the corresponding mesh cell
         for fsr in range(num_fsrs):
@@ -1117,7 +1120,7 @@ def tally_on_mesh(self, solver, domains_to_coeffs, domain_type='fsr',
 
         # Initialize a 2D or 3D NumPy array in which to tally
         tally_shape = tuple(self.dimension) + (num_groups,)
-        tally = np.zeros(tally_shape, dtype=np.float)
+        tally = np.zeros(tally_shape, dtype=np.float64)
 
         # Compute product of fluxes with domains-to-coeffs mapping by group, FSR
         for fsr in range(num_fsrs):
@@ -1128,7 +1131,7 @@ def tally_on_mesh(self, solver, domains_to_coeffs, domain_type='fsr',
                 continue
 
             volume = solver.getFSRVolume(fsr)
-            fsr_tally = np.zeros(num_groups, dtype=np.float)
+            fsr_tally = np.zeros(num_groups, dtype=np.float64)
 
             # Determine domain ID (material, cell or FSR) for this FSR
             if domain_type == 'fsr':

sample-input/sph-factors/slab/sph-factors.py

@@ -86,8 +86,8 @@
 # Allocate arrays for FSR-specific data to extract from OpenMOC model
 num_fsrs = openmoc_geometry.getNumFSRs()
 cell_ids = np.zeros(num_fsrs, dtype=np.int)
-centroids = np.zeros(num_fsrs, dtype=np.float)
-volumes = np.zeros(num_fsrs, dtype=np.float)
+centroids = np.zeros(num_fsrs, dtype=np.float64)
+volumes = np.zeros(num_fsrs, dtype=np.float64)
 
 # Find the cell IDs, volumes, centroids and fluxes for each FSR
 for fsr_id in range(num_fsrs):

src/CPUSolver.cpp

@@ -166,7 +166,7 @@ void CPUSolver::setNumThreads(int num_threads) {
  *          routine may be used as follows from within Python:
  *
  * @code
- *          fluxes = numpy.random.rand(num_FSRs * num_groups, dtype=np.float)
+ *          fluxes = numpy.random.rand(num_FSRs * num_groups, dtype=np.float64)
  *          solver.setFluxes(fluxes)
  * @endcode
  *

src/accel/cuda/GPUSolver.cu

@@ -1061,7 +1061,7 @@ void GPUSolver::setTrackGenerator(TrackGenerator* track_generator) {
  * @code
  *          num_FSRs = solver.getGeometry.getNumFSRs()
  *          NUM_GROUPS = solver.getGeometry.getNumEnergyGroups()
- *          fluxes = numpy.random.rand(num_FSRs * NUM_GROUPS, dtype=np.float)
+ *          fluxes = numpy.random.rand(num_FSRs * NUM_GROUPS, dtype=np.float64)
  *          solver.setFluxes(fluxes)
  * @endcode
  *