Changeset 120 for trunk/NEMO/OPA_SRC/SOL

Timestamp:

2004-06-29T17:39:08+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE070 : Optimisation of the Red-Black SOR algorithm convergence

Location:

trunk/NEMO/OPA_SRC/SOL

Files:

• sol_oce.F90 (modified) (1 diff)
• solsor.F90 (modified) (3 diffs)
• solver.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/SOL/sol_oce.F90

@@ -23 +23 @@
    INTEGER , PUBLIC ::      & !!: namsol   elliptic solver / island / free surface
       nsolv    =    1 ,     &  !: = 1/2/3 type of elliptic solver
-      nsol_arp =    1 ,     &  !: = 1/0   absolute/relative precision convergence test
-      nmin     =  300 ,     &  !: minimum of iterations for the solver
-      nmax     =  800 ,     &  !: maximum of iterations for the solver
-      nmod     =   10 ,     &  !: frequency of test for the solver
+      nsol_arp =    0 ,     &  !: = 0/1 absolute/relative precision convergence test
+      nmin     =  300 ,     &  !: minimum of iterations for the SOR solver
+      nmax     =  800 ,     &  !: maximum of iterations for the SOR solver
+      nmod     =   10 ,     &  !: frequency of test for the SOR solver
       nmisl    = 4000          !: maximum pcg iterations for island
      
    REAL(wp), PUBLIC ::      & !!: namsol   elliptic solver / island / free surface
-      eps    = 1.e-6_wp ,   &  !: absolute precision of the solver
-      sor    = 1.92_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
+      eps    =  1.e-6_wp ,  &  !: absolute precision of the solver
+      resmax = 1.e-14_wp ,  &  !: absolute precision for the SOR solver
+      sor    =   1.92_wp ,  &  !: optimal coefficient for the 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
 
    CHARACTER(len=1), PUBLIC ::   &  !:
       c_solver_pt = 'T'        !: nature of grid-points T (S) for free surface case
-      !                        !                       F (G) for rigid-lid case
+      !                        !                        F (G) for rigid-lid case
 
    INTEGER , PUBLIC ::   &  !:

trunk/NEMO/OPA_SRC/SOL/solsor.F90

@@ -117 +117 @@
          END DO
 
-         CALL lbc_lnk( gcx, c_solver_pt, 1. )   ! applied the lateral boubary conditions
-
          ! test of convergence
          IF ( jn > nmin .AND. MOD( jn-nmin, nmod ) == 0 ) then
 
             SELECT CASE ( nsol_arp )
+            CASE ( 0 )                 ! absolute precision (maximum value of the residual)
+               zres2 = MAXVAL( gcr(2:jpim1,2:jpjm1) )
+               IF( lk_mpp )   CALL mpp_max( zres2 )   ! max over the global domain
+               ! test of convergence
+               IF( zres2 < resmax .OR. jn == nmax ) THEN
+                  res = SQRT( zres2 )
+                  niter = jn
+                  ncut = 999
+               ENDIF
             CASE ( 1 )                 ! relative precision
                rnorme = SUM( gcr(2:jpim1,2:jpjm1) )
@@ -132 +139 @@
                   ncut = 999
                ENDIF
-            CASE ( 0 )                 ! absolute precision (maximum value of the residual)
-               zres2 = MAXVAL( gcr(2:jpim1,2:jpjm1) )
-               IF( lk_mpp )   CALL mpp_max( zres2 )   ! max over the global domain
-               ! test of convergence
-               IF( zres2 < resmax .OR. jn == nmax ) THEN
-                  res = SQRT( zres2 )
-                  niter = jn
-                  ncut = 999
-               ENDIF
-            END CASE
+            END SELECT
          
          !****
@@ -162 +160 @@
       !  Output in gcx
       !  -------------
-      
-      CALL lbc_lnk( gcx, c_solver_pt, 1. )    ! boundary conditions (est-ce necessaire? je ne crois pas!!!!)
+
+      CALL lbc_lnk( gcx, c_solver_pt, 1. )    ! boundary conditions
+
       
    END SUBROUTINE sol_sor

trunk/NEMO/OPA_SRC/SOL/solver.F90

@@ -79 +79 @@
       INTEGER :: ji, jj   ! dummy loop indices
 
-      NAMELIST/namsol/ nsolv, nsol_arp, nmin, nmax, nmod, eps, sor, epsisl, nmisl, rnu
+      NAMELIST/namsol/ nsolv, nsol_arp, nmin, nmax, nmod, eps, resmax, sor, epsisl, nmisl, rnu
       !!----------------------------------------------------------------------
 
@@ -111 +111 @@
       IF(lwp) THEN
          WRITE(numout,*) '             type of elliptic solver            nsolv    = ', nsolv
-         WRITE(numout,*) '             absolute/relative (1/0) precision  nsol_arp = ', nsol_arp
+         WRITE(numout,*) '             absolute/relative (0/1) precision  nsol_arp = ', nsol_arp
          WRITE(numout,*) '             minimum iterations for solver      nmin     = ', nmin
          WRITE(numout,*) '             maximum iterations for solver      nmax     = ', nmax
          WRITE(numout,*) '             frequency for test                 nmod     = ', nmod
          WRITE(numout,*) '             absolute precision of solver       eps      = ', eps
+         WRITE(numout,*) '             absolute precision for SOR solver  resmax   = ', resmax
          WRITE(numout,*) '             optimal coefficient of sor         sor      = ', sor
          IF(lk_isl) WRITE(numout,*) '             absolute precision stream fct    epsisl   = ', epsisl