summaryrefslogtreecommitdiff
path: root/Dragon/src
diff options
context:
space:
mode:
authorAlain Hebert <alainhebert@Alains-MacBook-Pro.local>2025-12-12 19:40:28 +0100
committerAlain Hebert <alainhebert@Alains-MacBook-Pro.local>2025-12-12 19:40:28 +0100
commit8a1d65be3e08a88bb11602d2988e30d08d836b6b (patch)
treed0eda76009851aed84e76c43bfe459a207178213 /Dragon/src
parent7c453e211b55bbe4a7f6f33f71037522cd2359fd (diff)
#7: Correct a few format statements
Diffstat (limited to 'Dragon/src')
-rw-r--r--Dragon/src/EDI.f18
-rw-r--r--Dragon/src/g2s_convert.f902
-rw-r--r--Dragon/src/g2s_pretraitement.f902
3 files changed, 13 insertions, 9 deletions
diff --git a/Dragon/src/EDI.f b/Dragon/src/EDI.f
index 9d8872d..ebb2df0 100644
--- a/Dragon/src/EDI.f
+++ b/Dragon/src/EDI.f
@@ -510,10 +510,6 @@
LGEO=0
IF((ILONG.NE.0).OR.(MACGEO.NE.' ')) LGEO=1
IF(IPRINT.GT.0) THEN
- WRITE(IOUT,200) NMERGE,NGCOND,IFFAC,ILUPS,NACTI,NSTATS,IADF,
- > IEUR,NBMICR,IPRINT
- WRITE(IOUT,210) NSAVES,NW,MAXPTS,IHF,NDEL,LGEO,IADJ,ICURR,
- > NOUT,IEDCUR,IGOVE
WRITE(IOUT,'(//15H MERGING INDEX:/(1X,14I5))')
> (IMERGE(I),I=1,NREG)
IF(CURNAM.NE.' ') WRITE(IOUT,'(/27H EDI: SAVE MICROLIB INFO ON,
@@ -596,6 +592,14 @@
3 IMERGE,CURNAM,OLDNAM,NBMICR,CARISO,NACTI,IACTI,IPRINT,LISO,LDEPL,
4 LMACR,IADJ,NOUT,HVOUT,BB2,IEDCUR,IGOVE)
*----
+* PRINT THE STATE-VECTOR
+*----
+ IF(IPRINT.GT.0) THEN
+ CALL LCMGET(IPEDIT,'STATE-VECTOR',ISTATE)
+ WRITE(IOUT,200) ISTATE(1:10)
+ WRITE(IOUT,210) ISTATE(11:12),ISTATE(17:25)
+ ENDIF
+*----
* DESTROY THE TEMPORARY MACRO-GEOMETRY
*----
IF(LNEWGE) THEN
@@ -637,9 +641,9 @@
4 7H ILUPS ,I8,43H (=1: REMOVE UP-SCATTERING CONTRIBUTIONS)/
5 7H NACTI ,I8,45H (NUMBER OF MIXTURES WITH ACTIVATION EDITS)/
6 7H NSTATS,I8,35H (TYPE OF STATISTIC CALCULATIONS)/
- 7 7H IADF ,I8,47H (=0: DO NOT COMPUTE ADF; =1: USE ALBS INFO; ,
- 8 60H=-2/2: USE BOUNDARY FLUX INFO; =3: USE EURYDICE INFO; =4: US,
- 9 16HE MACROLIB INFO)/
+ 7 7H IADF ,I8,46H (=0: NO ADF; =1: ALBS INFO; =2: BOUNDARY FL,
+ 8 59HUX INFO; =3: DISCONTINUITY FACTORS; =4: MATRIX DISCONTINUIT,
+ 9 10HY FACTORS)/
1 7H IEUR ,I8,47H (=1/2/3: SYBIL OR EXCELL MACRO-TRACKING/NXT ,
2 20HMACRO-TRACKING/ELSE)/
3 7H NBMICR,I8,47H (=-1: PROCESS ALL ISOTOPES; >1: NUMBER OF IS,
diff --git a/Dragon/src/g2s_convert.f90 b/Dragon/src/g2s_convert.f90
index c8f1fe9..1f28bb0 100644
--- a/Dragon/src/g2s_convert.f90
+++ b/Dragon/src/g2s_convert.f90
@@ -306,7 +306,7 @@ subroutine g2s_convert(impx,ipAl,ipZa,ipSal)
tabSegArc(i)%b=real(anglEnd)
tabSegArc(i)%a=real(anglStart)
else
- write(hsmg,'(35hg2s_convert: invalid element type=,i3,1h.)') itype
+ write(hsmg,'(34hg2s_convert: invalid element type=,i3,1h.)') itype
call XABORT(hsmg)
endif
tabSegArc(i)%nodeg=nplus
diff --git a/Dragon/src/g2s_pretraitement.f90 b/Dragon/src/g2s_pretraitement.f90
index baf20ad..983d8e7 100644
--- a/Dragon/src/g2s_pretraitement.f90
+++ b/Dragon/src/g2s_pretraitement.f90
@@ -2025,7 +2025,7 @@ contains
call LCMSIX(dIp,triName,1)
call LCMLEN(dIp,'value',long,typ)
if(long == 0) then
- write(hsmg,'(36hG2S: value key missing for triName=,a,5h (3).)') trim(triName)
+ write(hsmg,'(35hG2S: value key missing for triName=,a,5h (3).)') trim(triName)
call LCMLIB(dIp)
call LCMLIB(dicoIp)
call XABORT(hsmg)