Changeset 2651 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2011-03-04T12:04:28+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; minor changes, style mainly

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (7 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -34 +34 @@
    PRIVATE
 
-   PUBLIC   dom_msk        ! routine called by inidom.F90
-   PUBLIC   dom_msk_alloc  ! routine called by nemogcm.F90
+   PUBLIC   dom_msk         ! routine called by inidom.F90
+   PUBLIC   dom_msk_alloc   ! routine called by nemogcm.F90
 
    !                            !!* Namelist namlbc : lateral boundary condition *
@@ -51 +51 @@
 CONTAINS
    
-   FUNCTION dom_msk_alloc()
+   INTEGER FUNCTION dom_msk_alloc()
       !!---------------------------------------------------------------------
-      !!                 ***  ROUTINE dom_msk_alloc  ***
+      !!                 ***  FUNCTION dom_msk_alloc  ***
       !!---------------------------------------------------------------------
-      INTEGER :: dom_msk_alloc
-
       dom_msk_alloc = 0
-
 #if defined key_noslip_accurate
-      ALLOCATE(icoord(jpi*jpj*jpk,3), Stat=dom_msk_alloc)
+      ALLOCATE(icoord(jpi*jpj*jpk,3), STAT=dom_msk_alloc)
 #endif
-
-      IF(dom_msk_alloc /= 0)THEN
-         CALL ctl_warn('dom_msk_alloc: failed to allocate icoord array.')
-      END IF
-
+      IF( dom_msk_alloc /= 0 )   CALL ctl_warn('dom_msk_alloc: failed to allocate icoord array')
+      !
    END FUNCTION dom_msk_alloc
 
@@ -131 +125 @@
       !!               tmask_i  : interior ocean mask
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
-      USE wrk_nemo, ONLY: zwf => wrk_2d_1
-      USE wrk_nemo, ONLY: imsk => iwrk_2d_1
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
+      USE wrk_nemo, ONLY:   zwf => wrk_2d_1
+      USE wrk_nemo, ONLY:   imsk => iwrk_2d_1
       !!
       INTEGER  ::   ji, jj, jk      ! dummy loop indices
@@ -142 +136 @@
       !!---------------------------------------------------------------------
       
-      IF( wrk_in_use(2,1) .OR. iwrk_in_use(2,1) )THEN
-         CALL ctl_stop('dom_msk: ERROR: requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(2, 1) .OR. iwrk_in_use(2, 1) )THEN
+         CALL ctl_stop('dom_msk: ERROR: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
 
       REWIND( numnam )              ! Namelist namlbc : lateral momentum boundary condition
@@ -443 +436 @@
       ENDIF
       !
-      IF( wrk_not_released(2,1) .OR. iwrk_not_released(2,1) )THEN
-         CALL ctl_stop('dom_msk: ERROR: failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 1) .OR.   &
+         iwrk_not_released(2, 1)   )   CALL ctl_stop('dom_msk: ERROR: failed to release workspace arrays')
       !
    END SUBROUTINE dom_msk
@@ -464 +456 @@
       !! ** Action :
       !!----------------------------------------------------------------------
-      INTEGER  :: ji, jj, jk, jl      ! dummy loop indices
+      INTEGER  ::   ji, jj, jk, jl      ! dummy loop indices
       INTEGER  ::   ine, inw, ins, inn, itest, ierror, iind, ijnd
       REAL(wp) ::   zaa
       !!---------------------------------------------------------------------
-      
 
       IF(lwp)WRITE(numout,*)
       IF(lwp)WRITE(numout,*) 'dom_msk_nsa : noslip accurate boundary condition'
       IF(lwp)WRITE(numout,*) '~~~~~~~~~~~   using Schchepetkin and O Brian scheme'
-      IF( lk_mpp ) CALL ctl_stop( ' mpp version is not yet implemented' )
+      IF( lk_mpp )   CALL ctl_stop( ' mpp version is not yet implemented' )
 
       ! mask for second order calculation of vorticity
@@ -628 +619 @@
          CALL ctl_stop( 'We stop...' )
       ENDIF
-
+      !
    END SUBROUTINE dom_msk_nsa