diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-10-26 06:09:46 -0400 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-10-26 06:09:46 -0400 |
| commit | bb19a602772d4fe89f5fa2e534b93237330fd89f (patch) | |
| tree | 7e0c68faf0ab9c65ec1ec4e8115325e314864a3f /Dragon/src/g2s_segArc.f90 | |
| parent | 5321198af9510e29be2b6a5a3245314e1b5c27cb (diff) | |
| parent | e2cfb58950594a3ad6f9ee3f66f97ac3ce11711e (diff) | |
Merge branch '8-correct-sfr-geometry-issues-in-module-salt' into 'main'
Resolve "Correct SFR geometry issues in module SALT:"
See merge request dragon/5.1!17
Diffstat (limited to 'Dragon/src/g2s_segArc.f90')
| -rw-r--r-- | Dragon/src/g2s_segArc.f90 | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/Dragon/src/g2s_segArc.f90 b/Dragon/src/g2s_segArc.f90 index f323f6a..8748695 100644 --- a/Dragon/src/g2s_segArc.f90 +++ b/Dragon/src/g2s_segArc.f90 @@ -1216,9 +1216,8 @@ contains .or.(isEqualConst(cx,ex).and.isEqualConst(cy,ey)) ) end function giveExtremalsAngles - subroutine drawSegArc(fileNbr,szSA,withNodes,drawMix,zoomx,zoomy) - integer,intent(in) :: fileNbr,szSA - logical,intent(in) :: withNodes,drawMix + subroutine drawSegArc(fileNbr,szSA,drawMix,zoomx,zoomy) + integer,intent(in) :: fileNbr,szSA,drawMix real,intent(in) :: zoomx(2),zoomy(2) type(t_segArc) :: sa @@ -1269,23 +1268,29 @@ contains call line(sa%x,sa%y,sa%dx,sa%dy) cx=real((sa%dx+sa%x)*0.5d0) ; cy=real((sa%dy+sa%y)*0.5d0) angl = real(calculeAngle(sa%x,sa%y,sa%dx,sa%dy)*rad2deg-90.d0) - if (withNodes .and. drawMix) then + if (drawMix==1) then call keknum(cx,cy,tailleNbr,real(sa%nodeg),angl,-1,2) call keknum(cx,cy,tailleNbr,real(sa%noded),angl,-1,0) - else if (drawMix) then + else if (drawMix==2) then call keknum(cx,cy,tailleNbr,real(sa%neutronicMixg),angl,-1,2) call keknum(cx,cy,tailleNbr,real(sa%neutronicMixd),angl,-1,0) + else if (drawMix==3) then + call keknum(cx,cy,tailleNbr,real(i),angl,-1,2) + call keknum(cx,cy,tailleNbr,real(i),angl,-1,0) end if else if (sa%typ==tcer) then call arc(sa%x,sa%y,sa%r,0.d0,180.d0) call arc(sa%x,sa%y,sa%r,180.d0,360.d0) cx=real(sa%x+sa%r) ; cy=real(sa%y) - if (withNodes .and. drawMix) then + if (drawMix==1) then call keknum(cx,cy,tailleNbr,real(sa%nodeg),0.,-1,2) call keknum(cx,cy,tailleNbr,real(sa%noded),0.,-1,0) - else if (drawMix) then + else if (drawMix==2) then call keknum(cx,cy,tailleNbr,real(sa%neutronicMixg),0.,-1,2) call keknum(cx,cy,tailleNbr,real(sa%neutronicMixd),0.,-1,0) + else if (drawMix==3) then + call keknum(cx,cy,tailleNbr,real(i),0.,-1,2) + call keknum(cx,cy,tailleNbr,real(i),0.,-1,0) end if else call arc(sa%x,sa%y,sa%r,sa%a*rad2deg,sa%b*rad2deg) @@ -1296,12 +1301,15 @@ contains end if cx=real(sa%x+cos(angl)*sa%r) ; cy=real(sa%y+sin(angl)*sa%r) angl=real(angl*rad2deg) - if (withNodes .and. drawMix) then + if (drawMix==1) then call keknum(cx,cy,tailleNbr,real(sa%nodeg),angl,-1,2) call keknum(cx,cy,tailleNbr,real(sa%noded),angl,-1,0) - else if (drawMix) then + else if (drawMix==2) then call keknum(cx,cy,tailleNbr,real(sa%neutronicMixg),angl,-1,2) call keknum(cx,cy,tailleNbr,real(sa%neutronicMixd),angl,-1,0) + else if (drawMix==3) then + call keknum(cx,cy,tailleNbr,real(i),angl,-1,2) + call keknum(cx,cy,tailleNbr,real(i),angl,-1,0) end if end if end do |