Skip to content

Small adjustments to wedges #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valeriaRaffuzzi merged 5 commits into from
Oct 9, 2025
Merged

Small adjustments to wedges #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a42e27b
Fix bug in building thermalScatterElastic_class.f90
valeriaRaffuzzi Jun 5, 2025
58c33c9
Merge branch 'CambridgeNuclear:main' into main
valeriaRaffuzzi Jul 23, 2025
0f82a13
Merge branch 'CambridgeNuclear:main' into main
valeriaRaffuzzi Sep 30, 2025
cac3883
Merge branch 'CambridgeNuclear:main' into main
valeriaRaffuzzi Oct 9, 2025
b001de6
improve wedge input
Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Geometry/Surfaces/CompositeSurfaces/wedge_class.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
10 changes: 6 additions & 4 deletions docs/User Manual.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ::

Expand All @@ -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
#####
Expand Down