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

Timestamp:

2009-07-29T12:51:45+02:00 (15 years ago)

Author:

rblod

Message:

Suppress FETI solver, see ticket #502

File:

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

trunk/NEMO/OPA_SRC/mppini.F90

@@ -14 +14 @@
    USE dom_oce         ! ocean space and time domain 
    USE in_out_manager  ! I/O Manager
-   USE sol_oce         ! ocean elliptic solver
    USE lib_mpp         ! distribued memory computing library
    USE ioipsl
@@ -35 +34 @@
 CONTAINS
 
-#if ! defined key_mpp_mpi   &&   ! defined key_mpp_shmem
+#if ! defined key_mpp_mpi
    !!----------------------------------------------------------------------
    !!   Default option :                            shared memory computing
@@ -92 +91 @@
    !!----------------------------------------------------------------------
    !!   'key_mpp_mpi'          OR         MPI massively parallel processing
-   !!   'key_mpp_shmem'                 SHMEM massively parallel processing
    !!----------------------------------------------------------------------
 
@@ -143 +141 @@
       !!----------------------------------------------------------------------
 
-#if defined key_mpp_shmem
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'mpp_init : Message Passing PVM T3E + SHMEM'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~'
-
-      CALL mppshmem                           ! Initialisation of shmem array
-
-#endif
-#if defined key_mpp_mpi
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'mpp_init : Message Passing MPI'
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
-#endif
 
 
@@ -412 +400 @@
       ENDIF
 
-      ! FETI method
-
-      IF( nperio == 1 .AND. nsolv == 3 ) THEN 
-         
-         ! general case : Earth == infinite tube
-         
-         nbnw = 1
-         npnw = narea
-         nbne = 1
-         npne = narea
-         nbsw = 1
-         npsw = (narea-2)
-         nbse = 1
-         npse = (narea-2)
-         
-         ! REAL boundary condition
-         
-         IF( nbondj == -1 .OR. nbondj == 2 ) THEN 
-            nbsw = 0
-            nbse = 0
-         ENDIF
-         
-         IF( nbondj == -1 .OR. nbondj == 2 ) THEN 
-            nbsw = 0
-            nbse = 0
-         ENDIF
-         
-         IF( nbondj == 1  .OR. nbondj == 2 ) THEN 
-            nbnw = 0
-            nbne = 0
-         ENDIF
-      ENDIF
-
       ! Periodicity : no corner if nbondi = 2 and nperio != 1