Philippe 13/09/2016: moved CFILENAME from TOUTBAK datatype to TFILEDATA datatype

src/LIB/SURCOUCHE/src/modd_io.f90

@@ -42,7 +42,6 @@ TYPE TOUTBAK
   INTEGER           :: NOUTID = -1  !Output number
   INTEGER           :: NSTEP        !Timestep number
   REAL              :: XTIME        !Time from start of the segment (in seconds and rounded to a timestep)
-  CHARACTER(LEN=28) :: CFILENAME    !Filename
   INTEGER           :: NOUTDAD = -1 !Index of the corresponding dad file (file with same time)
   CHARACTER(LEN=28) :: CDADFILENAME !Filename of dad
   TYPE(TFILEDATA),POINTER :: TFILE => NULL() !Corresponding file
@@ -50,6 +49,7 @@ END TYPE TOUTBAK
 
 !Structure describing the characteristics of a file
 TYPE TFILEDATA
+  CHARACTER(LEN=28) :: CFILENAME             !Filename
   CHARACTER(LEN=7)  :: CFILETYPE = "UNKNOWN" !Filetype (backup, output...)
   TYPE(TFILEDATA),POINTER :: TFILE_PREV => NULL()
   TYPE(TFILEDATA),POINTER :: TFILE_NEXT => NULL()

src/MNH/modeln.f90

@@ -908,7 +908,7 @@ IF (IOUT < NOUT_NUMB ) THEN
     GCLOSE_OUT=.TRUE.
     INPRAR = 22 +2*(4+NRR+NSV)
     !
-    YFMFILE  = TOUTBAKN(IOUT)%CFILENAME
+    YFMFILE  = TOUTBAKN(IOUT)%TFILE%CFILENAME
     YDADFILE = TOUTBAKN(IOUT)%CDADFILENAME
     !
     CALL FMOPEN_ll(YFMFILE,'WRITE',CLUOUT,INPRAR,ITYPE,NVERB,ININAR,IRESP)

src/MNH/set_grid.f90

@@ -708,8 +708,6 @@ DO IMI = 1, NMODEL
           print *,'ERROR in SET_GRID: more than 999 backups'
           STOP
         END IF
-        WRITE (YNUMBER,FMT="('.',I3.3)") IPOS
-        OUT_MODEL(IMI)%TOUTBAKN(IPOS)%CFILENAME=ADJUSTL(ADJUSTR(IO_SURF_MNH_MODEL(IMI)%COUTFILE)//YNUMBER)
         IF (.NOT.ASSOCIATED(TFILE_FIRST)) THEN
           ALLOCATE(TFILE_FIRST)
           TFILE_LAST => TFILE_FIRST
@@ -720,6 +718,8 @@ DO IMI = 1, NMODEL
         ENDIF
         OUT_MODEL(IMI)%TOUTBAKN(IPOS)%TFILE => TFILE_LAST
         OUT_MODEL(IMI)%TOUTBAKN(IPOS)%TFILE%CFILETYPE="BACKUP"
+        WRITE (YNUMBER,FMT="('.',I3.3)") IPOS
+        OUT_MODEL(IMI)%TOUTBAKN(IPOS)%TFILE%CFILENAME=ADJUSTL(ADJUSTR(IO_SURF_MNH_MODEL(IMI)%COUTFILE)//YNUMBER)
     END IF
   END DO
   !
@@ -733,7 +733,7 @@ DO IMI = 1, NMODEL
   IF (NDAD(IMI) == IMI .OR.  IMI == 1) THEN
     OUT_MODEL(IMI)%TOUTBAKN(:)%NOUTDAD = 0
     !Check IPOS>0 because TOUTBAKN(0) does not exist (IPOS=0 only if no backups)
-    IF(IPOS>0) OUT_MODEL(IMI)%TOUTBAKN(IPOS)%CDADFILENAME = OUT_MODEL(IMI)%TOUTBAKN(IPOS)%CFILENAME
+    IF(IPOS>0) OUT_MODEL(IMI)%TOUTBAKN(IPOS)%CDADFILENAME = OUT_MODEL(IMI)%TOUTBAKN(IPOS)%TFILE%CFILENAME
   ELSE
     DO IPOS = 1,OUT_MODEL(IMI)%NOUT_NUMB
       IDX = 0