Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -82 +82 @@
     INTEGER :: inbsel, jk
     INTEGER :: iyear,imon,iday
+    INTEGER :: ialloc
     REAL(wp) :: zdtj
     CHARACTER(LEN=80) :: clname
@@ -88 +89 @@
     CHARACTER(LEN= 4) :: clver
     !!----------------------------------------------------------------------
+    IF( nn_timing == 1 )   CALL timing_start('dia_wri')
     !
     !  Initialization
     !  ---------------
     !
-    IF(.not.ALLOCATED(um))THEN
+    IF( .NOT. ALLOCATED(um) )THEN
        ALLOCATE(um(jpi,jpj,jpk), vm(jpi,jpj,jpk), &
                 wm(jpi,jpj,jpk),                  &
@@ -98 +100 @@
                 tm(jpi,jpj,jpk), sm(jpi,jpj,jpk), &
                 fsel(jpi,jpj,jpk),                &
-                Stat=jk)
-       IF(jk /= 0)THEN
-          WRITE(*,*) 'ERROR: allocate failed in dia_wri (diawri_dimg.h90)'
-          CALL mppabort()
-       END IF
-    END IF
+                STAT=ialloc )
+       !
+       IF( lk_mpp      )   CALL mpp_sum ( ialloc  )
+       IF( ialloc /= 0 )   CALL ctl_warn('dia_wri( diawri_dimg.h90) : failed to allocate arrays')
+    ENDIF
+
 
     inbsel = 17
@@ -152 +154 @@
        wm(:,:,:)=wm(:,:,:) + wn (:,:,:)
        avtm(:,:,:)=avtm(:,:,:) + avt (:,:,:)
-       tm(:,:,:)=tm(:,:,:) + tn (:,:,:)
-       sm(:,:,:)=sm(:,:,:) + sn (:,:,:)
+       tm(:,:,:)=tm(:,:,:) + tsn(:,:,:,jp_tem)
+       sm(:,:,:)=sm(:,:,:) + tsn(:,:,:,jp_sal)
        !
        fsel(:,:,1 ) = fsel(:,:,1 ) + utau(:,:) * umask(:,:,1)
@@ -159 +161 @@
        fsel(:,:,3 ) = fsel(:,:,3 ) + qsr (:,:) + qns  (:,:) 
        fsel(:,:,4 ) = fsel(:,:,4 ) + ( emp(:,:)-rnf(:,:) ) 
-       !        fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1)  !RB not used
+       !        fsel(:,:,5 ) = fsel(:,:,5 ) + tsb(:,:,1,jp_tem)  !RB not used
        fsel(:,:,6 ) = fsel(:,:,6 ) + sshn(:,:) 
        fsel(:,:,7 ) = fsel(:,:,7 ) + qsr(:,:)
@@ -226 +228 @@
           fsel(:,:,3 ) = (qsr (:,:) + qns (:,:)) * tmask(:,:,1)
           fsel(:,:,4 ) = ( emp(:,:)-rnf(:,:) ) * tmask(:,:,1) 
-          !         fsel(:,:,5 ) = (tb  (:,:,1) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1) !RB not used
+          !         fsel(:,:,5 ) = (tsb(:,:,1,jp_tem) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1) !RB not used
 
           fsel(:,:,6 ) = sshn(:,:)
@@ -302 +304 @@
 
        IF( ll_dia_inst) THEN
-          CALL dia_wri_dimg(clname, cltext, tn, jpk, 'T')
-       ELSE
-          CALL dia_wri_dimg(clname, cltext, tm, jpk, 'T')
+          CALL dia_wri_dimg(clname, cltext, tsn(:,:,:,jp_tem), jpk, 'T')
+       ELSE
+          CALL dia_wri_dimg(clname, cltext, tm               , jpk, 'T')
        ENDIF
        !
@@ -314 +316 @@
 
        IF( ll_dia_inst) THEN
-          CALL dia_wri_dimg(clname, cltext, sn, jpk, 'T')
-       ELSE
-          CALL dia_wri_dimg(clname, cltext, sm, jpk, 'T')
+          CALL dia_wri_dimg(clname, cltext, tsn(:,:,:,jp_sal), jpk, 'T')
+       ELSE
+          CALL dia_wri_dimg(clname, cltext, sm               , jpk, 'T')
        ENDIF
        !
@@ -357 +359 @@
     ENDIF
     !
+    IF( nn_timing == 1 )   CALL timing_stop('dia_wri')
+    !
 9000 FORMAT(a,"_",a,"_y",i4.4,"m",i2.2,"d",i2.2,".dimgproc")
     !