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

Timestamp:

2011-03-15T16:27:46+01:00 (12 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/OFF_SRC/nemogcm.F90 (modified) (6 diffs)

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

@@ -41 +41 @@
    USE lib_mpp         ! distributed memory computing
 #if defined key_iomput
-   USE  mod_ioclient
+   USE mod_ioclient
 #endif 
 
@@ -165 +165 @@
       ! This used to be done in par_oce.F90 when they were parameters rather
       ! than variables
-      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
 
 
@@ -341 +341 @@
    END SUBROUTINE nemo_closefile
 
+
    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 zdf_oce,      ONLY: zdf_oce_alloc
-     USE zdfmxl,       ONLY: zdf_mxl_alloc
-     USE ldftra_oce,   ONLY: ldftra_oce_alloc
-     USE trc_oce,      ONLY: trc_oce_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 zdf_oce,      ONLY: zdf_oce_alloc
+      USE zdfmxl,       ONLY: zdf_mxl_alloc
+      USE ldftra_oce,   ONLY: ldftra_oce_alloc
+      USE trc_oce,      ONLY: trc_oce_alloc
       USE wrk_nemo,    ONLY: wrk_alloc
-
+      !
       INTEGER :: ierr
       !!----------------------------------------------------------------------
-
+      !
       ierr =        oce_alloc       ()          ! ocean 
       ierr = ierr + dia_wri_alloc   ()
@@ -371 +371 @@
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
       ierr = ierr + wrk_alloc(numout, lwp)
-
+      !
       IF( lk_mpp    )   CALL mpp_sum( ierr )
-      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'nemo_alloc : unable to allocate standard ocean arrays' )
+      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'nemo_alloc: unable to allocate standard ocean arrays' )
       !
    END SUBROUTINE nemo_alloc
+
 
    SUBROUTINE nemo_partition( num_pes )
@@ -423 +424 @@
    END SUBROUTINE nemo_partition
 
+
    SUBROUTINE factorise( kfax, kmaxfax, knfax, kn, kerr )
       !!----------------------------------------------------------------------
@@ -439 +441 @@
       INTEGER, PARAMETER :: ntest = 14
       INTEGER :: ilfax(ntest)
-
+      !
       ! lfax contains the set of allowed factors.
       data (ilfax(jl),jl=1,ntest) / 16384, 8192, 4096, 2048, 1024, 512, 256,  &