Changeset 1191

Timestamp:

2008-09-18T10:33:07+02:00 (16 years ago)

Author:

smasson

Message:

improve control print for debugging ticket #252

Location:

trunk/NEMO/OPA_SRC

Files:

• IOM/iom.F90 (modified) (1 diff)
• SBC/fldread.F90 (modified) (9 diffs)
• daymod.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/IOM/iom.F90

@@ -609 +609 @@
 
          IF( istop == nstop ) THEN   ! no additional errors until this point...
-            IF(lwp) WRITE(numout,*) '           read '//TRIM(cdvar)//' in '//TRIM(iom_file(kiomid)%name)//' ok'
-            
+            IF(lwp) WRITE(numout,"(10x,' read ',a,' (rec: ',i4,') in ',a,' ok')") TRIM(cdvar), itime, TRIM(iom_file(kiomid)%name)
+          
             !--- overlap areas and extra hallows (mpp)
             IF(     PRESENT(pv_r2d) .AND. idom /= jpdom_unknown ) THEN

trunk/NEMO/OPA_SRC/SBC/fldread.F90

@@ -79 +79 @@
       REAL(wp) ::   ztinta     ! ratio applied to after  records when doing time interpolation
       REAL(wp) ::   ztintb     ! ratio applied to before records when doing time interpolation
+      CHARACTER(LEN=1000) ::   clfmt   ! write format
       !!---------------------------------------------------------------------
       !                                         ! ===================== !
@@ -104 +105 @@
 
                ! last record to be read in the current file
-               IF( sd(jf)%freqh == -1. ) THEN     ;          zreclast = 12.
+               IF( sd(jf)%freqh == -1. ) THEN             ;   zreclast = 12.
                ELSE                             
                   IF( sd(jf)%cltype == 'monthly' ) THEN   ;   zreclast = 24. / sd(jf)%freqh * REAL( nmonth_len(nmonth), wp )
@@ -139 +140 @@
                ! to the NEW year/month. If it is the case, we are at the beginning of the year/month when calling fld_rec
                ! so sd(jf)%rec_a(1) = 1
-               IF( sd(jf)%rec_a(1) == 1 )   CALL fld_clopn( sd(jf), nyear, nmonth )   ! back to the current year/month
+               IF( sd(jf)%rec_a(1) == 1 )   CALL fld_clopn( sd(jf), nyear, nmonth )
             ENDIF
 
@@ -151 +152 @@
             !
             IF( sd(jf)%ln_tint ) THEN
-               IF(lwp .AND. kt - nit000 <= 100 )   WRITE(numout,*)'fld_read: var ', TRIM( sd(jf)%clvar ),           &
-                  & ' kt = ', kt,' Y/M/D = ', nyear,'/', nmonth,'/', nday,' records b/a:', NINT(sd(jf)%rec_b(1)),   &
-                  & '/', NINT(sd(jf)%rec_a(1)), ' (', sd(jf)%rec_b(2)/rday,'/', sd(jf)%rec_a(2)/rday, ' days)'
+               IF(lwp .AND. kt - nit000 <= 100 ) THEN 
+                  clfmt = "('fld_read: var ', a, ' kt = ', i8,' Y/M/D = ', i4.4,'/', i2.2,'/', i2.2," //   &
+                     &    "' records b/a: ', i4.4, '/', i4.4, ' (', f7.2,'/', f7.2, ' days)')"
+                  WRITE(numout, clfmt)  TRIM( sd(jf)%clvar ), kt, nyear, nmonth, nday,   &
+                     & NINT(sd(jf)%rec_b(1)), NINT(sd(jf)%rec_a(1)), sd(jf)%rec_b(2)/rday, sd(jf)%rec_a(2)/rday
+               ENDIF
                !
                ztinta =  ( rsec_year + sec1jan000 - sd(jf)%rec_b(2) ) / ( sd(jf)%rec_a(2) - sd(jf)%rec_b(2) )
@@ -160 +164 @@
                sd(jf)%fnow(:,:) = ztintb * sd(jf)%fdta(:,:,1) + ztinta * sd(jf)%fdta(:,:,2)
             ELSE
