Resolve "Reduce multicompo size for two Donjon non-regression tests"

1 files changed, 27 insertions, 29 deletions

diff --git a/Dragon/src/LIBNRG.F b/Dragon/src/LIBNRG.F
index fc00e9d..ebe4b09 100644
--- a/Dragon/src/LIBNRG.F
+++ b/Dragon/src/LIBNRG.F
@@ -40,7 +40,7 @@
 *----
       PARAMETER       (IOUT=6,LRIND=256,IACTO=2,IACTC=1,ILIBDA=4,
      >                 NMTYP=8)
-      CHARACTER        HSMG*131,HMTYP(NMTYP)*1,HFORMAT*132
+      CHARACTER        HSMG*131,HMTYP(NMTYP)*1
 #if defined(HDF5_LIB)
       CHARACTER        CFILNA1*64
 #endif /* defined(HDF5_LIB) */
@@ -106,9 +106,9 @@
 *----
         IUNIT=KDROPN(NAMFIL,IACTO,ILIBDA,LRIND)
         IF(IUNIT.LE.0) THEN
-          HFORMAT='(27HLIBNRG: WIMS-AECL LIBRARY '',A16,8H'' CANNOT'//
-     >    '30H BE OPENED BY KDROPN (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IUNIT
+          WRITE(HSMG,'(27HLIBNRG: WIMS-AECL LIBRARY '',A,7H'' CANNO,'//
+     >    '31HT BE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IUNIT
           CALL XABORT(HSMG)
         ENDIF
         CALL OPNIND(IUNIT,MASTER,LMASTB)
@@ -124,9 +124,8 @@
 *----
         IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND)
         IF(IUNIT.LE.0) THEN
-          HFORMAT='(22HLIBNRG: WIMS LIBRARY '',A16,9H'' CANNOT '//
-     >    '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IUNIT
+          WRITE(HSMG,'(22HLIBNRG: WIMS LIBRARY '',A,11H'' CANNOT BE,'//
+     >    '27H OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),IUNIT
           CALL XABORT(HSMG)
         ENDIF
         READ(IUNIT) (NPZ(II),II=1,LPZ-1)
@@ -136,9 +135,9 @@
         READ(IUNIT) (ENERG(J),J=1,NGRI+1)
         IERR=KDRCLS(IUNIT,IACTC)
         IF(IERR.LT.0) THEN
-          HFORMAT='(22HLIBNRG: WIMS LIBRARY '',A16,9H'' CANNOT '//
-     >    '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IERR
+          WRITE(HSMG,'(22HLIBNRG: WIMS LIBRARY '',A,9H'' CANNOT ,'//
+     >    '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IUNIT
           CALL XABORT(HSMG)
         ENDIF
       ELSE IF(NAMLBT.EQ.'APLIB1') THEN
@@ -147,9 +146,9 @@
 *----
         IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND)
         IF(IUNIT.LE.0) THEN
-          HFORMAT='(26HLIBNRG: APOLLO-1 LIBRARY '',A16,9H'' CANNOT '//
-     >    '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IUNIT
+          WRITE(HSMG,'(26HLIBNRG: APOLLO-1 LIBRARY '',A,7H'' CANNO,'//
+     >    '31HT BE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IUNIT
           CALL XABORT(HSMG)
         ENDIF
         REWIND(IUNIT)
@@ -177,9 +176,9 @@
         ENDIF
         IERR=KDRCLS(IUNIT,IACTC)
         IF(IERR.LT.0) THEN
-          HFORMAT='(26HLIBNRG: APOLLO-1 LIBRARY '',A16,9H'' CANNOT '//
-     >    '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IERR
+          WRITE(HSMG,'(26HLIBNRG: APOLLO-1 LIBRARY '',A,7H'' CANNO,'//
+     >    '31HT BE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IERR
           CALL XABORT(HSMG)
         ENDIF
       ELSE IF(NAMLBT.EQ.'APLIB2') THEN
@@ -221,9 +220,9 @@
 *----
         IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND)
         IF(IUNIT.LE.0) THEN
-          HFORMAT='(23HLIBNRG: MATXS LIBRARY '',A16,11H'' CANNOT BE'//
-     >    '27H OPENED BY KDROPN (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IUNIT
+          WRITE(HSMG,'(23HLIBNRG: MATXS LIBRARY '',A,9H'' CANNOT ,'//
+     >    '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IUNIT
           CALL XABORT(HSMG)
         ENDIF
         NWDS=3
@@ -263,9 +262,9 @@
         CALL XDRCLS(IUNIT)
         IERR=KDRCLS(IUNIT,IACTC)
         IF(IERR.LT.0) THEN
-          HFORMAT='(23HLIBNRG: MATXS LIBRARY '',A16,11H'' CANNOT BE'//
-     >    '27H CLOSED BY KDRCLS (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IERR
+          WRITE(HSMG,'(23HLIBNRG: MATXS LIBRARY '',A,9H'' CANNOT ,'//
+     >    '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IERR
           CALL XABORT(HSMG)
         ENDIF
       ELSE IF(NAMLBT.EQ.'MATXS2') THEN
@@ -275,9 +274,9 @@
         IF(NAMFIL(:1).EQ.'_') ILIBIN=3
         IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND)
         IF(IUNIT.LE.0) THEN
-          HFORMAT='(24HLIBNRG: MATXS2 LIBRARY '',A16,10H'' CANNOT B'//
-     >    '28HE OPENED BY KDROPN (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IUNIT
+          WRITE(HSMG,'(24HLIBNRG: MATXS2 LIBRARY '',A,9H'' CANNOT ,'//
+     >    '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IUNIT
           CALL XABORT(HSMG)
         ENDIF
         NWDS=6
@@ -337,10 +336,9 @@
         ENDIF
         IERR=KDRCLS(IUNIT,IACTC)
         IF(IERR.LT.0) THEN
-          HFORMAT='(24HLIBNRG: MATXS2 LIBRARY '',A16,10H'' CANNOT B'//
-     >    '28HE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)'
-          WRITE(HSMG,HFORMAT) NAMFIL,IERR
-          CALL XABORT(HSMG)
+          WRITE(HSMG,'(24HLIBNRG: MATXS2 LIBRARY '',A,9H'' CANNOT ,'//
+     >    '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)') TRIM(NAMFIL),
+     >    IERR
         ENDIF
       ELSE IF(NAMLBT.EQ.'NDAS') THEN
 *---