Changeset 1556 for trunk/NEMO/OPA_SRC/SOL/sol_oce.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/SOL/sol_oce.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SOL/sol_oce.F90

@@ -20 +20 @@
    PRIVATE
 
-   !!-----------------------------------
-   !! elliptic solver: SOR, PCG or FETI
-   !! ----------------------------------
+   !!----------------------------
+   !! elliptic solver: SOR or PCG
+   !! ---------------------------
    INTEGER , PUBLIC ::      & !!: namsol   elliptic solver / free surface
-      nsolv    =    1 ,     &  !: = 1/2/3 type of elliptic solver
+      nsolv    =    1 ,     &  !: = 1/2 type of elliptic solver
       nsol_arp =    0 ,     &  !: = 0/1 absolute/relative precision convergence test
       nmin     =  300 ,     &  !: minimum of iterations for the SOR solver
@@ -45 +45 @@
    REAL(wp), PUBLIC ::   &  !:
       epsr,         &  !: relative precision for SOR & PCG solvers
-      epsilo,       &  !: precision for the FETI solver
       rnorme, res,  &  !: intermediate modulus, solver residu
       alph,         &  !: coefficient  =(gcr,gcr)/(gcx,gccd)
@@ -68 +67 @@
 #endif
 
-#if defined key_feti
-   !!----------------------------------------------------------------------
-   !!   'key_feti' :                                            FETI solver
-   !!----------------------------------------------------------------------
-   !!      noeuds           : total number of nodes for a subdomnain
-   !!      ninterf          : neighbour subdomain number
-   !!      nni              : interface point number
-   !!      ndvois()         : neighbour subdomain list
-   !!      maplistin()      : node pointer at each interface
-   !!      malistin()       : concatened list of interface nodes
-
-   INTEGER, PUBLIC :: nim,nxm,   &
-       malxm,malim,malxmax,malimax,   &
-       nifmat,njfmat,nelem,npe,matopo,   &
-       noeuds,nmorse,maan,   &
-       ninterf,ninterfc,nni,nnic,nnih,nnitot,ndir,   &
-       mandvois,mandvoisc,   &
-       maplistin,maplistih,malistin,   &
-       malisdir,npblo,mablo,ndlblo,ndkerep,   &
-       malisblo,mansp,ndimax,   &
-       miax,may,maz,mapoids,   &
-       nmaxd,mjj0,nitmax,ntest,   &
-       mabitw,mautilu,malambda,mag,mamg,mapg,mawj,madwj,madwwj,   &
-       magh,maw,madw,   &
-       mautil,mav,madia,mabufin,mabufout,mawork,maae,magamm,   &
-       maxnul,maynul,numit0ete,nitmaxete,maeteg,maeteag,   &
-       maeted,maetead,maeteadd,maetegamm,maetev,maetew,   &
-       madwork
-
-   INTEGER, PUBLIC :: mfet(jpi*jpj+2*jpi+2*jpj+51)
-
-   REAL(wp), PUBLIC ::   &  !:
-      wfeti(jpj*jpi*jpi+13*jpi*jpj+19*(jpi+jpj)   &
-       +4*jpnij+33   &
-       +2*(jpi+jpj)*(jpnij-jpni)*jpi   &
-       +2*(jpi+jpj)*(jpnij-jpnj+jperio)*jpj   &
-       +3*(jpnij-jpni)*jpi   &
-       +3*(jpnij-jpnj+jperio)*jpj) 
-
-   REAL(wp), PUBLIC ::   res2, rcompt
-
-#endif
-
    !!----------------------------------------------------------------------
 END MODULE sol_oce