Changeset 16 for trunk/NEMO/OPA_SRC/SOL/sol_oce.F90

Timestamp:

2004-02-17T09:06:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/SOL/sol_oce.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/SOL/sol_oce.F90

@@ -16 +16 @@
 
    IMPLICIT NONE
+   PRIVATE
 
-   !!----------------------------------------------------------------------
+   !!-----------------------------------
    !! elliptic solver: SOR, PCG or FETI
-   !! ---------------------------------------------------
-   INTEGER  ::              & !!! namsol   elliptic solver / island / free surface
-      nsolv =    1 ,        &  ! = 1/2/3 type of elliptic solver
-      nmax  =  800 ,        &  ! maximum of iterations for the solver
-      nmisl = 4000             ! maximum pcg iterations for island
+   !! ----------------------------------
+   INTEGER , PUBLIC ::      & !!: namsol   elliptic solver / island / free surface
+      nsolv =    1 ,        &  !: = 1/2/3 type of elliptic solver
+      nmax  =  800 ,        &  !: maximum of iterations for the solver
+      nmisl = 4000             !: maximum pcg iterations for island
      
-   REAL(wp) ::              & !!! namsol   elliptic solver / island / free surface
-      eps    = 1.e-6_wp ,   &  ! absolute precision of the solver
-      sor    = 1.76_wp  ,   &  ! optimal coefficient for sor solver
-      epsisl = 1.e-10_wp,   &  ! absolute precision on stream function solver
-      rnu    = 1.0_wp          ! strength of the additional force used in free surface
+   REAL(wp), PUBLIC ::      & !!: namsol   elliptic solver / island / free surface
+      eps    = 1.e-6_wp ,   &  !: absolute precision of the solver
+      sor    = 1.76_wp  ,   &  !: optimal coefficient for sor solver
+      epsisl = 1.e-10_wp,   &  !: absolute precision on stream function solver
+      rnu    = 1.0_wp          !: strength of the additional force used in free surface
 
-   INTEGER  ::   &
-      ncut,         &  ! indicator of solver convergence
-      niter            ! number of iteration done by the solver
+   CHARACTER(len=1), PUBLIC ::   &  !:
+      c_solver_pt = 'T'        !: nature of grid-points T (S) for free surface case
+      !                        !                       F (G) for rigid-lid case
 
-   REAL(wp) ::   &
-      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)
-      beta,         &  ! coefficient  =(rn+1,rn+1)/(rn,rn)
-      radd,         &  ! coefficient  =(gccd,gcdes)
-      rr               ! coefficient  =(rn,rn)
+   INTEGER , PUBLIC ::   &  !:
+      ncut,         &  !: indicator of solver convergence
+      niter            !: number of iteration done by the solver
 
-   REAL(wp), DIMENSION(jpi,jpj,4) ::   &
-      gcp              ! barotropic matrix extra-diagonal elements
+   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)
+      beta,         &  !: coefficient  =(rn+1,rn+1)/(rn,rn)
+      radd,         &  !: coefficient  =(gccd,gcdes)
+      rr               !: coefficient  =(rn,rn)
 
-   REAL(wp), DIMENSION(jpi,jpj) ::   &
-      gcx, gcxb,    &  ! now, before solution of the elliptic equation
-      gcdprc,       &  ! inverse diagonal preconditioning matrix
-      gcdmat,       &  ! diagonal preconditioning matrix
-      gcb,          &  ! second member of the barotropic linear system
-      gcr,          &  ! residu =b-a.x
-      gcdes,        &  ! vector descente
-      gccd             ! vector such that ca.gccd=a.d (ca-1=gcdprc)
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,4) ::   &  !:
+      gcp              !: barotropic matrix extra-diagonal elements
+
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &  !:
+      gcx, gcxb,    &  !: now, before solution of the elliptic equation
+      gcdprc,       &  !: inverse diagonal preconditioning matrix
+      gcdmat,       &  !: diagonal preconditioning matrix
+      gcb,          &  !: second member of the barotropic linear system
+      gcr,          &  !: residu =b-a.x
+      gcdes,        &  !: vector descente
+      gccd             !: vector such that ca.gccd=a.d (ca-1=gcdprc)
 
 #if defined key_feti
@@ -67 +72 @@
    !!      malistin()       : concatened list of interface nodes
 
-   INTEGER :: nim,nxm,   &
+   INTEGER, PUBLIC :: nim,nxm,   &
        malxm,malim,malxmax,malimax,   &
        nifmat,njfmat,nelem,npe,matopo,   &
@@ -85 +90 @@
        madwork
 
-   INTEGER :: mfet(jpi*jpj+2*jpi+2*jpj+51)
+   INTEGER, PUBLIC :: mfet(jpi*jpj+2*jpi+2*jpj+51)
 
-   REAL(wp) ::  wfeti(jpj*jpi*jpi+13*jpi*jpj+19*(jpi+jpj)   &
+   REAL(wp), PUBLIC ::   &  !:
+      wfeti(jpj*jpi*jpi+13*jpi*jpj+19*(jpi+jpj)   &
        +4*jpnij+33   &
        +2*(jpi+jpj)*(jpnij-jpni)*jpi   &
@@ -94 +100 @@
        +3*(jpnij-jpnj+jperio)*jpj) 
 
-   REAL(wp) ::   res2, rcompt
+   REAL(wp), PUBLIC ::   res2, rcompt
 
 #endif