Changeset 1654 for trunk

Timestamp:

2009-10-14T16:20:38+02:00 (15 years ago)

Author:

cetlod

Message:

Phase the Offline module dianam.F90 with the the Online's one see ticket:557

File:

• trunk/NEMO/OFF_SRC/DIA/dianam.F90 (modified) (2 diffs)

trunk/NEMO/OFF_SRC/DIA/dianam.F90

@@ -48 +48 @@
 
       !! * Local declarations
-      CHARACTER (len=8) ::   clexper
       CHARACTER (len=2) ::   clave
       CHARACTER (len=5) ::   clout
-      CHARACTER (len=6) ::   clsuff
-      INTEGER :: jt, jc, jd, je            ! dummy loop indices
-      INTEGER ::   &
-         ic, id, ie, ig, ijjmm, iout,   &  ! temporary integers
-         iyear1, imonth1, iday1,        &  !    "          "
-         iyear2, imonth2, iday2            !    "          "
-      REAL(wp) ::   &
-         z5j, znbsec, zdate1, zdate2, zdrun, zdt   ! temporary scalars
+      INTEGER :: jt                       ! dummy loop indices
+      INTEGER :: ig, ijjmm, iout          ! temporary integers
+      INTEGER :: iyear1, imonth1, iday1   !    "          "
+      INTEGER :: iyear2, imonth2, iday2   !    "          "
+      REAL(wp) ::  z5j, znbsec, zdate1, zdate2, zdrun, zdt   ! temporary scalars
       !!----------------------------------------------------------------------
 
@@ -277 +273 @@
       ENDIF
 #endif
-      DO jc = 1, 8
-         IF( cexper(jc:jc)==' ' ) go to 120
-      END DO
-120   CONTINUE
-      ic = jc
-      clexper = cexper
-      IF( jc-1 == 0 ) THEN
-         clexper = 'orcafile'
-         ic = 9
-      ENDIF
-      DO jd = 1, 6
-         IF( cdsuff(jd:jd) == ' ' ) go to 130
-      END DO
-130   CONTINUE
-      id = jd
-      clsuff = cdsuff
-      IF( jd-1 == 0 ) THEN
-          clsuff = 'output'
-          id = 7
-      ENDIF
-      DO je = 1, 45
-        IF( cdfnam(je:je) == ' ' ) go to 140
-      END DO
-140   CONTINUE
-      ie = je
       IF( iout == 0 ) THEN 
-         cdfnam=clexper(1:ic-1)//"_"//clave//cdfnam(1:ie-1)//clsuff(1:id-1)
+         cdfnam = TRIM(cexper)//"_"//clave//TRIM(cdfnam)//TRIM(cdsuff)
       ELSE 
-         cdfnam=clexper(1:ic-1)//"_"//clave//clout(1:ig)//cdfnam(1:ie-1)//clsuff(1:id-1)
-      ENDIF
+         cdfnam = TRIM(cexper)//"_"//clave//TRIM(clout)//TRIM(cdfnam)//TRIM(cdsuff)
+      ENDIF
+
       IF(lwp) WRITE(numout,*) cdfnam     
       IF(lwp) WRITE(numout,*)