Changeset 314 for trunk/NEMO/OPA_SRC/DYN

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.

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynspg_fsc.F90 (modified) (3 diffs)
• dynspg_fsc_atsk.F90 (modified) (4 diffs)
• dynspg_rl.F90 (modified) (6 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

trunk/NEMO/OPA_SRC/DYN/dynspg_fsc_atsk.F90

@@ -31 +31 @@
    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)
@@ -274 +275 @@
          END DO
       END DO
+      ! applied the lateral boundary conditions
+      IF( nsolv == 4)   CALL lbc_lnk_e( gcb, c_solver_pt, 1. )  
 
       !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -283 +286 @@
          DO ji = 1, jpi
             zgwgt  = gcdmat(ji,jj) * gcb(ji,jj)
-            rnorme = rnorme + gcb(ji,jj) * zgwgt
+            rnorme = rnorme + gcb(ji,jj) * zgwgt * bmask(ji,jj)
          END DO
       END DO
@@ -312 +315 @@
          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_atsk : e r r o r, nsolv = 1, 2 or 3'
+            IF(lwp) WRITE(numout,*) ' dyn_spg_fsc_atsk : e r r o r, nsolv = 1, 2, 3 or 4'
             IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~~~                not = ', nsolv
             nstop = nstop + 1

trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90

@@ -25 +25 @@
    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
@@ -106 +107 @@
       !! * Local declarations
       INTEGER ::   ji, jj, jk    ! dummy loop indices
-      REAL(wp) ::   zgwgt, zbsfa, zgcx, z2dt
+      REAL(wp) ::  zbsfa, zgcx, z2dt
 # if defined key_obc
       INTEGER ::   ip, ii, ij
@@ -203 +204 @@
          END DO
       END DO
+      ! applied the lateral boundary conditions
+      IF( nsolv == 4)   CALL lbc_lnk_e( gcb, c_solver_pt, 1. )   
 
       !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -208 +211 @@
       ! Relative precision (computation on one processor)
       rnorme = 0.e0
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            zgwgt =  gcdmat(ji,jj) * gcb(ji,jj)
-            rnorme = rnorme + gcb(ji,jj) * zgwgt
-         END DO
-      END DO
+      rnorme = SUM( gcb(1:nlci,1:nlcj) * gcdmat(1:nlci,1:nlcj) * gcb(1:nlci,1:nlcj) * bmask(:,:) )
       IF( lk_mpp )   CALL mpp_sum( rnorme )   ! sum over the global domain
 
@@ -236 +234 @@
          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
             IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' dyn_spg_rl : e r r o r, nsolv = 1, 2 or 3'
+            IF(lwp) WRITE(numout,*) ' dyn_spg_rl : e r r o r, nsolv = 1, 2 ,3 or 4'
             IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~                not = ', nsolv
             nstop = nstop + 1
@@ -248 +248 @@
       ! ----------------
 
-      bsfd(:,:) = gcx(:,:)
+      bsfd(1:nlci,1:nlcj) = gcx(1:nlci,1:nlcj)