Changeset 1884 for LMDZ5/trunk

Timestamp:

Oct 3, 2013, 1:30:31 PM (11 years ago)

Author:

idelkadi

Message:

Prise en compte du cas par defaut ou les frequences de sorties (phys_out_filetimesteps) ne sont pas definies dans config.def ou output.def
Dans ce cas on utilise ecrit_mensuel ecrit_jour ecrit_hf ...

File:

• LMDZ5/trunk/libf/phylmd/phys_output_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -112 +112 @@
     INTEGER, DIMENSION(nfiles)            :: phys_out_levmin, phys_out_levmax
     INTEGER, DIMENSION(nfiles)            :: phys_out_filelevels
-    CHARACTER(LEN=20), DIMENSION(nfiles)  :: chtimestep   = (/ '1mth', '1mth', '1mth', '1mth', '1mth', &
-                                                               '1mth', '1mth', '1mth', '1mth' /)
+    CHARACTER(LEN=20), DIMENSION(nfiles)  :: chtimestep = (/ 'Default', 'Default', 'Default', 'Default', 'Default', &
+                                                             'Default', 'Default', 'Default', 'Default' /)
     LOGICAL, DIMENSION(nfiles)            :: phys_out_filekeys
     LOGICAL, DIMENSION(nfiles)            :: phys_out_filestations
@@ -274 +274 @@
 
        ! Calculate ecrit_files for all files
-       IF ( chtimestep(iff).eq.'DefFreq' ) then
-          ! Par defaut ecrit_files = (ecrit_mensuel ecrit_jour ecrit_hf ...)*86400.
+      IF ( chtimestep(iff).eq.'Default' ) then
+          ! Par defaut ecrit_files = (ecrit_mensuel ecrit_jour ecrit_hf
+          ! ...)*86400.
           ecrit_files(iff)=ecrit_files(iff)*86400.
-       ELSE
-          CALL convers_timesteps(chtimestep(iff),dtime,ecrit_files(iff)) 
-       ENDIF
+      else
+       CALL convers_timesteps(chtimestep(iff),dtime,ecrit_files(iff)) 
+      ENDIF
+
        WRITE(lunout,*)'ecrit_files(',iff,')= ',ecrit_files(iff)
-
        zoutm(iff) = ecrit_files(iff) ! Frequence ou l on ecrit en seconde
-
 
 #ifdef CPP_XIOS