Skip to content

FDS Source: Fix missing R2 in chord area Issue #14139 #14177

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
drjfloyd merged 1 commit into from
Feb 6, 2025
Merged

FDS Source: Fix missing R2 in chord area Issue #14139 #14177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Source/func.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9302,22 +9302,22 @@ REAL(EB) FUNCTION CIRCLE_CELL_INTERSECTION_AREA(X0,Y0,RAD,X1,X2,Y1,Y2)
! Intersection area is the area of the chord.
IF (X2 <= X0 .AND. X2 > X0-RAD) THEN
THETA = 2._EB*ACOS((X0-X2)/RAD)
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*(THETA-SIN(THETA))
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*R2*(THETA-SIN(THETA))
RETURN
ENDIF
IF (Y2 <= Y0 .AND. Y2 > Y0-RAD) THEN
THETA = 2._EB*ACOS((Y0-Y2)/RAD)
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*(THETA-SIN(THETA))
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*R2*(THETA-SIN(THETA))
RETURN
ENDIF
IF (X1 >= X0 .AND. X1 < X0+RAD) THEN
THETA = 2._EB*ACOS((X1-X0)/RAD)
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*(THETA-SIN(THETA))
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*R2*(THETA-SIN(THETA))
RETURN
ENDIF
IF (Y1 >= Y0 .AND. Y1 < Y0+RAD) THEN
THETA = 2._EB*ACOS((X1-X0)/RAD)
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*(THETA-SIN(THETA))
CIRCLE_CELL_INTERSECTION_AREA = 0.5_EB*R2*(THETA-SIN(THETA))
RETURN
ENDIF
! Remaining cases is where one or more rectangle edges are inside but the corners are outside
Expand Down