Changeset 1601 for trunk/NEMO/OPA_SRC/lib_mpp.F90

Timestamp:

2009-08-11T12:09:19+02:00 (15 years ago)

Author:

ctlod

Message:

Doctor naming of OPA namelist variables , see ticket: #526

File:

• trunk/NEMO/OPA_SRC/lib_mpp.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -139 +139 @@
 
    ! Type of send : standard, buffered, immediate
-   CHARACTER(len=1) ::   c_mpi_send = 'S'    ! type od mpi send/recieve (S=standard, B=bsend, I=isend)
-   LOGICAL          ::   l_isend = .FALSE.   ! isend use indicator (T if c_mpi_send='I')
+   CHARACTER(len=1) ::   cn_mpi_send = 'S'    ! type od mpi send/recieve (S=standard, B=bsend, I=isend)
+   LOGICAL          ::   l_isend = .FALSE.   ! isend use indicator (T if cn_mpi_send='I')
    INTEGER          ::   nn_buffer = 0       ! size of the buffer in case of mpi_bsend 
       
@@ -177 +177 @@
       LOGICAL ::   mpi_was_called
       
-      NAMELIST/nam_mpp/ c_mpi_send, nn_buffer
+      NAMELIST/nammpp/ cn_mpi_send, nn_buffer
       !!----------------------------------------------------------------------
       !
@@ -183 +183 @@
       WRITE(ldtxt(2),*) 'mynode : mpi initialisation'
       WRITE(ldtxt(3),*) '~~~~~~ '
-      WRITE(ldtxt(4),*)
       !
       REWIND( numnam )               ! Namelist namrun : parameters of the run
-      READ  ( numnam, nam_mpp )
+      READ  ( numnam, nammpp )
       !                              ! control print
-      WRITE(ldtxt(5),*) '        Namelist nam_mpp'
-      WRITE(ldtxt(6),*) '           mpi send type            c_mpi_send = ', c_mpi_send
+      WRITE(ldtxt(4),*) '   Namelist nammpp'
+      WRITE(ldtxt(5),*) '      mpi send type                      cn_mpi_send = ', cn_mpi_send
+      WRITE(ldtxt(6),*) '      size in bytes of exported buffer   nn_buffer   = ', nn_buffer
 
 #if defined key_agrif
@@ -205 +205 @@
          IF( PRESENT(localComm) .and. mpi_was_called ) THEN
             mpi_comm_opa = localComm
-            SELECT CASE ( c_mpi_send )
+            SELECT CASE ( cn_mpi_send )
             CASE ( 'S' )                ! Standard mpi send (blocking)
                WRITE(ldtxt(7),*) '           Standard blocking mpi send (send)'
@@ -216 +216 @@
             CASE DEFAULT
                WRITE(ldtxt(7),cform_err)
-               WRITE(ldtxt(8),*) '           bad value for c_mpi_send = ', c_mpi_send
+               WRITE(ldtxt(8),*) '           bad value for cn_mpi_send = ', cn_mpi_send
                nstop = nstop + 1
             END SELECT
@@ -225 +225 @@
          ELSE
 #endif
-            SELECT CASE ( c_mpi_send )
+            SELECT CASE ( cn_mpi_send )
             CASE ( 'S' )                ! Standard mpi send (blocking)
                WRITE(ldtxt(7),*) '           Standard blocking mpi send (send)'
@@ -238 +238 @@
             CASE DEFAULT
                WRITE(ldtxt(7),cform_err)
-               WRITE(ldtxt(8),*) '           bad value for c_mpi_send = ', c_mpi_send
+               WRITE(ldtxt(8),*) '           bad value for cn_mpi_send = ', cn_mpi_send
                nstop = nstop + 1
             END SELECT
@@ -254 +254 @@
 #if defined key_agrif
       ELSE
-         SELECT CASE ( c_mpi_send )
+         SELECT CASE ( cn_mpi_send )
          CASE ( 'S' )                ! Standard mpi send (blocking)
             WRITE(ldtxt(7),*) '           Standard blocking mpi send (send)'
@@ -264 +264 @@
          CASE DEFAULT
             WRITE(ldtxt(7),cform_err)
-            WRITE(ldtxt(8),*) '           bad value for c_mpi_send = ', c_mpi_send
+            WRITE(ldtxt(8),*) '           bad value for cn_mpi_send = ', cn_mpi_send
             nstop = nstop + 1
          END SELECT
@@ -1044 +1044 @@
       !!----------------------------------------------------------------------
       !
-      SELECT CASE ( c_mpi_send )
+      SELECT CASE ( cn_mpi_send )
       CASE ( 'S' )                ! Standard mpi send (blocking)
          CALL mpi_send ( pmess, kbytes, mpi_double_precision, kdest , ktyp, mpi_comm_opa        , iflag )