Changeset 4586 for branches

Timestamp:

2014-03-26T11:12:07+01:00 (10 years ago)

Author:

pabouttier

Message:

Fix relative precision norme computing in sol_sor_tan, using zta, see Ticket #1279

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/SOL/solsor_tam.F90 (modified) (7 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/SOL/solsor_tam.F90

@@ -19 +19 @@
    USE in_out_manager
    USE sol_oce
+   USE solmat
    USE lib_mpp
    USE lbclnk
@@ -98 +99 @@
       INTEGER  ::   ijmppodd, ijmppeven
       INTEGER  ::   ijpr2d
+      REAL(wp), POINTER, DIMENSION(:,:) ::   ztab                 ! 2D workspace
       !!----------------------------------------------------------------------
       !
       IF( nn_timing == 1 )  CALL timing_start('sol_sor_tan')
+      !
+      CALL wrk_alloc( jpi, jpj, ztab )
       !
       ijmppeven = MOD(nimpp+njmpp+jpr2di+jpr2dj  ,2)
@@ -157 +161 @@
                IF( lk_mpp )  CALL mpp_max( zres2 ) ! max over the global domain
                ! test of convergence
+               res = SQRT( zres2 )
                IF( zres2 < rn_resmax .OR. jn == nn_nmax ) THEN
-                  res = SQRT( zres2 )
                   niter = jn
                   ncut = 999
@@ -166 +170 @@
                ENDIF
             CASE ( 1 )                 ! relative precision
-               rnorme = glob_sum(gcr_tl(2:nlci - 1, 2:nlcj - 1))
+               ztab(:,:) = 0.0_wp
+               ztab(2:nlci-1,2:nlcj-1) = gcr_tl(2:nlci-1,2:nlcj-1)
+               rnorme = glob_sum(ztab)
                ! test of convergence
+               res = SQRT( rnorme )
                IF( rnorme < epsr .OR. jn == nn_nmax ) THEN
-                  res = SQRT( rnorme )
                   niter = jn
                   ncut = 999
@@ -194 +200 @@
       CALL lbc_lnk_e( gcx_tl, c_solver_pt, 1.0_wp )    ! Lateral BCs
       !
+      CALL wrk_dealloc( jpi, jpj, ztab )
+      !
       IF( nn_timing == 1 )  CALL timing_stop('sol_sor_tan')
       !
@@ -387 +395 @@
          & zr(        jpi,jpj)      &
          & )
+
+      ! Initialize the matrix of the elliptic equation
+
+      CALL sol_mat( nit000 + 1 )
+
       !==================================================================
       ! 1) dx = ( un_tl, vn_tl, hdivn_tl ) and
@@ -459 +472 @@
       CALL prntst_adj( cl_name, kumadt, zsp1, zsp2 )
 !      nn_nmod = kmod  ! restore initial frequency of test for the SOR solver
+
+      nitsor(:) = jp_it0adj
 
       DEALLOCATE(      &