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

Timestamp:

2006-05-11T17:24:19+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_061: SM: end of ctl_stop + mpi optimization in _bilap

File:

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

trunk/NEMO/OPA_SRC/SOL/solver.F90

@@ -133 +133 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          free surface formulation'
-         IF( lk_isl ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' key_islands inconsistent with key_dynspg_flt'
-            nstop = nstop + 1
-         ENDIF
+         IF( lk_isl ) CALL ctl_stop( ' key_islands inconsistent with key_dynspg_flt' )
+    
       ELSEIF( lk_dynspg_rl ) THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          Rigid lid formulation'
       ELSE
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '          Choose only one surface pressure gradient calculation: filtered or rigid-lid'
-         IF(lwp) WRITE(numout,*) '          Should not call this routine if dynspg_exp or dynspg_ts has been chosen'
-         nstop = nstop + 1
-      ENDIF
-      IF( lk_dynspg_flt .AND. lk_dynspg_rl ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '          Chose between free surface or rigid-lid, not both'
-         nstop = nstop + 1
-      ENDIF
+         CALL ctl_stop( '          Choose only one surface pressure gradient calculation: filtered or rigid-lid',   &
+              &         '          Should not call this routine if dynspg_exp or dynspg_ts has been chosen' )
+      ENDIF
+      IF( lk_dynspg_flt .AND. lk_dynspg_rl ) &
+         CALL ctl_stop( '          Chose between free surface or rigid-lid, not both' )
 
       SELECT CASE ( nsolv )
@@ -157 +149 @@
       CASE ( 1 )                ! preconditioned conjugate gradient solver
          IF(lwp) WRITE(numout,*) '          a preconditioned conjugate gradient solver is used'
-         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' jpr2di and jpr2dj should be equal to zero'
-            nstop = nstop + 1
-         ENDIF
+         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) &
+            CALL ctl_stop( ' jpr2di and jpr2dj should be equal to zero' )
 
       CASE ( 2 )                ! successive-over-relaxation solver
          IF(lwp) WRITE(numout,*) '          a successive-over-relaxation solver is used'
-         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' jpr2di and jpr2dj should be equal to zero'
-            nstop = nstop + 1
-         ENDIF
+         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) &
+             CALL ctl_stop( ' jpr2di and jpr2dj should be equal to zero' )
 
       CASE ( 3 )                ! FETI solver
          IF(lwp) WRITE(numout,*) '          the FETI solver is used'
-         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' jpr2di and jpr2dj should be equal to zero'
-            nstop = nstop + 1
-         ENDIF
+         IF( jpr2di /= 0 .AND. jpr2dj /= 0 ) &
+              CALL ctl_stop( ' jpr2di and jpr2dj should be equal to zero' )
+           
          IF( .NOT.lk_mpp ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' The FETI algorithm is used only with the key_mpp_... option'
-            nstop = nstop + 1
+            CALL ctl_stop( ' The FETI algorithm is used only with the key_mpp_... option' )
          ELSE
             IF( jpnij == 1 ) THEN
-               IF(lwp) WRITE(numout,cform_err)
-               IF(lwp) WRITE(numout,*) ' The FETI algorithm needs more than one processor'
-               nstop = nstop + 1
+               CALL ctl_stop( ' The FETI algorithm needs more than one processor' )
             ENDIF
          ENDIF
@@ -194 +174 @@
          IF(lwp) WRITE(numout,*) '          with jpr2di =', jpr2di, ' and  jpr2dj =', jpr2dj
          IF( .NOT. lk_mpp .AND. jpr2di /= 0 .AND. jpr2dj /= 0 ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' jpr2di and jpr2dj are not equal to zero'
-            IF(lwp) WRITE(numout,*) ' In this case this algorithm should be used only with the key_mpp_... option'
-            nstop = nstop + 1
+             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 ) ) THEN  
-               IF(lwp) WRITE(numout,cform_err)
-               IF(lwp) WRITE(numout,*) '          jpr2di should be equal to jpr2dj'
-               nstop = nstop + 1
-            ENDIF
+              &  .AND. ( jpr2di /= jpr2dj ) ) CALL ctl_stop( '          jpr2di should be equal to jpr2dj' )
          ENDIF
 
       CASE DEFAULT
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '          bad flag value for nsolv = ', nsolv
-         nstop = nstop + 1
+         WRITE(ctmp1,*) '          bad flag value for nsolv = ', nsolv
+         CALL ctl_stop( ctmp1 )
          
       END SELECT
@@ -244 +217 @@
 
          IF ( jpisl == 0 ) THEN
-             IF(lwp)WRITE(numout,cform_err)
-             IF(lwp)WRITE(numout,*) ' bad islands parameter jpisl =', jpisl
-             nstop = nstop + 1
+             WRITE(ctmp1,*) ' bad islands parameter jpisl =', jpisl
+             CALL ctl_stop( ctmp1 )
          ENDIF