Changeset 784 for trunk/NEMO/OPA_SRC/SOL/solver.F90

Timestamp:

2008-01-08T12:05:25+01:00 (16 years ago)

Author:

rblod

Message:

merge solsor and solsor_e, see ticket #45

File:

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

trunk/NEMO/OPA_SRC/SOL/solver.F90

@@ -152 +152 @@
 
       CASE ( 2 )                ! successive-over-relaxation solver
-         IF(lwp) WRITE(numout,*) '          a successive-over-relaxation solver is used'
-         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) &
-             CALL ctl_stop( ' jpr2di and jpr2dj should be equal to zero' )
+         IF(lwp) WRITE(numout,*) '          a successive-over-relaxation solver with extra outer halo is used'
+         IF(lwp) WRITE(numout,*) '          with jpr2di =', jpr2di, ' and  jpr2dj =', jpr2dj
+         IF( .NOT. lk_mpp .AND. jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
+             CALL ctl_stop( ' jpr2di and jpr2dj are not equal to zero',   &
+             &              ' In this case this algorithm should be used only with the key_mpp_... option' )
+         ELSE
+            IF( ( ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 ) .OR. ( jpni /= 1 ) ) &
+              &  .AND. ( jpr2di /= jpr2dj ) ) CALL ctl_stop( '          jpr2di should be equal to jpr2dj' )
+         ENDIF
 
       CASE ( 3 )                ! FETI solver
@@ -169 +175 @@
          ENDIF
          
-      CASE ( 4 )                ! successive-over-relaxation solver with extra outer halo
-         IF(lwp) WRITE(numout,*) '          a successive-over-relaxation solver with extra outer halo is used'
-         IF(lwp) WRITE(numout,*) '          with jpr2di =', jpr2di, ' and  jpr2dj =', jpr2dj
-         IF( .NOT. lk_mpp .AND. jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
-             CALL ctl_stop( ' jpr2di and jpr2dj are not equal to zero',   &
-             &              ' In this case this algorithm should be used only with the key_mpp_... option' )
-         ELSE
-            IF( ( ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 ) .OR. ( jpni /= 1 ) ) &
-              &  .AND. ( jpr2di /= jpr2dj ) ) CALL ctl_stop( '          jpr2di should be equal to jpr2dj' )
-         ENDIF
-
       CASE DEFAULT
          WRITE(ctmp1,*) '          bad flag value for nsolv = ', nsolv
@@ -186 +181 @@
       END SELECT
 
-      IF( nbit_cmp == 1 .AND. nsolv /= 2 ) THEN
-         CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require the SOR solver: nsolv = 2' )
+      IF( nbit_cmp == 1 ) THEN
+         IF( nsolv /= 2 ) THEN
+            CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require the SOR solver: nsolv = 2' )
+         ELSE IF( MAX( jpr2di, jpr2dj ) > 0 ) THEN
+            CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require jpr2di = jpr2dj = 0' )
+         END IF 
       END IF