Changeset 2690 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

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/nemogcm.F90 (modified) (4 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -234 +234 @@
          IF( Agrif_Root() ) CALL nemo_partition(mppsize)
 #else
-         jpni = 1
-         jpnj = 1
+         jpni  = 1
+         jpnj  = 1
          jpnij = jpni*jpnj
 #endif
@@ -244 +244 @@
       ! than variables
       IF( Agrif_Root() ) THEN
-         jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci !: first  dim.
-         jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj !: second dim.
-         jpk = jpkdta                                           !: third dim
-         jpim1 = jpi-1                                          !: inner domain indices
-         jpjm1 = jpj-1                                          !:   "           "
-         jpkm1 = jpk-1                                          !:   "           "
-         jpij  = jpi*jpj                                        !:  jpi x j
+         jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   ! first  dim.
+         jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   ! second dim.
+         jpk = jpkdta                                             ! third dim
+         jpim1 = jpi-1                                            ! inner domain indices
+         jpjm1 = jpj-1                                            !   "           "
+         jpkm1 = jpk-1                                            !   "           "
+         jpij  = jpi*jpj                                          !  jpi x j
       ENDIF
 
@@ -469 +469 @@
 
    SUBROUTINE nemo_alloc
-     !!----------------------------------------------------------------------
-     !!                     ***  ROUTINE nemo_alloc  ***
-     !!
-     !! ** Purpose :   Allocate all the dynamic arrays of the OPA modules
-     !!
-     !! ** Method  :
-     !!----------------------------------------------------------------------
-     USE diawri,       ONLY: dia_wri_alloc
-     USE dom_oce,      ONLY: dom_oce_alloc
-     USE ldfdyn_oce,   ONLY: ldfdyn_oce_alloc
-     USE ldftra_oce,   ONLY: ldftra_oce_alloc
-     USE trc_oce,      ONLY: trc_oce_alloc
-
-      USE wrk_nemo,    ONLY: wrk_alloc
-
+      !!----------------------------------------------------------------------
+      !!                     ***  ROUTINE nemo_alloc  ***
+      !!
+      !! ** Purpose :   Allocate all the dynamic arrays of the OPA modules
+      !!
+      !! ** Method  :
+      !!----------------------------------------------------------------------
+      USE diawri    , ONLY: dia_wri_alloc
+      USE dom_oce   , ONLY: dom_oce_alloc
+      USE ldfdyn_oce, ONLY: ldfdyn_oce_alloc
+      USE ldftra_oce, ONLY: ldftra_oce_alloc
+      USE trc_oce   , ONLY: trc_oce_alloc
+      USE wrk_nemo  , ONLY: wrk_alloc
+      !
       INTEGER :: ierr
-      INTEGER :: i
-      !!----------------------------------------------------------------------
-
+      !!----------------------------------------------------------------------
+      !
       ierr =        oce_alloc       ()          ! ocean 
       ierr = ierr + dia_wri_alloc   ()
@@ -497 +495 @@
       ierr = ierr + lib_mpp_alloc   (numout)    ! mpp exchanges
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
-
+      !
       ierr = ierr + wrk_alloc(numout, lwp)      ! workspace
-
+      !
       IF( lk_mpp    )   CALL mpp_sum( ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'nemo_alloc : unable to allocate standard ocean arrays' )