Changeset 3168 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

Timestamp:

2011-11-22T10:48:38+01:00 (13 years ago)

Author:

cbricaud

Message:

add timing, change dynamical allocation and correct small bugs

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) (9 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -47 +47 @@
 #endif
    USE lib_mpp         ! MPP library
+   USE timing          ! preformance summary
+   USE wrk_nemo_2      ! working array
 
    IMPLICIT NONE
@@ -114 +116 @@
       !! ** Method  :  use iom_put
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: z3d => wrk_3d_1
-      USE wrk_nemo, ONLY: z2d => wrk_2d_1
       !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
@@ -122 +121 @@
       INTEGER                      ::   ji, jj, jk              ! dummy loop indices
       REAL(wp)                     ::   zztmp, zztmpx, zztmpy   ! 
+      !!
+      REAL(wp), POINTER, DIMENSION(:,:)   :: z2d       ! 2D workspace
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: z3d      ! 3D workspace
       !!----------------------------------------------------------------------
       ! 
-      IF(  wrk_in_use(3, 1) .OR. wrk_in_use(2, 1) ) THEN
-         CALL ctl_stop('dia_wri: ERROR - requested 2D workspace unavailable.')  ;  RETURN
-      END IF
+      IF( nn_timing == 1 )   CALL timing_start('dia_wri')
+      ! 
+      CALL wrk_alloc( jpi , jpj      , z2d )
+      CALL wrk_alloc( jpi , jpj, jpk , z3d )
       !
       ! Output the initial state and forcings
@@ -197 +200 @@
       ENDIF
       !
-      IF( wrk_not_released(3, 1) .OR. wrk_not_released(2, 1) ) THEN
-         CALL ctl_stop('dia_wri: ERROR - failed to release 2D workspace.')
-         RETURN
-      END IF
+      CALL wrk_dealloc( jpi , jpj      , z2d )
+      CALL wrk_dealloc( jpi , jpj, jpk , z3d )
+      !
+      IF( nn_timing == 1 )   CALL timing_stop('dia_wri')
       !
    END SUBROUTINE dia_wri
@@ -221 +224 @@
       !!      Each nwrite time step, output the instantaneous or mean fields
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zw2d => wrk_2d_1
       !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
@@ -231 +232 @@
       INTEGER  ::   iimi, iima, ipk, it, itmod, ijmi, ijma   ! local integers
       REAL(wp) ::   zsto, zout, zmax, zjulian, zdt           ! local scalars
+      !!
+      REAL(wp), POINTER, DIMENSION(:,:)   :: zw2d       ! 2D workspace
       !!----------------------------------------------------------------------
-      !
-      IF( wrk_in_use(2, 1))THEN
-         CALL ctl_stop('dia_wri: ERROR - requested 2D workspace unavailable.')
-         RETURN
-      END IF
+      ! 
+      IF( nn_timing == 1 )   CALL timing_start('dia_wri')
+      !
+      CALL wrk_alloc( jpi , jpj      , zw2d )
       !
       ! Output the initial state and forcings
@@ -605 +607 @@
       ENDIF
       !
-      IF( wrk_not_released(2, 1))THEN
-         CALL ctl_stop('dia_wri: ERROR - failed to release 2D workspace.')
-         RETURN
-      END IF
+      CALL wrk_dealloc( jpi , jpj      , zw2d )
+      !
+      IF( nn_timing == 1 )   CALL timing_stop('dia_wri')
       !
    END SUBROUTINE dia_wri
@@ -637 +638 @@
       REAL(wp) ::   zsto, zout, zmax, zjulian, zdt
       !!----------------------------------------------------------------------
+      ! 
+      IF( nn_timing == 1 )   CALL timing_start('dia_wri_state')
 
       ! 0. Initialisation
@@ -732 +735 @@
       ENDIF
 #endif
+       
+      IF( nn_timing == 1 )   CALL timing_stop('dia_wri_state')
+      ! 
 
    END SUBROUTINE dia_wri_state