From a42e27bbf5a31d121789a161f27096e46bca649e Mon Sep 17 00:00:00 2001 From: valeriaRaffuzzi <108435337+valeriaRaffuzzi@users.noreply.github.com> Date: Thu, 5 Jun 2025 11:49:25 +0100 Subject: [PATCH 1/2] Fix bug in building thermalScatterElastic_class.f90 --- .../thermalScattReactionCE/thermalScatterElastic_class.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuclearData/Reactions/thermalScattReactionCE/thermalScatterElastic_class.f90 b/NuclearData/Reactions/thermalScattReactionCE/thermalScatterElastic_class.f90 index cf6cee91b..5dc831a2b 100644 --- a/NuclearData/Reactions/thermalScattReactionCE/thermalScatterElastic_class.f90 +++ b/NuclearData/Reactions/thermalScattReactionCE/thermalScatterElastic_class.f90 @@ -311,7 +311,7 @@ subroutine buildFromACE(self, ACE) call ACE % setToElasticOut() do i = 1, Nin - self % muMatrix(i,:) = ACE % readIntArray(Nin) + self % muMatrix(i,:) = ACE % readRealArray(self % N_muOut) end do end if From b001de6b60b6a9aad36ed5843d046dcd3e62e58e Mon Sep 17 00:00:00 2001 From: "V. Raffuzzi" Date: Thu, 9 Oct 2025 11:38:20 +0100 Subject: [PATCH 2/2] improve wedge input --- .../Surfaces/CompositeSurfaces/wedge_class.f90 | 14 +++++++------- docs/User Manual.rst | 10 ++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Geometry/Surfaces/CompositeSurfaces/wedge_class.f90 b/Geometry/Surfaces/CompositeSurfaces/wedge_class.f90 index 3c64276fa..b02773e9f 100644 --- a/Geometry/Surfaces/CompositeSurfaces/wedge_class.f90 +++ b/Geometry/Surfaces/CompositeSurfaces/wedge_class.f90 @@ -40,7 +40,7 @@ module wedge_class !! !! Sample Dictionary Input: !! aab { type zWedge; id 92; origin (0.0 0.0 9.0); halfwidth 5.0; altitude 2.0; - !! opening 30.0; rotation 0.0; } + !! opening 30.0; # rotation 0.0; # } !! !! Boundary Conditions: !! BC order: face1, face2, face3, -base, base @@ -54,7 +54,7 @@ module wedge_class !! 0.0 and 90.0 degrees excluded) !! phi -> Rotation angle around the edge of the wedge. The rotation angle is with respect !! to the axis: +y for a xWedge; +x for a yWedge and zWedge. It must be between - !! 0.0 and 360.0 degrees excluded + !! 0.0 and 360.0 degrees !! BC -> Boundary conditions flags for each face (face1, face2, face3, -base, base) !! !! Interface: @@ -162,10 +162,10 @@ subroutine init(self, dict) call dict % get(type, 'type') ! Load triangle opening angle - call dict % get(theta,'opening') + call dict % get(theta, 'opening') ! Load rotation angle with respect to reference axis - call dict % getOrDefault(phi,'rotation',ZERO) + call dict % getOrDefault(phi, 'rotation', ZERO) ! Build wedge call self % build(type, theta, phi) @@ -217,9 +217,9 @@ subroutine build(self, type, theta, phi) self % theta = theta * PI / 180.0_defReal ! Save rotation angle - if (phi <= ZERO .or. phi >= 360.0_defReal) then - call fatalError(Here, 'Rotation angle of wedge must be in the range 0-360 degrees '//& - & '(extremes excluded). It is: '//numToChar(phi)) + if (phi < ZERO .or. phi > 360.0_defReal) then + call fatalError(Here, 'Rotation angle of wedge must be in the range 0-360 degrees. '//& + & 'It is: '//numToChar(phi)) end if self % phi = phi * PI / 180.0_defReal diff --git a/docs/User Manual.rst b/docs/User Manual.rst index 2cb159d58..e60229350 100644 --- a/docs/User Manual.rst +++ b/docs/User Manual.rst @@ -560,8 +560,9 @@ Example: :: - altitude: altitude of the triangular face of the wedge. [cm] - opening: half angle, determines the opening of the triangular face of the wedge. Must be positive and between 0-90. [degrees] - - rotation: rotation angle around the edge of the wedge. The rotation angle is with respect to the axis: - +y for a xWedge; +x for a yWedge and zWedge. Must be positive and between 0-360. [degrees] + - rotation (*optional*, default = 0.0): rotation angle around the edge of the wedge. The rotation + angle is with respect to the axis: +y for a xWedge; +x for a yWedge and zWedge. Must be positive + and between 0-360. [degrees] Example: :: @@ -571,8 +572,9 @@ Example: :: .. note:: A wedge can be used as a bounding surface. In this case, this surface will accept 5 boundary condition values: (face1 face2 face3 -base +base). Note that face3 refers to the face in front - of the axis of the wedge; face1 and face2 are the two slanted faces defined by the opening angle: - face1 is the face rotated by -opening compared to the triangle altitude; face2 is rotated by +opening. + of the axis of the wedge, and it only accepts vacuum boundary conditions; face1 and face2 are the + two slanted faces defined by the opening angle: face1 is the face rotated by -opening compared to + the triangle altitude; face2 is rotated by +opening. Cells #####