From cf59208f349a875102d414357e5f7da4ce49b3e5 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 19 Jul 2016 21:41:41 -0500 Subject: [PATCH] Rename openmc.data.container to openmc.data.function --- openmc/data/__init__.py | 2 +- openmc/data/angle_distribution.py | 2 +- openmc/data/correlated.py | 2 +- openmc/data/energy_distribution.py | 2 +- openmc/data/{container.py => function.py} | 0 openmc/data/kalbach_mann.py | 2 +- openmc/data/neutron.py | 2 +- openmc/data/product.py | 2 +- openmc/data/reaction.py | 2 +- openmc/data/thermal.py | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename openmc/data/{container.py => function.py} (100%) diff --git a/openmc/data/__init__.py b/openmc/data/__init__.py index c6a1baf9df..ae8ea8191f 100644 --- a/openmc/data/__init__.py +++ b/openmc/data/__init__.py @@ -3,7 +3,7 @@ from .neutron import * from .reaction import * from .ace import * from .angle_distribution import * -from .container import * +from .function import * from .energy_distribution import * from .product import * from .angle_energy import * diff --git a/openmc/data/angle_distribution.py b/openmc/data/angle_distribution.py index 709be84962..316559c50d 100644 --- a/openmc/data/angle_distribution.py +++ b/openmc/data/angle_distribution.py @@ -5,7 +5,7 @@ import numpy as np import openmc.checkvalue as cv from openmc.stats import Univariate, Tabular, Uniform -from .container import INTERPOLATION_SCHEME +from .function import INTERPOLATION_SCHEME class AngleDistribution(object): diff --git a/openmc/data/correlated.py b/openmc/data/correlated.py index 45ad42ced7..97a96c17c1 100644 --- a/openmc/data/correlated.py +++ b/openmc/data/correlated.py @@ -6,7 +6,7 @@ import numpy as np import openmc.checkvalue as cv from openmc.stats import Tabular, Univariate, Discrete, Mixture, Uniform -from .container import INTERPOLATION_SCHEME +from .function import INTERPOLATION_SCHEME from .angle_energy import AngleEnergy diff --git a/openmc/data/energy_distribution.py b/openmc/data/energy_distribution.py index a82a6c64a0..677d31af2d 100644 --- a/openmc/data/energy_distribution.py +++ b/openmc/data/energy_distribution.py @@ -5,7 +5,7 @@ from warnings import warn import numpy as np -from openmc.data.container import Tabulated1D, INTERPOLATION_SCHEME +from .function import Tabulated1D, INTERPOLATION_SCHEME from openmc.stats.univariate import Univariate, Tabular, Discrete, Mixture import openmc.checkvalue as cv diff --git a/openmc/data/container.py b/openmc/data/function.py similarity index 100% rename from openmc/data/container.py rename to openmc/data/function.py diff --git a/openmc/data/kalbach_mann.py b/openmc/data/kalbach_mann.py index 5a5dc073cc..5aca17ba9f 100644 --- a/openmc/data/kalbach_mann.py +++ b/openmc/data/kalbach_mann.py @@ -6,7 +6,7 @@ import numpy as np import openmc.checkvalue as cv from openmc.stats import Tabular, Univariate, Discrete, Mixture -from .container import Tabulated1D, INTERPOLATION_SCHEME +from .function import Tabulated1D, INTERPOLATION_SCHEME from .angle_energy import AngleEnergy diff --git a/openmc/data/neutron.py b/openmc/data/neutron.py index d9d8222316..94e1b2aad5 100644 --- a/openmc/data/neutron.py +++ b/openmc/data/neutron.py @@ -8,7 +8,7 @@ import h5py from . import atomic_symbol from .ace import Table, get_table -from .container import Tabulated1D +from .function import Tabulated1D from .product import Product from .reaction import Reaction, _get_photon_products from .urr import ProbabilityTables diff --git a/openmc/data/product.py b/openmc/data/product.py index 6a331dc243..dd276daac3 100644 --- a/openmc/data/product.py +++ b/openmc/data/product.py @@ -6,7 +6,7 @@ import numpy as np from numpy.polynomial.polynomial import Polynomial import openmc.checkvalue as cv -from .container import Tabulated1D +from .function import Tabulated1D from .angle_energy import AngleEnergy if sys.version_info[0] >= 3: diff --git a/openmc/data/reaction.py b/openmc/data/reaction.py index 53d399b6ee..0692982161 100644 --- a/openmc/data/reaction.py +++ b/openmc/data/reaction.py @@ -11,7 +11,7 @@ import openmc.checkvalue as cv from openmc.stats import Uniform from .angle_distribution import AngleDistribution from .angle_energy import AngleEnergy -from .container import Tabulated1D +from .function import Tabulated1D from .data import reaction_name from .product import Product from .uncorrelated import UncorrelatedAngleEnergy diff --git a/openmc/data/thermal.py b/openmc/data/thermal.py index 8cad814177..158ce39853 100644 --- a/openmc/data/thermal.py +++ b/openmc/data/thermal.py @@ -9,7 +9,7 @@ import h5py import openmc.checkvalue as cv from .ace import Table, get_table from .angle_energy import AngleEnergy -from .container import Tabulated1D +from .function import Tabulated1D from .correlated import CorrelatedAngleEnergy from openmc.stats import Discrete, Tabular