Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

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/DYN/dynspg.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -15 +15 @@
    USE dom_oce        ! ocean space and time domain variables
    USE phycst         ! physical constants
-   USE obc_oce        ! ocean open boundary conditions
    USE sbc_oce        ! surface boundary condition: ocean
    USE sbcapr         ! surface boundary condition: atmospheric pressure
@@ -29 +28 @@
    USE lib_mpp        ! MPP library
    USE solver          ! solver initialization
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
+
 
    IMPLICIT NONE
@@ -74 +76 @@
       !!        of the physical meaning of the results. 
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   ztrdu => wrk_3d_4 , ztrdv => wrk_3d_5    ! 3D workspace
       !
       INTEGER, INTENT(in   ) ::   kt       ! ocean time-step index
@@ -82 +82 @@
       INTEGER  ::   ji, jj, jk                             ! dummy loop indices
       REAL(wp) ::   z2dt, zg_2                             ! temporary scalar
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(3, 4,5) ) THEN
-         CALL ctl_stop('dyn_spg: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
+      !!----------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_spg')
+      !
 
 !!gm NOTA BENE : the dynspg_exp and dynspg_ts should be modified so that 
@@ -94 +94 @@
 
       IF( l_trddyn )   THEN                      ! temporary save of ta and sa trends
+         CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
          ztrdu(:,:,:) = ua(:,:,:)
          ztrdv(:,:,:) = va(:,:,:)
@@ -149 +150 @@
          END SELECT
          CALL trd_mod( ztrdu, ztrdv, jpdyn_trd_spg, 'DYN', kt )
+         !
+         CALL wrk_dealloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
       ENDIF
       !                                          ! print mean trends (used for debugging)
@@ -154 +157 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF( wrk_not_released(3, 4,5) )   CALL ctl_stop('dyn_spg: failed to release workspace arrays')
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_spg')
       !
    END SUBROUTINE dyn_spg
@@ -168 +171 @@
       INTEGER ::   ioptio
       !!----------------------------------------------------------------------
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_spg_init')
+      !
       IF(lwp) THEN             ! Control print
          WRITE(numout,*)
@@ -221 +226 @@
          IF( .NOT.ln_dynadv_vec )   CALL ctl_stop( 'Flux form not implemented for this free surface formulation' )
       ENDIF
-
-#if defined key_obc
-      !                        ! Conservation of ocean volume (key_dynspg_flt)
-      IF( lk_dynspg_flt )   ln_vol_cst = .true.
-
-      !                        ! Application of Flather's algorithm at open boundaries
-      IF( lk_dynspg_flt )   ln_obc_fla = .false.
-      IF( lk_dynspg_exp )   ln_obc_fla = .true.
-      IF( lk_dynspg_ts  )   ln_obc_fla = .true.
-#endif
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_spg_init')
       !
    END SUBROUTINE dyn_spg_init