Changeset 2690 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

Timestamp:

2011-03-15T16:27:46+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; homogeneization of the coding style associated with dyn allocation

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) (4 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

@@ -26 +26 @@
       !!       ??? explanation of the default is missing
       !!----------------------------------------------------------------------
-      USE ldftra_oce, ONLY : aht0
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zcoef => wrk_1d_2
-      !!
-      LOGICAL, INTENT (in) :: ld_print   ! If true, output arrays on numout
-      !!
-      INTEGER  ::   ji, jj, jk      ! dummy loop indices
-      REAL(wp) ::   &
-         zr = 0.2 ,   &  ! maximum of the reduction factor at the bottom ocean
-         !               ! ( 0 < zr < 1 )
-         zh = 500.,   &  ! depth of at which start the reduction ( > dept(1) )
-         zd_max   ,   &  ! maximum grid spacing over the global domain
-         za00, zc, zd    ! temporary scalars
-      REAL(wp) ::        &
-         zetmax, zefmax, &
-         zeumax, zevmax   
-      !!----------------------------------------------------------------------
-
-      IF(wrk_in_use(1,2))THEN
-         CALL ctl_stop('ldf_dyn_c3d: ERROR: requested workspace array unavailable.')
-         RETURN
-      END IF
+      USE ldftra_oce, ONLY :   aht0
+      USE wrk_nemo  , ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo  , ONLY:   zcoef => wrk_1d_2
+      !!
+      LOGICAL, INTENT (in) ::   ld_print   ! If true, output arrays on numout
+      !!
+      INTEGER  ::   ji, jj, jk   ! dummy loop indices
+      REAL(wp) ::   zr = 0.2     ! maximum of the reduction factor at the bottom ocean ( 0 < zr < 1 )
+      REAL(wp) ::   zh = 500.    ! depth of at which start the reduction ( > dept(1) )
+      REAL(wp) ::   zd_max       ! maximum grid spacing over the global domain
+      REAL(wp) ::   za00, zc, zd, zetmax, zefmax, zeumax, zevmax   ! local scalars
+      !!----------------------------------------------------------------------
+
+      IF( wrk_in_use(1,2) ) THEN
+         CALL ctl_stop('ldf_dyn_c3d: requested workspace array unavailable')   ;   RETURN
+      ENDIF
 
       IF(lwp) WRITE(numout,*)
@@ -187 +181 @@
          ENDIF
       ENDIF
-
-      IF(wrk_not_released(1,2))THEN
-         CALL ctl_stop('ldf_dyn_c3d: ERROR: failed to release workspace array.')
-      END IF
-
+      !
+      IF( wrk_not_released(1,2) )   CALL ctl_stop('ldf_dyn_c3d: failed to release workspace array')
+      !
    END SUBROUTINE ldf_dyn_c3d
 
@@ -203 +195 @@
       !! ** Method  :   blah blah blah ....
       !!----------------------------------------------------------------------
-      USE ldftra_oce, ONLY : aht0
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
-      USE wrk_nemo, ONLY:  icof => iwrk_2d_1
-      USE wrk_nemo, ONLY: zahm0 =>  wrk_2d_1
-      USE wrk_nemo, ONLY: zcoef =>  wrk_1d_1
-      !!
-      LOGICAL, INTENT (in) :: ld_print   ! If true, output arrays on numout
+      USE ldftra_oce, ONLY:   aht0
+      USE wrk_nemo  , ONLY:   wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
+      USE wrk_nemo  , ONLY:   icof  => iwrk_2d_1
+      USE wrk_nemo  , ONLY:   zahm0 =>  wrk_2d_1
+      USE wrk_nemo  , ONLY:   zcoef =>  wrk_1d_1
+      !!
+      LOGICAL, INTENT(in) ::   ld_print   ! If true, output arrays on numout
       !!
       INTEGER ::   ji, jj, jk, jn      ! dummy loop indices
-      INTEGER ::   ii0, ii1, ij0, ij1  ! temporary integers
-      INTEGER ::   inum                ! temporary logical unit
-      INTEGER ::   iim, ijm
+      INTEGER ::   ii0, ii1, ij0, ij1  ! local integers
+      INTEGER ::   inum, iim, ijm      ! 
       INTEGER ::   ifreq, il1, il2, ij, ii
       INTEGER, DIMENSION(jpidta, jpjdta) ::   idata
 
-      REAL(wp) ::   &
-         zahmeq, zcoff, zcoft, zmsk,   & ! ???
-         zemax, zemin, zeref, zahmm
-
+      REAL(wp) ::   zahmeq, zcoff, zcoft, zmsk   ! local scalars
+      REAL(wp) ::   zemax , zemin, zeref, zahmm
       CHARACTER (len=15) ::   clexp
       !!----------------------------------------------------------------------
 
-      IF( iwrk_in_use(2,1) .OR. wrk_in_use(2,1) .OR. wrk_in_use(1,1) )THEN
-         CALL ctl_stop('ldf_dyn_c3d_orca: ERROR: requested workspace arrays are unavailable.')
-         RETURN
-      END IF
+      IF( iwrk_in_use(2,1) .OR. wrk_in_use(2,1) .OR. wrk_in_use(1,1) ) THEN
+         CALL ctl_stop('ldf_dyn_c3d_orca: requested workspace arrays are unavailable')   ;   RETURN
+      ENDIF
 
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'ldfdyn_c3d_orca : 3D eddy viscosity coefficient'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~'
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '        orca R1, R2 or R4 ocean model'
-      IF(lwp) WRITE(numout,*) '  reduced in the surface Eq. strip '
-      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) '        orca R1, R2 or R4 configuration: reduced in the surface Eq. strip '
 
       ! Read 2d integer array to specify western boundary increase in the
@@ -473 +458 @@
       ENDIF
 
-      IF( iwrk_not_released(2,1) .OR. wrk_not_released(2,1) .OR. &
-           wrk_not_released(1,1) )THEN
-         CALL ctl_stop('ldf_dyn_c3d_orca: ERROR: failed to release workspace arrays.')
-      END IF
-
+      IF( iwrk_not_released(2,1) .OR.   &
+           wrk_not_released(2,1) .OR.   &
+           wrk_not_released(1,1)   ) CALL ctl_stop('ldf_dyn_c3d_orca: failed to release workspace arrays')
+      !
    END SUBROUTINE ldf_dyn_c3d_orca