Changeset 784 for trunk/NEMO/OPA_SRC/SOL/solmat.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/solmat.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/SOL/solmat.F90

@@ -291 +291 @@
          gcp(:,:,3) = gcp(:,:,3) * gcdprc(:,:)
          gcp(:,:,4) = gcp(:,:,4) * gcdprc(:,:)
-         IF( ( nsolv == 2 ) .OR. ( nsolv == 4 ) )  gccd(:,:) = sor * gcp(:,:,2)
-
-         IF( nsolv == 4 ) THEN
+         IF( nsolv == 2 )  gccd(:,:) = sor * gcp(:,:,2)
+
+         IF( nsolv == 2 .AND. MAX( jpr2di, jpr2dj ) > 0) THEN
             CALL lbc_lnk_e( gcp   (:,:,1), c_solver_pt, 1. )   ! lateral boundary conditions
             CALL lbc_lnk_e( gcp   (:,:,2), c_solver_pt, 1. )   ! lateral boundary conditions