From 806367c124dcab180cdc056e3ff69c5adaf6bfd1 Mon Sep 17 00:00:00 2001 From: cpf Date: Fri, 6 May 2022 10:19:16 +0200 Subject: [PATCH 01/24] Uniform distribution of cos(theta) in SphericalIndependent --- src/distribution_spatial.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/distribution_spatial.cpp b/src/distribution_spatial.cpp index 66430ddff..6a15992e1 100644 --- a/src/distribution_spatial.cpp +++ b/src/distribution_spatial.cpp @@ -172,10 +172,14 @@ Position SphericalIndependent::sample(uint64_t* seed) const { double r = r_->sample(seed); double theta = theta_->sample(seed); + // To distribute the points uniformly in the sphere, we must ensure that + // cos(theta) and not theta is uniformly distributed. + // This is done with theta_cos. + double theta_cos = std::acos((theta / (0.5 * PI)) - 1); double phi = phi_->sample(seed); - double x = r * sin(theta) * cos(phi) + origin_.x; - double y = r * sin(theta) * sin(phi) + origin_.y; - double z = r * cos(theta) + origin_.z; + double x = r * sin(theta_cos) * cos(phi) + origin_.x; + double y = r * sin(theta_cos) * sin(phi) + origin_.y; + double z = r * cos(theta_cos) + origin_.z; return {x, y, z}; } From 021215a2b9fc9194cf42dc152e7ca6246fac3c87 Mon Sep 17 00:00:00 2001 From: cpf Date: Mon, 9 May 2022 20:03:28 +0200 Subject: [PATCH 02/24] included paulromanos suggestions --- docs/source/io_formats/settings.rst | 7 ++++--- openmc/stats/multivariate.py | 24 ++++++++++++------------ src/distribution_spatial.cpp | 25 +++++++++++-------------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst index d2c15c56f..a5cf36ece 100644 --- a/docs/source/io_formats/settings.rst +++ b/docs/source/io_formats/settings.rst @@ -490,9 +490,10 @@ attributes/sub-elements: independent distributions of r-, phi-, and z-coordinates where phi is the azimuthal angle and the origin for the cylindrical coordinate system is specified by origin. A "spherical" spatial distribution specifies - independent distributions of r-, theta-, and phi-coordinates where theta - is the angle with respect to the z-axis, phi is the azimuthal angle, and - the sphere is centered on the coordinate (x0,y0,z0). + independent distributions of r-, cos_theta-, and phi-coordinates where + cos_theta is the cosinus of the angle with respect to the z-axis, phi is + the azimuthal angle, and the sphere is centered on the coordinate + (x0,y0,z0). *Default*: None diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 8635bcd71..c1de22bb6 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -399,9 +399,9 @@ class SphericalIndependent(Spatial): ---------- r : openmc.stats.Univariate Distribution of r-coordinates in the local reference frame - theta : openmc.stats.Univariate - Distribution of theta-coordinates (angle relative to the z-axis) in the - local reference frame + cos_theta : openmc.stats.Univariate + Distribution of the cosinus of the theta-coordinates (angle relative to + the z-axis) in the local reference frame phi : openmc.stats.Univariate Distribution of phi-coordinates (azimuthal angle) in the local reference frame @@ -411,9 +411,9 @@ class SphericalIndependent(Spatial): """ - def __init__(self, r, theta, phi, origin=(0.0, 0.0, 0.0)): + def __init__(self, r, cos_theta, phi, origin=(0.0, 0.0, 0.0)): self.r = r - self.theta = theta + self.cos_theta = cos_theta self.phi = phi self.origin = origin @@ -422,8 +422,8 @@ class SphericalIndependent(Spatial): return self._r @property - def theta(self): - return self._theta + def cos_theta(self): + return self._cos_theta @property def phi(self): @@ -438,10 +438,10 @@ class SphericalIndependent(Spatial): cv.check_type('r coordinate', r, Univariate) self._r = r - @theta.setter - def theta(self, theta): - cv.check_type('theta coordinate', theta, Univariate) - self._theta = theta + @cos_theta.setter + def cos_theta(self, cos_theta): + cv.check_type('cos_theta coordinate', cos_theta, Univariate) + self._cos_theta = cos_theta @phi.setter def phi(self, phi): @@ -466,7 +466,7 @@ class SphericalIndependent(Spatial): element = ET.Element('space') element.set('type', 'spherical') element.append(self.r.to_xml_element('r')) - element.append(self.theta.to_xml_element('theta')) + element.append(self.cos_theta.to_xml_element('cos_theta')) element.append(self.phi.to_xml_element('phi')) element.set("origin", ' '.join(map(str, self.origin))) return element diff --git a/src/distribution_spatial.cpp b/src/distribution_spatial.cpp index 6a15992e1..2542842c3 100644 --- a/src/distribution_spatial.cpp +++ b/src/distribution_spatial.cpp @@ -132,15 +132,15 @@ SphericalIndependent::SphericalIndependent(pugi::xml_node node) r_ = make_unique(x, p, 1); } - // Read distribution for theta-coordinate - if (check_for_node(node, "theta")) { - pugi::xml_node node_dist = node.child("theta"); - theta_ = distribution_from_xml(node_dist); + // Read distribution for cos_theta-coordinate + if (check_for_node(node, "cos_theta")) { + pugi::xml_node node_dist = node.child("cos_theta"); + cos_theta_ = distribution_from_xml(node_dist); } else { - // If no distribution was specified, default to a single point at theta=0 + // If no distribution was specified, default to a single point at cos_theta=0 double x[] {0.0}; double p[] {1.0}; - theta_ = make_unique(x, p, 1); + cos_theta_ = make_unique(x, p, 1); } // Read distribution for phi-coordinate @@ -171,15 +171,12 @@ SphericalIndependent::SphericalIndependent(pugi::xml_node node) Position SphericalIndependent::sample(uint64_t* seed) const { double r = r_->sample(seed); - double theta = theta_->sample(seed); - // To distribute the points uniformly in the sphere, we must ensure that - // cos(theta) and not theta is uniformly distributed. - // This is done with theta_cos. - double theta_cos = std::acos((theta / (0.5 * PI)) - 1); + double cos_theta = cos_theta_->sample(seed); double phi = phi_->sample(seed); - double x = r * sin(theta_cos) * cos(phi) + origin_.x; - double y = r * sin(theta_cos) * sin(phi) + origin_.y; - double z = r * cos(theta_cos) + origin_.z; + // sin(theta) by sin**2 + cos**2 = 1 + double x = r * std::pow(1 - std::pow(cos_theta, 2.0), 0.5) * cos(phi) + origin_.x; + double y = r * std::pow(1 - std::pow(cos_theta, 2.0), 0.5) * sin(phi) + origin_.y; + double z = r * cos_theta + origin_.z; return {x, y, z}; } From b9b119bc736b3802ff947bc39f79e9ca37978d50 Mon Sep 17 00:00:00 2001 From: cpf Date: Mon, 9 May 2022 20:09:28 +0200 Subject: [PATCH 03/24] changed theta to cos_theta in .h file --- include/openmc/distribution_spatial.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/openmc/distribution_spatial.h b/include/openmc/distribution_spatial.h index 9cceee184..5e426b878 100644 --- a/include/openmc/distribution_spatial.h +++ b/include/openmc/distribution_spatial.h @@ -70,7 +70,7 @@ private: }; //============================================================================== -//! Distribution of points specified by spherical coordinates r,theta,phi +//! Distribution of points specified by spherical coordinates r,cos_theta,phi //============================================================================== class SphericalIndependent : public SpatialDistribution { @@ -83,15 +83,15 @@ public: Position sample(uint64_t* seed) const; Distribution* r() const { return r_.get(); } - Distribution* theta() const { return theta_.get(); } + Distribution* cos_theta() const { return cos_theta_.get(); } Distribution* phi() const { return phi_.get(); } Position origin() const { return origin_; } private: - UPtrDist r_; //!< Distribution of r coordinates - UPtrDist theta_; //!< Distribution of theta coordinates - UPtrDist phi_; //!< Distribution of phi coordinates - Position origin_; //!< Cartesian coordinates of the sphere center + UPtrDist r_; //!< Distribution of r coordinates + UPtrDist cos_theta_; //!< Distribution of cos_theta coordinates + UPtrDist phi_; //!< Distribution of phi coordinates + Position origin_; //!< Cartesian coordinates of the sphere center }; //============================================================================== From 31648dd1a28cc7d4c7859dc35c6be509ef795487 Mon Sep 17 00:00:00 2001 From: cpf Date: Mon, 9 May 2022 20:23:18 +0200 Subject: [PATCH 04/24] some more theta -> cos_theta --- openmc/stats/multivariate.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index c1de22bb6..53ff06ad9 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -375,8 +375,8 @@ class SphericalIndependent(Spatial): r"""Spatial distribution represented in spherical coordinates. This distribution allows one to specify coordinates whose :math:`r`, - :math:`\theta`, and :math:`\phi` components are sampled independently from - one another and centered on the coordinates (x0, y0, z0). + :math:`\cos_theta`, and :math:`\phi` components are sampled independently + from one another and centered on the coordinates (x0, y0, z0). .. versionadded: 0.12 @@ -385,9 +385,9 @@ class SphericalIndependent(Spatial): r : openmc.stats.Univariate Distribution of r-coordinates in a reference frame specified by the origin parameter - theta : openmc.stats.Univariate - Distribution of theta-coordinates (angle relative to the z-axis) in a - reference frame specified by the origin parameter + cos_theta : openmc.stats.Univariate + Distribution of the cosinus of the theta-coordinates (angle relative to + the z-axis) in a reference frame specified by the origin parameter phi : openmc.stats.Univariate Distribution of phi-coordinates (azimuthal angle) in a reference frame specified by the origin parameter @@ -487,10 +487,10 @@ class SphericalIndependent(Spatial): """ r = Univariate.from_xml_element(elem.find('r')) - theta = Univariate.from_xml_element(elem.find('theta')) + cos_theta = Univariate.from_xml_element(elem.find('cos_theta')) phi = Univariate.from_xml_element(elem.find('phi')) origin = [float(x) for x in elem.get('origin').split()] - return cls(r, theta, phi, origin=origin) + return cls(r, cos_theta, phi, origin=origin) class CylindricalIndependent(Spatial): From 8ec37d80d22d4d8ea1fc25caa29c96086397cf46 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Tue, 10 May 2022 09:17:01 +0200 Subject: [PATCH 05/24] Update docs/source/io_formats/settings.rst Co-authored-by: Paul Romano --- docs/source/io_formats/settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst index a5cf36ece..1a8f63716 100644 --- a/docs/source/io_formats/settings.rst +++ b/docs/source/io_formats/settings.rst @@ -491,7 +491,7 @@ attributes/sub-elements: azimuthal angle and the origin for the cylindrical coordinate system is specified by origin. A "spherical" spatial distribution specifies independent distributions of r-, cos_theta-, and phi-coordinates where - cos_theta is the cosinus of the angle with respect to the z-axis, phi is + cos_theta is the cosine of the angle with respect to the z-axis, phi is the azimuthal angle, and the sphere is centered on the coordinate (x0,y0,z0). From 6ba42d2cc436d6ee285c1a2a12fcf12971bbbbb4 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Tue, 10 May 2022 09:17:23 +0200 Subject: [PATCH 06/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 53ff06ad9..e0de89a56 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -386,7 +386,7 @@ class SphericalIndependent(Spatial): Distribution of r-coordinates in a reference frame specified by the origin parameter cos_theta : openmc.stats.Univariate - Distribution of the cosinus of the theta-coordinates (angle relative to + Distribution of the cosine of the theta-coordinates (angle relative to the z-axis) in a reference frame specified by the origin parameter phi : openmc.stats.Univariate Distribution of phi-coordinates (azimuthal angle) in a reference frame From 06d85de2c32ff8581e41e9251d022242ed217025 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Tue, 10 May 2022 09:17:34 +0200 Subject: [PATCH 07/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index e0de89a56..42cbc74c6 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -375,7 +375,7 @@ class SphericalIndependent(Spatial): r"""Spatial distribution represented in spherical coordinates. This distribution allows one to specify coordinates whose :math:`r`, - :math:`\cos_theta`, and :math:`\phi` components are sampled independently + :math:`\theta`, and :math:`\phi` components are sampled independently from one another and centered on the coordinates (x0, y0, z0). .. versionadded: 0.12 From 31ebeb13275868c085e599eac4d22a0afe4826aa Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Tue, 10 May 2022 09:17:40 +0200 Subject: [PATCH 08/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 42cbc74c6..6c41bfbbd 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -400,7 +400,7 @@ class SphericalIndependent(Spatial): r : openmc.stats.Univariate Distribution of r-coordinates in the local reference frame cos_theta : openmc.stats.Univariate - Distribution of the cosinus of the theta-coordinates (angle relative to + Distribution of the cosine of the theta-coordinates (angle relative to the z-axis) in the local reference frame phi : openmc.stats.Univariate Distribution of phi-coordinates (azimuthal angle) in the local From 9073aa5f72998ea40e137ccaa3a236f789866662 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Tue, 10 May 2022 09:17:50 +0200 Subject: [PATCH 09/24] Update src/distribution_spatial.cpp Co-authored-by: Paul Romano --- src/distribution_spatial.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/distribution_spatial.cpp b/src/distribution_spatial.cpp index 2542842c3..a06f84d80 100644 --- a/src/distribution_spatial.cpp +++ b/src/distribution_spatial.cpp @@ -174,8 +174,8 @@ Position SphericalIndependent::sample(uint64_t* seed) const double cos_theta = cos_theta_->sample(seed); double phi = phi_->sample(seed); // sin(theta) by sin**2 + cos**2 = 1 - double x = r * std::pow(1 - std::pow(cos_theta, 2.0), 0.5) * cos(phi) + origin_.x; - double y = r * std::pow(1 - std::pow(cos_theta, 2.0), 0.5) * sin(phi) + origin_.y; + double x = r * std::sqrt(1 - cos_theta * cos_theta) * cos(phi) + origin_.x; + double y = r * std::sqrt(1 - cos_theta * cos_theta) * sin(phi) + origin_.y; double z = r * cos_theta + origin_.z; return {x, y, z}; } From a8f1d476620fbf0ffec62ab33d6c50f6c3ea9829 Mon Sep 17 00:00:00 2001 From: cpf Date: Tue, 10 May 2022 15:40:37 +0200 Subject: [PATCH 10/24] added a spherical source as a helping class --- openmc/stats/multivariate.py | 139 ++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 3 deletions(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 6c41bfbbd..22b1a8bba 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -208,7 +208,6 @@ class Monodirectional(UnitSphere): """ - def __init__(self, reference_uvw=[1., 0., 0.]): super().__init__(reference_uvw) @@ -272,6 +271,8 @@ class Spatial(ABC): return SphericalIndependent.from_xml_element(elem) elif distribution == 'box' or distribution == 'fission': return Box.from_xml_element(elem) + elif distribution == 'sphericalshell': + return SphericalShell.from_xml_element(elem) elif distribution == 'point': return Point.from_xml_element(elem) @@ -375,7 +376,7 @@ class SphericalIndependent(Spatial): r"""Spatial distribution represented in spherical coordinates. This distribution allows one to specify coordinates whose :math:`r`, - :math:`\theta`, and :math:`\phi` components are sampled independently + :math:`\cos_theta`, and :math:`\phi` components are sampled independently from one another and centered on the coordinates (x0, y0, z0). .. versionadded: 0.12 @@ -640,7 +641,6 @@ class Box(Spatial): """ - def __init__(self, lower_left, upper_right, only_fissionable=False): self.lower_left = lower_left self.upper_right = upper_right @@ -779,3 +779,136 @@ class Point(Spatial): """ xyz = [float(x) for x in get_text(elem, 'parameters').split()] return cls(xyz) + + +class SphericalShell(Spatial): + r"""Spatial distribution for points in a spherical shell. + + This distribution is a helper that creates points uniformly distributed in + a spherical shell using the class SphericalIndependent. + + It allows one to sample points independly in a spherical shell, specified + by (r1, r2), (theta1, theta2), (phi1, phi2) centered on the coordinates + (x0, y0, z0). + + .. versionadded: 0.13 + + Parameters + ---------- + radii : Iterable of float + Inner radius r1 and outer radius r2 of the spherical shell. + thetas : Iterable of float + Start theta1 and end theta2 of the theta-coordinates (angle relative to + the z-axis) in a reference frame specified by the origin parameter + phis : Iterable of float + Start phi1 and end phi2 of the phi-coordinates (azimuthal angle) in a + reference frame specified by the origin parameter + origin: Iterable of float, optional + coordinates (x0, y0, z0) of the center of the spherical reference frame + for the source. Defaults to (0.0, 0.0, 0.0) + + Attributes + ---------- + radii : Iterable of float + Inner radius r1 and outer radius r2 of the spherical shell. + thetas : Iterable of float + Start theta1 and end theta2 of the theta-coordinates (angle relative to + the z-axis) in a reference frame specified by the origin parameter + phis : Iterable of float + Start phi1 and end phi2 of the phi-coordinates (azimuthal angle) in a + reference frame specified by the origin parameter + origin: Iterable of float, optional + coordinates (x0, y0, z0) of the center of the spherical reference frame + for the source. Defaults to (0.0, 0.0, 0.0) + + """ + + def __init__(self, radii, thetas, phis, origin=(0.0, 0.0, 0.0)): + self.radii = radii + self.thetas = thetas + self.phis = phis + self.origin = origin + + @property + def radii(self): + return self._radii + + @property + def thetas(self): + return self._thetas + + @property + def phis(self): + return self._phis + + @property + def origin(self): + return self._origin + + @radii.setter + def radii(self, radii): + cv.check_type('radii values', radii, Iterable, Real) + self._radii = radii + + @thetas.setter + def thetas(self, thetas): + cv.check_type('thetas values', thetas, Iterable, Real) + self._thetas = thetas + + @phis.setter + def phis(self, phis): + cv.check_type('phis values', phis, Iterable, Real) + self._phis = phis + + @origin.setter + def origin(self, origin): + cv.check_type('origin coordinates', origin, Iterable, Real) + origin = np.asarray(origin) + self._origin = origin + + def to_xml_element(self): + """Return XML representation of the spatial distribution + + Returns + ------- + element : xml.etree.ElementTree.Element + XML element containing spatial distribution data + + """ + element = ET.Element('space') + element.set('type', 'spherical') + sub_element_radii = ET.SubElement(element, 'r') + # the 2.0 is necessary to define the radius in the power law + sub_element_radii.set('parameters', ' '.join(map(str, self.radii))+' 2.0') + sub_element_radii.set('type', 'powerlaw') + sub_element_thetas = ET.SubElement(element, 'cos_theta') + # the sphericalIndependent class takes the arccos of theta + cos_thetas = np.cos(self.thetas) + sub_element_thetas.set('parameters', ' '.join(map(str, cos_thetas))) + sub_element_thetas.set('type', 'uniform') + sub_element_phis = ET.SubElement(element, 'phi') + sub_element_phis.set('parameters', ' '.join(map(str, self.phis))) + sub_element_phis.set('type', 'uniform') + element.set('origin', ' '.join(map(str, self.origin))) + return element + + @classmethod + def from_xml_element(cls, elem): + """Generate spatial distribution from an XML element + + Parameters + ---------- + elem : xml.etree.ElementTree.Element + XML element + + Returns + ------- + openmc.stats.SphericalIndependent + Spatial distribution generated from XML element + + """ + r = Univariate.from_xml_element(elem.find('r')) + cos_theta = Univariate.from_xml_element(elem.find('cos_theta')) + phi = Univariate.from_xml_element(elem.find('phi')) + origin = [float(x) for x in elem.get('origin').split()] + return cls(r, cos_theta, phi, origin=origin) From 0ba342c88475300998542266f66476e49f420321 Mon Sep 17 00:00:00 2001 From: cpf Date: Fri, 13 May 2022 21:14:44 +0200 Subject: [PATCH 11/24] Define function spherical_uniform instead of class SphericalIndependent --- openmc/stats/multivariate.py | 121 +++-------------------------------- 1 file changed, 10 insertions(+), 111 deletions(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 22b1a8bba..67337f2d6 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -8,7 +8,7 @@ import numpy as np import openmc.checkvalue as cv from .._xml import get_text -from .univariate import Univariate, Uniform +from .univariate import Univariate, Uniform, PowerLaw class UnitSphere(ABC): @@ -271,8 +271,6 @@ class Spatial(ABC): return SphericalIndependent.from_xml_element(elem) elif distribution == 'box' or distribution == 'fission': return Box.from_xml_element(elem) - elif distribution == 'sphericalshell': - return SphericalShell.from_xml_element(elem) elif distribution == 'point': return Point.from_xml_element(elem) @@ -781,11 +779,11 @@ class Point(Spatial): return cls(xyz) -class SphericalShell(Spatial): - r"""Spatial distribution for points in a spherical shell. - - This distribution is a helper that creates points uniformly distributed in - a spherical shell using the class SphericalIndependent. +def spherical_uniform(r_outer, r_inner=0.0, thetas=(0., pi), phis=(0., 2*pi), + origin=(0., 0., 0.)): + r""" + This function is a helper that makes it easier to create points uniformly + distributed in a spherical shell using the class SphericalIndependent. It allows one to sample points independly in a spherical shell, specified by (r1, r2), (theta1, theta2), (phi1, phi2) centered on the coordinates @@ -806,109 +804,10 @@ class SphericalShell(Spatial): origin: Iterable of float, optional coordinates (x0, y0, z0) of the center of the spherical reference frame for the source. Defaults to (0.0, 0.0, 0.0) - - Attributes - ---------- - radii : Iterable of float - Inner radius r1 and outer radius r2 of the spherical shell. - thetas : Iterable of float - Start theta1 and end theta2 of the theta-coordinates (angle relative to - the z-axis) in a reference frame specified by the origin parameter - phis : Iterable of float - Start phi1 and end phi2 of the phi-coordinates (azimuthal angle) in a - reference frame specified by the origin parameter - origin: Iterable of float, optional - coordinates (x0, y0, z0) of the center of the spherical reference frame - for the source. Defaults to (0.0, 0.0, 0.0) - """ - def __init__(self, radii, thetas, phis, origin=(0.0, 0.0, 0.0)): - self.radii = radii - self.thetas = thetas - self.phis = phis - self.origin = origin + r_dist = PowerLaw(r_inner, r_outer, 2) + cos_thetas_dist = Uniform(np.cos(thetas[0]), np.cos(thetas[1])) + phis_dist = Uniform(phis[0], phis[1]) - @property - def radii(self): - return self._radii - - @property - def thetas(self): - return self._thetas - - @property - def phis(self): - return self._phis - - @property - def origin(self): - return self._origin - - @radii.setter - def radii(self, radii): - cv.check_type('radii values', radii, Iterable, Real) - self._radii = radii - - @thetas.setter - def thetas(self, thetas): - cv.check_type('thetas values', thetas, Iterable, Real) - self._thetas = thetas - - @phis.setter - def phis(self, phis): - cv.check_type('phis values', phis, Iterable, Real) - self._phis = phis - - @origin.setter - def origin(self, origin): - cv.check_type('origin coordinates', origin, Iterable, Real) - origin = np.asarray(origin) - self._origin = origin - - def to_xml_element(self): - """Return XML representation of the spatial distribution - - Returns - ------- - element : xml.etree.ElementTree.Element - XML element containing spatial distribution data - - """ - element = ET.Element('space') - element.set('type', 'spherical') - sub_element_radii = ET.SubElement(element, 'r') - # the 2.0 is necessary to define the radius in the power law - sub_element_radii.set('parameters', ' '.join(map(str, self.radii))+' 2.0') - sub_element_radii.set('type', 'powerlaw') - sub_element_thetas = ET.SubElement(element, 'cos_theta') - # the sphericalIndependent class takes the arccos of theta - cos_thetas = np.cos(self.thetas) - sub_element_thetas.set('parameters', ' '.join(map(str, cos_thetas))) - sub_element_thetas.set('type', 'uniform') - sub_element_phis = ET.SubElement(element, 'phi') - sub_element_phis.set('parameters', ' '.join(map(str, self.phis))) - sub_element_phis.set('type', 'uniform') - element.set('origin', ' '.join(map(str, self.origin))) - return element - - @classmethod - def from_xml_element(cls, elem): - """Generate spatial distribution from an XML element - - Parameters - ---------- - elem : xml.etree.ElementTree.Element - XML element - - Returns - ------- - openmc.stats.SphericalIndependent - Spatial distribution generated from XML element - - """ - r = Univariate.from_xml_element(elem.find('r')) - cos_theta = Univariate.from_xml_element(elem.find('cos_theta')) - phi = Univariate.from_xml_element(elem.find('phi')) - origin = [float(x) for x in elem.get('origin').split()] - return cls(r, cos_theta, phi, origin=origin) + return SphericalIndependent(r_dist, cos_thetas_dist, phis_dist, origin) From 0def5bf655944af815ce6c73af22be5cffd10997 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Sat, 14 May 2022 09:08:54 +0200 Subject: [PATCH 12/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 67337f2d6..1649d45a1 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -781,15 +781,13 @@ class Point(Spatial): def spherical_uniform(r_outer, r_inner=0.0, thetas=(0., pi), phis=(0., 2*pi), origin=(0., 0., 0.)): - r""" - This function is a helper that makes it easier to create points uniformly - distributed in a spherical shell using the class SphericalIndependent. + """Return a uniform spatial distribution over a spherical shell. - It allows one to sample points independly in a spherical shell, specified - by (r1, r2), (theta1, theta2), (phi1, phi2) centered on the coordinates - (x0, y0, z0). + This function provides a uniform spatial distribution over a spherical + shell between `r_inner` and `r_outer`. Optionally, the range of angles + can be restricted by the `thetas` and `phis` arguments. - .. versionadded: 0.13 + .. versionadded: 0.13.1 Parameters ---------- From 7bcad5e7b6948c841cb155190698a4449efff447 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Sat, 14 May 2022 09:09:21 +0200 Subject: [PATCH 13/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 1649d45a1..bbd11a15e 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -791,17 +791,24 @@ def spherical_uniform(r_outer, r_inner=0.0, thetas=(0., pi), phis=(0., 2*pi), Parameters ---------- - radii : Iterable of float - Inner radius r1 and outer radius r2 of the spherical shell. - thetas : Iterable of float - Start theta1 and end theta2 of the theta-coordinates (angle relative to - the z-axis) in a reference frame specified by the origin parameter - phis : Iterable of float - Start phi1 and end phi2 of the phi-coordinates (azimuthal angle) in a - reference frame specified by the origin parameter - origin: Iterable of float, optional - coordinates (x0, y0, z0) of the center of the spherical reference frame - for the source. Defaults to (0.0, 0.0, 0.0) + r_outer : float + Outer radius of the spherical shell in [cm] + r_inner : float, optional + Inner radius of the spherical shell in [cm] + thetas : iterable of float, optional + Starting and ending theta coordinates (angle relative to + the z-axis) in radius in a reference frame centered at `origin` + phis : iterable of float, optional + Starting and ending phi coordinates (azimuthal angle) in + radians in a reference frame centered at `origin` + origin: iterable of float, optional + Coordinates (x0, y0, z0) of the center of the spherical + reference frame for the distribution. + + Returns + ------- + openmc.stats.SphericalIndependent + Uniform distribution over the spherical shell """ r_dist = PowerLaw(r_inner, r_outer, 2) From 6806f73bd43d36bb6cb378de69d90b6eef8c828c Mon Sep 17 00:00:00 2001 From: cpf Date: Sat, 14 May 2022 09:12:07 +0200 Subject: [PATCH 14/24] missing import --- openmc/stats/multivariate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index bbd11a15e..56f682056 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -1,6 +1,6 @@ from abc import ABC, abstractmethod from collections.abc import Iterable -from math import pi +from math import pi, cos from numbers import Real from xml.etree import ElementTree as ET From 8b62ee36350a9ed5c813a1583c0382ae28f3758e Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Mon, 16 May 2022 14:38:46 +0200 Subject: [PATCH 15/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 56f682056..228bdf9ea 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -812,7 +812,7 @@ def spherical_uniform(r_outer, r_inner=0.0, thetas=(0., pi), phis=(0., 2*pi), """ r_dist = PowerLaw(r_inner, r_outer, 2) - cos_thetas_dist = Uniform(np.cos(thetas[0]), np.cos(thetas[1])) + cos_thetas_dist = Uniform(cos(thetas[1]), cos(thetas[0])) phis_dist = Uniform(phis[0], phis[1]) return SphericalIndependent(r_dist, cos_thetas_dist, phis_dist, origin) From 44d591ff48ffe3cde7a758290a396c4ba741e7c4 Mon Sep 17 00:00:00 2001 From: Christopher Fichtlscherer <29277544+cfichtlscherer@users.noreply.github.com> Date: Mon, 16 May 2022 14:39:28 +0200 Subject: [PATCH 16/24] Update openmc/stats/multivariate.py Co-authored-by: Paul Romano --- openmc/stats/multivariate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py index 228bdf9ea..98c76ea67 100644 --- a/openmc/stats/multivariate.py +++ b/openmc/stats/multivariate.py @@ -374,7 +374,7 @@ class SphericalIndependent(Spatial): r"""Spatial distribution represented in spherical coordinates. This distribution allows one to specify coordinates whose :math:`r`, - :math:`\cos_theta`, and :math:`\phi` components are sampled independently + :math:`\theta`, and :math:`\phi` components are sampled independently from one another and centered on the coordinates (x0, y0, z0). .. versionadded: 0.12 From f1f215bdbb6c1fb0fee53b78878ab565cd8f335e Mon Sep 17 00:00:00 2001 From: cpf Date: Wed, 25 May 2022 16:39:42 +0200 Subject: [PATCH 17/24] change theta to cos_theta in regression test --- tests/regression_tests/source/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/regression_tests/source/test.py b/tests/regression_tests/source/test.py index 31debde47..e6a5bcf70 100644 --- a/tests/regression_tests/source/test.py +++ b/tests/regression_tests/source/test.py @@ -1,4 +1,4 @@ -from math import pi +from math import pi, cos import numpy as np import openmc @@ -32,19 +32,19 @@ class SourceTestHarness(PyAPITestHarness): r_dist = openmc.stats.Uniform(2., 3.) r_dist1 = openmc.stats.PowerLaw(2., 3., 1.) r_dist2 = openmc.stats.PowerLaw(2., 3., 2.) - theta_dist = openmc.stats.Discrete([pi/4, pi/2, 3*pi/4], - [0.3, 0.4, 0.3]) + cos_theta_dist = openmc.stats.Discrete([cos(pi/4), 0.0, cos(3*pi/4)], + [0.3, 0.4, 0.3]) phi_dist = openmc.stats.Uniform(0.0, 2*pi) spatial1 = openmc.stats.CartesianIndependent(x_dist, y_dist, z_dist) spatial2 = openmc.stats.Box([-4., -4., -4.], [4., 4., 4.]) spatial3 = openmc.stats.Point([1.2, -2.3, 0.781]) - spatial4 = openmc.stats.SphericalIndependent(r_dist, theta_dist, + spatial4 = openmc.stats.SphericalIndependent(r_dist, cos_theta_dist, phi_dist, origin=(1., 1., 0.)) spatial5 = openmc.stats.CylindricalIndependent(r_dist, phi_dist, z_dist, origin=(1., 1., 0.)) - spatial6 = openmc.stats.SphericalIndependent(r_dist2, theta_dist, + spatial6 = openmc.stats.SphericalIndependent(r_dist2, cos_theta_dist, phi_dist, origin=(1., 1., 0.)) spatial7 = openmc.stats.CylindricalIndependent(r_dist1, phi_dist, From 86ec0658c57a84019f0ef1c59f53671a2836a60e Mon Sep 17 00:00:00 2001 From: cpf Date: Wed, 25 May 2022 17:30:13 +0200 Subject: [PATCH 18/24] test spherical_uniform --- tests/unit_tests/test_source.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/unit_tests/test_source.py b/tests/unit_tests/test_source.py index d4d17a3da..f186437e4 100644 --- a/tests/unit_tests/test_source.py +++ b/tests/unit_tests/test_source.py @@ -1,6 +1,6 @@ import openmc import openmc.stats - +from math import pi, cos def test_source(): space = openmc.stats.Point() @@ -26,6 +26,22 @@ def test_source(): assert src.strength == 1.0 +def test_spherical_uniform(): + r_outer = 2.0 + r_inner = 1.0 + thetas = (0.0, pi/2) + phis = (0.0, pi) + origin = (0.0, 1.0, 2.0) + + sph_indep_function = openmc.stats.spherical_uniform(r_outer, + r_inner, + thetas, + phis, + origin) + + assert isinstance(sph_indep_function, openmc.stats.SphericalIndependent) + + def test_source_file(): filename = 'source.h5' src = openmc.Source(filename=filename) @@ -35,6 +51,7 @@ def test_source_file(): assert 'strength' in elem.attrib assert 'file' in elem.attrib + def test_source_dlopen(): library = './libsource.so' src = openmc.Source(library=library) From ccda2d3af374e9fc30e79b86da3dc15628196bbc Mon Sep 17 00:00:00 2001 From: cpf Date: Wed, 25 May 2022 17:32:34 +0200 Subject: [PATCH 19/24] removed import cos --- tests/unit_tests/test_source.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit_tests/test_source.py b/tests/unit_tests/test_source.py index f186437e4..dbcf49efc 100644 --- a/tests/unit_tests/test_source.py +++ b/tests/unit_tests/test_source.py @@ -1,6 +1,6 @@ import openmc import openmc.stats -from math import pi, cos +from math import pi def test_source(): space = openmc.stats.Point() From fc60a533c13ab9ea2e98bc8bd8120c9fc730c001 Mon Sep 17 00:00:00 2001 From: cpf Date: Wed, 25 May 2022 22:39:17 +0200 Subject: [PATCH 20/24] changed theta cos_theta --- tests/regression_tests/source/inputs_true.dat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/regression_tests/source/inputs_true.dat b/tests/regression_tests/source/inputs_true.dat index 131d20ac1..c9c9c4277 100644 --- a/tests/regression_tests/source/inputs_true.dat +++ b/tests/regression_tests/source/inputs_true.dat @@ -53,9 +53,9 @@ - - 0.7853981633974483 1.5707963267948966 2.356194490192345 0.3 0.4 0.3 - + + 0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3 + @@ -102,9 +102,9 @@ - - 0.7853981633974483 1.5707963267948966 2.356194490192345 0.3 0.4 0.3 - + + 0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3 + From c2a0599b23da1bcc6f607935d3286af6514cc454 Mon Sep 17 00:00:00 2001 From: cpf Date: Thu, 26 May 2022 00:07:36 +0200 Subject: [PATCH 21/24] update criticality by different distribution --- tests/regression_tests/source/results_true.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression_tests/source/results_true.dat b/tests/regression_tests/source/results_true.dat index 62eaf6eff..bfc387065 100644 --- a/tests/regression_tests/source/results_true.dat +++ b/tests/regression_tests/source/results_true.dat @@ -1,2 +1,2 @@ k-combined: -2.865754E-01 6.762423E-03 +2.865449E-01 6.769564E-03 From 53d7c848ea1d43d37b55f0f2b8d61338dbe30e2e Mon Sep 17 00:00:00 2001 From: cpf Date: Thu, 26 May 2022 00:17:03 +0200 Subject: [PATCH 22/24] use of testing cross sections --- tests/regression_tests/source/results_true.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression_tests/source/results_true.dat b/tests/regression_tests/source/results_true.dat index bfc387065..62eaf6eff 100644 --- a/tests/regression_tests/source/results_true.dat +++ b/tests/regression_tests/source/results_true.dat @@ -1,2 +1,2 @@ k-combined: -2.865449E-01 6.769564E-03 +2.865754E-01 6.762423E-03 From 9704aa0ed48e1838465de4a7b926d98f64e48b09 Mon Sep 17 00:00:00 2001 From: cpf Date: Thu, 26 May 2022 14:20:12 +0200 Subject: [PATCH 23/24] change theta cos_theta in test unstructured_mesh --- tests/regression_tests/unstructured_mesh/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/regression_tests/unstructured_mesh/test.py b/tests/regression_tests/unstructured_mesh/test.py index c921a7848..daebe7948 100644 --- a/tests/regression_tests/unstructured_mesh/test.py +++ b/tests/regression_tests/unstructured_mesh/test.py @@ -228,10 +228,10 @@ def test_unstructured_mesh(test_opts): # source setup r = openmc.stats.Uniform(a=0.0, b=0.0) - theta = openmc.stats.Discrete(x=[0.0], p=[1.0]) + cos_theta = openmc.stats.Discrete(x=[1.0], p=[1.0]) phi = openmc.stats.Discrete(x=[0.0], p=[1.0]) - space = openmc.stats.SphericalIndependent(r, theta, phi) + space = openmc.stats.SphericalIndependent(r, cos_theta, phi) energy = openmc.stats.Discrete(x=[15.e+06], p=[1.0]) source = openmc.Source(space=space, energy=energy) settings.source = source From be006abf1767e8053954300a96c5af92e8766dba Mon Sep 17 00:00:00 2001 From: cpf Date: Thu, 26 May 2022 16:13:37 +0200 Subject: [PATCH 24/24] change input_true in unstructured_mesh --- tests/regression_tests/unstructured_mesh/inputs_true0.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true1.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true10.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true11.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true12.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true13.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true14.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true15.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true2.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true3.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true4.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true5.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true6.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true7.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true8.dat | 6 +++--- tests/regression_tests/unstructured_mesh/inputs_true9.dat | 6 +++--- 16 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/regression_tests/unstructured_mesh/inputs_true0.dat b/tests/regression_tests/unstructured_mesh/inputs_true0.dat index 7411e9b94..1ed60d507 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true0.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true0.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true1.dat b/tests/regression_tests/unstructured_mesh/inputs_true1.dat index e85aab119..67dde56a9 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true1.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true1.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true10.dat b/tests/regression_tests/unstructured_mesh/inputs_true10.dat index 628e5e7bc..9ca47a356 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true10.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true10.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true11.dat b/tests/regression_tests/unstructured_mesh/inputs_true11.dat index 1c0a579e5..683e1fade 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true11.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true11.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true12.dat b/tests/regression_tests/unstructured_mesh/inputs_true12.dat index a75344435..8ce9f3cf2 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true12.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true12.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true13.dat b/tests/regression_tests/unstructured_mesh/inputs_true13.dat index c62c3c911..bca0bee4c 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true13.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true13.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true14.dat b/tests/regression_tests/unstructured_mesh/inputs_true14.dat index b7ac4c048..226331ba8 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true14.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true14.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true15.dat b/tests/regression_tests/unstructured_mesh/inputs_true15.dat index 1d96efc7d..a6a084165 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true15.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true15.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true2.dat b/tests/regression_tests/unstructured_mesh/inputs_true2.dat index a2a2d4a27..4b442c757 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true2.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true2.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true3.dat b/tests/regression_tests/unstructured_mesh/inputs_true3.dat index c96f90201..52e53498e 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true3.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true3.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true4.dat b/tests/regression_tests/unstructured_mesh/inputs_true4.dat index a39452da7..995a1828f 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true4.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true4.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true5.dat b/tests/regression_tests/unstructured_mesh/inputs_true5.dat index 288b7d1fc..60229e5e5 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true5.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true5.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true6.dat b/tests/regression_tests/unstructured_mesh/inputs_true6.dat index 883e6cbf4..7a9257cb7 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true6.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true6.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true7.dat b/tests/regression_tests/unstructured_mesh/inputs_true7.dat index 267966e3c..52802febf 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true7.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true7.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true8.dat b/tests/regression_tests/unstructured_mesh/inputs_true8.dat index 9a7ad5711..e484c95a2 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true8.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true8.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0 diff --git a/tests/regression_tests/unstructured_mesh/inputs_true9.dat b/tests/regression_tests/unstructured_mesh/inputs_true9.dat index 8aedad237..5e83d71bd 100644 --- a/tests/regression_tests/unstructured_mesh/inputs_true9.dat +++ b/tests/regression_tests/unstructured_mesh/inputs_true9.dat @@ -50,9 +50,9 @@ - - 0.0 1.0 - + + 1.0 1.0 + 0.0 1.0