diff options
Diffstat (limited to 'Dragon/src/g2s_g2s.f90')
| -rw-r--r-- | Dragon/src/g2s_g2s.f90 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Dragon/src/g2s_g2s.f90 b/Dragon/src/g2s_g2s.f90 index 19494f3..f64dba9 100644 --- a/Dragon/src/g2s_g2s.f90 +++ b/Dragon/src/g2s_g2s.f90 @@ -53,9 +53,9 @@ subroutine G2S(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) type(c_ptr) :: ipGeo,ipGeo_1 integer :: sizeB,sizeP,sizeSA,nbNode,nbCLP,nbFlux,nbMacro,ipSal,ipPs,ipAl, & - ipZa,indic,nitma,impx + ipZa,indic,nitma,impx,drawMix character(len=12) :: text12 - logical :: drawNod,drawMix,lmacro + logical :: lmacro real,dimension(2) :: zoomx,zoomy integer,allocatable,dimension(:) :: gig,merg,imacro integer,dimension(10) :: datain @@ -133,8 +133,7 @@ subroutine G2S(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 @@ -147,11 +146,11 @@ subroutine G2S(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) call REDGET(indic,impx,flott,text12,dflott) if (indic /= 1) call XABORT('G2S: integer data expected(1).') 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).') @@ -248,7 +247,7 @@ subroutine G2S(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) endif !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) if (c_associated(ipGeo_1)) then !creation du fichier de commande SAL |