Changeset 314 for trunk/NEMO/OPA_SRC/DYN/dynspg_fsc.F90

Timestamp:

2005-09-30T12:24:23+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_017:RB: added call to sol_sor_e for free surface and rigid lid.

File:

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

trunk/NEMO/OPA_SRC/DYN/dynspg_fsc.F90

@@ -27 +27 @@
    USE solsor          ! Successive Over-relaxation solver
    USE solfet          ! FETI solver
+   USE solsor_e        ! Successive Over-relaxation solver with MPP optimization
    USE obc_oce         ! Lateral open boundary condition
    USE obcdyn          ! ocean open boundary condition (obc_dyn routines)
@@ -257 +258 @@
          END DO
       END DO
+      ! applied the lateral boundary conditions
+      IF( nsolv == 4 )   CALL lbc_lnk_e( gcb, c_solver_pt, 1. )   
 
       ! 4. Relative precision (computation on one processor)
       ! ---------------------
       rnorme =0.
-      rnorme = SUM( gcb(:,:) * gcdmat(:,:) * gcb(:,:) )
+      rnorme = SUM( gcb(1:jpi,1:jpj) * gcdmat(1:jpi,1:jpj) * gcb(1:jpi,1:jpj) * bmask(:,:) )
       IF( lk_mpp )   CALL mpp_sum( rnorme )   ! sum over the global domain
 
@@ -286 +289 @@
          ELSEIF( nsolv == 3 ) THEN     ! FETI solver
             CALL sol_fet( kindic )
+         ELSEIF( nsolv == 4 ) THEN     ! successive-over-relaxation with extra outer halo
+            CALL sol_sor_e( kindic )
          ELSE                          ! e r r o r in nsolv namelist parameter
             IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' dyn_spg_fsc : e r r o r, nsolv = 1, 2 or 3'
+            IF(lwp) WRITE(numout,*) ' dyn_spg_fsc : e r r o r, nsolv = 1, 2 ,3 or 4'
             IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~                not = ', nsolv
             nstop = nstop + 1