Changeset 2618 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90

Timestamp:

2011-02-26T13:31:38+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move dyn allocation from nemogcm to module when possible (continuation)

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) (8 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90

@@ -4 +4 @@
    !! Ocean dynamics:  lateral viscosity trend
    !!======================================================================
+   !! History :  OPA  !  97-07  (G. Madec)  Original code
+   !!  NEMO      1.0  !  2002-08  (G. Madec)  F90: Free form and module
+   !!             -   !  2004-08  (C. Talandier) New trends organization
+   !!            2.0  !  2005-11  (G. Madec)  s-coordinate: horizontal diffusion
+   !!----------------------------------------------------------------------
 #if defined key_ldfslp   ||   defined key_esopa
    !!----------------------------------------------------------------------
@@ -12 +17 @@
    !!                  tal s-coordinate laplacian operator.
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
@@ -28 +32 @@
    PRIVATE
 
-   !! * Routine accessibility
-   PUBLIC dyn_ldf_iso           ! called by step.F90
-   PUBLIC dyn_ldf_iso_alloc     ! called by nemogcm.F90
-
-   ! These are just workspace arrays but because they are (jpi,jpk) in extent
-   ! we can't use the arrays in wrk_nemo for them
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: zfuw, zdiu, zdju, zdj1u
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: zfvw, zdiv, zdjv, zdj1v
+   PUBLIC   dyn_ldf_iso           ! called by step.F90
+   PUBLIC   dyn_ldf_iso_alloc     ! called by nemogcm.F90
+
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: zfuw, zdiu, zdju, zdj1u   ! 2D workspace (dyn_ldf_iso) 
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: zfvw, zdiv, zdjv, zdj1v   !  -      -
 
    !! * Substitutions
@@ -42 +43 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! NEMO/OPA 3.3 , NEMO Consortium (2011)
    !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
-   !!----------------------------------------------------------------------
-
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
-   FUNCTION dyn_ldf_iso_alloc()
+   INTEGER FUNCTION dyn_ldf_iso_alloc()
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dyn_ldf_iso_alloc  ***
       !!----------------------------------------------------------------------
-      INTEGER :: dyn_ldf_iso_alloc
-      !!----------------------------------------------------------------------
-
-      ALLOCATE(zfuw(jpi,jpk), zdiu(jpi,jpk), zdju(jpi,jpk), zdj1u(jpi,jpk), & 
-               zfvw(jpi,jpk), zdiv(jpi,jpk), zdjv(jpi,jpk), zdj1v(jpi,jpk), &
-               Stat=dyn_ldf_iso_alloc)
-
-      IF(dyn_ldf_iso_alloc /= 0)THEN
-         CALL ctl_warn('dyn_ldf_iso_alloc: array allocate failed.')
-      END IF
-
+      !
+      ALLOCATE( zfuw(jpi,jpk) , zdiu(jpi,jpk) , zdju(jpi,jpk) , zdj1u(jpi,jpk) ,     & 
+         &      zfvw(jpi,jpk) , zdiv(jpi,jpk) , zdjv(jpi,jpk) , zdj1v(jpi,jpk) , STAT=dyn_ldf_iso_alloc)
+         !
+      IF( dyn_ldf_iso_alloc /= 0 )   CALL ctl_warn('dyn_ldf_iso_alloc: array allocate failed.')
+      !
    END FUNCTION dyn_ldf_iso_alloc
 
@@ -110 +105 @@
       !!        Update (avmu,avmv) to accompt for the diagonal vertical component
       !!      of the rotated operator in dynzdf module
-      !!
-      !! History :
-      !!   8.0  !  97-07  (G. Madec)  Original code
-      !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
-      !!   9.0  !  04-08  (C. Talandier) New trends organization
-      !!        !  05-11  (G. Madec)  s-coordinate: horizontal diffusion
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_use, wrk_release
-      USE wrk_nemo, ONLY: ziut => wrk_2d_1, zjuf  => wrk_2d_2, & ! temporary workspace
-                          zjvt => wrk_2d_3, zivf  => wrk_2d_4, & 
-                          zdku => wrk_2d_5, zdk1u => wrk_2d_6, &
-                          zdkv => wrk_2d_7, zdk1v => wrk_2d_8
-      !!
-      !! * Arguments
-      INTEGER, INTENT( in ) ::   kt       ! ocean time-step index
-
-      !! * Local declarations
-      INTEGER  ::   ji, jj, jk            ! dummy loop indices
-      REAL(wp) ::   &
-         zabe1, zabe2, zcof1, zcof2,   &  ! temporary scalars
-         zmskt, zmskf, zbu, zbv,       &
-         zuah, zvah
-
-      REAL(wp) ::   &
-         zcoef0, zcoef3, zcoef4, zmkt, zmkf,   &
-         zuav, zvav, zuwslpi, zuwslpj, zvwslpi, zvwslpj
-
+      USE wrk_nemo, ONLY:   wrk_use, wrk_release
+      USE wrk_nemo, ONLY:   ziut  => wrk_2d_1 , zjuf  => wrk_2d_2 , zjvt => wrk_2d_3    ! 2D workspace
+      USE wrk_nemo, ONLY:   zivf  => wrk_2d_4 , zdku  => wrk_2d_5 , zdkv => wrk_2d_6    ! 2D workspace
+      USE wrk_nemo, ONLY:   zdk1u => wrk_2d_7 , zdk1v => wrk_2d_8
+      !
+      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
+      !
+      INTEGER  ::   ji, jj, jk   ! dummy loop indices
+      REAL(wp) ::   zabe1, zabe2, zcof1, zcof2                       ! local scalars
+      REAL(wp) ::   zmskt, zmskf, zbu, zbv, zuah, zvah               !   -      -
+      REAL(wp) ::   zcoef0, zcoef3, zcoef4, zmkt, zmkf               !   -      -
+      REAL(wp) ::   zuav, zvav, zuwslpi, zuwslpj, zvwslpi, zvwslpj   !   -      -
       !!----------------------------------------------------------------------
 
-      IF( .NOT. wrk_use(2, 1,2,3,4,5,6,7,8))THEN
-         CALL ctl_stop('dyn_ldf_iso: requested workspace arrays unavailable.')
-         RETURN
+      IF( .NOT. wrk_use(2, 1,2,3,4,5,6,7,8) ) THEN
+         CALL ctl_stop('dyn_ldf_iso: requested workspace arrays unavailable.')   ;   RETURN
       END IF
 
@@ -148 +128 @@
          IF(lwp) WRITE(numout,*) 'dyn_ldf_iso : iso-neutral laplacian diffusive operator or '
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate horizontal diffusive operator'
+         !                                      ! allocate dyn_ldf_bilap arrays
+         IF( dyn_ldf_iso_alloc() /= 0 )   CALL ctl_stop('STOP', 'dyn_ldf_iso: failed to allocate arrays')
       ENDIF
 
-!     ! s-coordinate: Iso-level diffusion on momentum but not on tracer
+      ! s-coordinate: Iso-level diffusion on momentum but not on tracer
       IF( ln_dynldf_hor .AND. ln_traldf_iso ) THEN
- 
-         ! set the slopes of iso-level
-         DO jk = 1, jpk
+         !
+         DO jk = 1, jpk         ! set the slopes of iso-level
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -164 +145 @@
             END DO
          END DO
- 
          ! Lateral boundary conditions on the slopes
          CALL lbc_lnk( uslp , 'U', -1. )      ;      CALL lbc_lnk( vslp , 'V', -1. )
@@ -170 +150 @@
  
 !!bug
-         if( kt == nit000 ) then
-            IF(lwp) WRITE(numout,*) ' max slop: u',SQRT( MAXVAL(uslp*uslp)), ' v ', SQRT(MAXVAL(vslp)),  &
-               &                             ' wi', sqrt(MAXVAL(wslpi)), ' wj', sqrt(MAXVAL(wslpj))
+         IF( kt == nit000 ) then
+            IF(lwp) WRITE(numout,*) ' max slop: u', SQRT( MAXVAL(uslp*uslp)), ' v ', SQRT(MAXVAL(vslp)),  &
+               &                             ' wi', sqrt(MAXVAL(wslpi))     , ' wj', sqrt(MAXVAL(wslpj))
          endif
 !!end