Skip to content
Snippets Groups Projects
Commit 66cc7393 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 25/01/2024: remove unused NOUTDAD field from TOUTBAK structure

parent 46893e11
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,6 @@ TYPE TOUTBAK ...@@ -78,7 +78,6 @@ TYPE TOUTBAK
INTEGER :: NID = -1 !Backup number INTEGER :: NID = -1 !Backup number
INTEGER :: NSTEP !Timestep number INTEGER :: NSTEP !Timestep number
REAL :: XTIME !Time from start of the segment (in seconds and rounded to a timestep) REAL :: XTIME !Time from start of the segment (in seconds and rounded to a timestep)
INTEGER :: NOUTDAD = -1 !Index of the corresponding dad file (file with same time)
TYPE(TFILEDATA), POINTER :: TFILE => NULL() !Corresponding file TYPE(TFILEDATA), POINTER :: TFILE => NULL() !Corresponding file
TYPE(TFILE_ELT), DIMENSION(:) ,ALLOCATABLE :: TFILE_IOZ !Corresponding Z-split files TYPE(TFILE_ELT), DIMENSION(:) ,ALLOCATABLE :: TFILE_IOZ !Corresponding Z-split files
INTEGER,DIMENSION(:), POINTER :: NFIELDLIST => NULL() !List of the fields to read or write INTEGER,DIMENSION(:), POINTER :: NFIELDLIST => NULL() !List of the fields to read or write
......
...@@ -81,7 +81,6 @@ INTEGER :: JOUT,IDX ! Loop indices ...@@ -81,7 +81,6 @@ INTEGER :: JOUT,IDX ! Loop indices
INTEGER :: IRESP INTEGER :: IRESP
INTEGER, DIMENSION(:), ALLOCATABLE :: IBAK_STEP, IOUT_STEP INTEGER, DIMENSION(:), ALLOCATABLE :: IBAK_STEP, IOUT_STEP
! Arrays to store list of backup/output steps (intermediate array) ! Arrays to store list of backup/output steps (intermediate array)
CHARACTER (LEN=4) :: YDADNUMBER ! Character string for the DAD model file number
REAL :: ZTSTEP_RND REAL :: ZTSTEP_RND
! !
! !
...@@ -331,11 +330,9 @@ DO IMI = 1, NMODEL ...@@ -331,11 +330,9 @@ DO IMI = 1, NMODEL
!Security check (if it happens, this part of the code should be exported outside of the IMI loop) !Security check (if it happens, this part of the code should be exported outside of the IMI loop)
IF (NDAD(IMI)>IMI) CALL PRINT_MSG(NVERB_FATAL,'IO','IO_Bakout_struct_prepare','NDAD(IMI)>IMI') IF (NDAD(IMI)>IMI) CALL PRINT_MSG(NVERB_FATAL,'IO','IO_Bakout_struct_prepare','NDAD(IMI)>IMI')
IF (NDAD(IMI) == IMI .OR. IMI == 1) THEN IF (NDAD(IMI) == IMI .OR. IMI == 1) THEN
OUT_MODEL(IMI)%TBACKUPN(:)%NOUTDAD = 0
DO IPOS = 1,OUT_MODEL(IMI)%NBAK_NUMB DO IPOS = 1,OUT_MODEL(IMI)%NBAK_NUMB
OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE%TDADFILE => OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE !Points to itself OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE%TDADFILE => OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE !Points to itself
END DO END DO
OUT_MODEL(IMI)%TOUTPUTN(:)%NOUTDAD = 0
DO IPOS = 1,OUT_MODEL(IMI)%NOUT_NUMB DO IPOS = 1,OUT_MODEL(IMI)%NOUT_NUMB
OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE%TDADFILE => OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE !Points to itself OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE%TDADFILE => OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE !Points to itself
END DO END DO
...@@ -350,11 +347,8 @@ DO IMI = 1, NMODEL ...@@ -350,11 +347,8 @@ DO IMI = 1, NMODEL
END IF END IF
END DO END DO
IF (IDX>0) THEN IF (IDX>0) THEN
OUT_MODEL(IMI)%TBACKUPN(IPOS)%NOUTDAD = IDX
WRITE (YDADNUMBER,FMT="('.',I3.3)") OUT_MODEL(IMI)%TBACKUPN(IPOS)%NOUTDAD
OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE%TDADFILE => OUT_MODEL(NDAD(IMI))%TBACKUPN(IDX)%TFILE OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE%TDADFILE => OUT_MODEL(NDAD(IMI))%TBACKUPN(IDX)%TFILE
ELSE ELSE
OUT_MODEL(IMI)%TBACKUPN(IPOS)%NOUTDAD = -1
NULLIFY(OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE%TDADFILE) !No dad file NULLIFY(OUT_MODEL(IMI)%TBACKUPN(IPOS)%TFILE%TDADFILE) !No dad file
END IF END IF
END DO END DO
...@@ -368,11 +362,8 @@ DO IMI = 1, NMODEL ...@@ -368,11 +362,8 @@ DO IMI = 1, NMODEL
END IF END IF
END DO END DO
IF (IDX>0) THEN IF (IDX>0) THEN
OUT_MODEL(IMI)%TOUTPUTN(IPOS)%NOUTDAD = IDX
WRITE (YDADNUMBER,FMT="('.',I3.3)") OUT_MODEL(IMI)%TOUTPUTN(IPOS)%NOUTDAD
OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE%TDADFILE => OUT_MODEL(NDAD(IMI))%TOUTPUTN(IDX)%TFILE OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE%TDADFILE => OUT_MODEL(NDAD(IMI))%TOUTPUTN(IDX)%TFILE
ELSE ELSE
OUT_MODEL(IMI)%TOUTPUTN(IPOS)%NOUTDAD = -1
NULLIFY(OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE%TDADFILE) !No dad file NULLIFY(OUT_MODEL(IMI)%TOUTPUTN(IPOS)%TFILE%TDADFILE) !No dad file
END IF END IF
END DO END DO
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment