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_g2mc.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_g2mc.f90')
| -rw-r--r-- | Dragon/src/g2s_g2mc.f90 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Dragon/src/g2s_g2mc.f90 b/Dragon/src/g2s_g2mc.f90 index 4bfddfa..2b016e7 100644 --- a/Dragon/src/g2s_g2mc.f90 +++ b/Dragon/src/g2s_g2mc.f90 @@ -53,14 +53,14 @@ subroutine G2MC(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) type(c_ptr) :: ipGeo,ipGeo_1 integer :: ipMC,ipSal,ipPs,sizeB,sizeP,sizeSA,nbNode,nbCLP,nbFlux,indic, & - & nitma,impx + & nitma,impx,drawMix real :: flott double precision :: dflott integer :: lgMaxGig=0 integer,dimension(10) :: datain integer,allocatable,dimension(:) :: merg,imacro character(len=12) :: text12 - logical :: drawNod,drawMix,lmacro + logical :: lmacro real,dimension(2) :: zoomx,zoomy ipGeo_1=c_null_ptr ! no geometry read @@ -110,8 +110,7 @@ subroutine G2MC(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) end if ! impx=1 - drawNod = .false. - drawMix = .false. + drawMix = 0 zoomx = (/ 0.0, 1.0 /) zoomy = (/ 0.0, 1.0 /) typgeo=0 @@ -124,11 +123,11 @@ subroutine G2MC(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) call REDGET(indic,impx,flott,text12,dflott) if (indic /= 1) call XABORT('G2MC: integer data expected.') else if (text12 == 'DRAWNOD') then - drawNod=.true. - drawmix=.true. + drawMix=1 else if (text12 == 'DRAWMIX') then - drawNod=.true. - drawmix=.false. + drawMix=2 + else if (text12 == 'DRAWELEM') then + drawMix=3 else if (text12 == 'ZOOMX') then call REDGET(indic,nitma,zoomx(1),text12,dflott) if (indic /= 2) call XABORT('G2S: real data expected(1).') @@ -206,7 +205,7 @@ subroutine G2MC(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) deallocate(merg) !impression des segArc charges - if (ipPs /= -1) call drawSegArc(ipPs,sizeSA,drawMix,drawNod,zoomx,zoomy) + if (ipPs /= -1) call drawSegArc(ipPs,sizeSA,drawMix,zoomx,zoomy) !creation du fichier de commande Monte-Carlo if (index(HENTRY(1),'.tp')/=0) then |