Changeset 120 for trunk/NEMO/OPA_SRC/SOL/solsor.F90

Timestamp:

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

Author:

opalod

Message:

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

File:

• trunk/NEMO/OPA_SRC/SOL/solsor.F90 (modified) (3 diffs)

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