-               IF(lwp .AND. kt - nit000 <= 100 )   WRITE(numout,*)'fld_read: var ', TRIM( sd(jf)%clvar ),        &
-                  & ' kt = ', kt, ' Y/M/D = ', nyear,'/', nmonth,'/', nday, ' record :', INT(sd(jf)%rec_a(1)),   &
-                  & ' at ', sd(jf)%rec_a(2)/rday, 'day'
+               IF(lwp .AND. kt - nit000 <= 100 ) THEN
+                  clfmt = "('fld_read: var ', a, ' kt = ', i8,' Y/M/D = ', i4.4,'/', i2.2,'/', i2.2," //   &
+                     &    "' record: ', i4.4, ' at ', f7.2, ' day')"
+                  WRITE(numout, clfmt)  TRIM(sd(jf)%clvar), kt, nyear, nmonth, nday, NINT(sd(jf)%rec_a(1)), sd(jf)%rec_a(2)/rday
+               ENDIF
 !CDIR COLLAPSE
                sd(jf)%fnow(:,:) = sd(jf)%fdta(:,:,2)   ! piecewise constant field
@@ -194 +200 @@
       INTEGER :: idvar          ! variable id 
       INTEGER :: inrec          ! number of record existing for this variable
+      CHARACTER(LEN=1000) ::   clfmt   ! write format
       !!---------------------------------------------------------------------
 
@@ -208 +215 @@
          
          IF( sdjf%rec_b(1) == 0.e0 ) THEN   ! we redefine record sdjf%rec_b(1) with the last record of previous year file
-            IF( sdjf%freqh == -1. ) THEN   ! monthly mean
+            IF( sdjf%freqh == -1. ) THEN    ! monthly mean
                sdjf%rec_b(1) = 12.          ! force to read december mean
             ELSE   
@@ -244 +251 @@
          CALL iom_get( sdjf%num, jpdom_data, sdjf%clvar, sdjf%fdta(:,:,2), NINT( sdjf%rec_b(1) ) )
 
-         IF(lwp) WRITE(numout,*)'fld_init : time-interpolation for ', TRIM( sdjf%clvar ),   &
-            &   ' read previous record =', NINT(sdjf%rec_b(1)), ' at time = ', sdjf%rec_b(2)/rday, ' days'
+         clfmt = "('fld_init : time-interpolation for ', a, ' read previous record = ', i4, ' at time = ', f7.2, ' days')"
+         IF(lwp) WRITE(numout, clfmt) TRIM(sdjf%clvar), NINT(sdjf%rec_b(1)), sdjf%rec_b(2)/rday
 
          IF( llprev )   CALL iom_close( sdjf%num )   ! close previous year file (-> redefine sdjf%num to 0)
@@ -299 +306 @@
 
          sdjf%rec_a(:) = (/ REAL( irec, wp ), rmonth_half(irec) /)   ! define after  record number and time
-         irec = irec - 1                                             ! move back to previous record
+         irec = irec - 1                                                          ! move back to previous record
          sdjf%rec_b(:) = (/ REAL( irec, wp ), rmonth_half(irec) /)   ! define before record number and time
          !

trunk/NEMO/OPA_SRC/daymod.F90

@@ -124 +124 @@
 
       ! control print
-      IF(lwp) WRITE(numout,*)' ==============>> One time step before the start of the run DATE Y/M/D = ',   &
+      IF(lwp) WRITE(numout,*)' ==============>> 1/2 time step before the start of the run DATE Y/M/D = ',   &
            &                   nyear, '/', nmonth, '/', nday, '  rsec_day:', rsec_day
       
@@ -232 +232 @@
          ndastp = nyear * 10000 + nmonth * 100 + nday   ! NEW date
          !
-         IF(lwp) WRITE(numout,'(a,i8,a,i4,a,i2,a,i2,a,i3)') '======>> time-step =', kt,   &
+         IF(lwp) WRITE(numout,'(a,i8,a,i4.4,a,i2.2,a,i2.2,a,i3.3)') '======>> time-step =', kt,   &
               &   '      New day, DATE Y/M/D = ', nyear, '/', nmonth, '/', nday, '      nday_year = ', nday_year
          IF(lwp) WRITE(numout,'(a,F9.0,a,F9.0,a,F9.0)') '         rsec_year = ', rsec_year,   &