Changeset 784 for trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90

Timestamp:

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

Author:

rblod

Message:

merge solsor and solsor_e, see ticket #45

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90

@@ -36 +36 @@
    USE solsor          ! Successive Over-relaxation solver
    USE solfet          ! FETI solver
-   USE solsor_e        ! Successive Over-relaxation solver with MPP optimization
    USE solisl          ! ???
    USE obc_oce         ! Lateral open boundary condition
@@ -177 +176 @@
       END DO
       ! applied the lateral boundary conditions
-      IF( nsolv == 4)   CALL lbc_lnk_e( gcb, c_solver_pt, 1. )   
+      IF( nsolv == 2 .AND. MAX( jpr2di, jpr2dj ) > 0 ) CALL lbc_lnk_e( gcb, c_solver_pt, 1. )   
 
       ! Relative precision (computation on one processor)
@@ -204 +203 @@
          CASE( 3 )                     ! FETI solver
             CALL sol_fet( kindic )
-         CASE( 4 )                     ! successive-over-relaxation with extra outer halo
-            CALL sol_sor_e( kindic )
          CASE DEFAULT                  ! e r r o r in nsolv namelist parameter
             WRITE(ctmp1,*) ' ~~~~~~~~~~                not = ', nsolv
-            CALL ctl_stop( ' dyn_spg_rl : e r r o r, nsolv = 1, 2 ,3 or 4', ctmp1 )
+            CALL ctl_stop( ' dyn_spg_rl : e r r o r, nsolv = 1, 2 or 3', ctmp1 )
          END SELECT
       ENDIF