Changeset 15 for trunk/NEMO/OPA_SRC/mppini.F90

Timestamp:

2004-02-17T08:25:44+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/mppini.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/mppini.F90

@@ -31 +31 @@
 CONTAINS
 
-#if ! defined key_mpp
+#if ! defined key_mpp_mpi   &&   ! defined key_mpp_shmem
    !!----------------------------------------------------------------------
    !!   Default option :                            shared memory computing
@@ -47 +47 @@
       !! History :
       !!   9.0  !  04-01  (G. Madec, J.M. Molines)  F90 : free form, north fold jpni >1
-      !!----------------------------------------------------------------------
-      !!  OPA 9.0, LODYC-IPSL (2004)
       !!----------------------------------------------------------------------
       ! No mpp computation
@@ -88 +86 @@
 #else
    !!----------------------------------------------------------------------
-   !!   'key_mpp' :                            distributed memory computing
+   !!   'key_mpp_mpi'          OR         MPI massively parallel processing
+   !!   'key_mpp_shmem'                 SHMEM massively parallel processing
    !!----------------------------------------------------------------------
 
@@ -140 +139 @@
       !!----------------------------------------------------------------------
 
-#if defined key_mpp_pvm
-      IF(lwp)WRITE(numout,*)
-      IF(lwp)WRITE(numout,*) 'mpp_init : Message Passing PVM'
-      IF(lwp)WRITE(numout,*) '~~~~~~~~'
-#endif
 #if defined key_mpp_shmem
       IF(lwp)WRITE(numout,*)
@@ -156 +150 @@
       IF(lwp)WRITE(numout,*)
       IF(lwp)WRITE(numout,*) 'mpp_init : Message Passing MPI'
-      IF(lwp)WRITE(numout,*) '~~~~~~~~'
-#endif
-#if ! defined key_mpp_pvm &&  ! defined key_mpp_mpi && ! defined key_mpp_shmem
-      IF(lwp)WRITE(numout,*)
-      IF(lwp)WRITE(numout,*) 'mpp_init : Message Passing PVM onto T3E'
       IF(lwp)WRITE(numout,*) '~~~~~~~~'
 #endif