Changeset 13432 for NEMO/branches

Timestamp:

2020-08-24T15:06:34+02:00 (4 years ago)

Author:

smueller

Message:

Fixing of the number of iterations carried out by the tangent-linear SOR solver to the default number of iterations carried out by its adjoint

Location:

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPATAM_SRC/SOL

Files:

• sol_oce_tam.F90 (modified) (1 diff)
• solsor_tam.F90 (modified) (4 diffs)

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPATAM_SRC/SOL/sol_oce_tam.F90

@@ -41 +41 @@
    INTEGER, PARAMETER,  PUBLIC :: &
 #if defined key_orca_r2  ||   defined key_seabass  ||   defined key_gyre
-      & jp_it0adj = 300 ! initial value of the number of solver iteration (adj)
+      & jp_it0adj = 600  ! number of solver iterations (tl and adj)
 #else
-      & jp_it0adj = 1000 ! initial value of the number of solver iteration (adj)
+      & jp_it0adj = 1000 ! number of solver iterations (tl and adj)
 #endif
 

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPATAM_SRC/SOL/solsor_tam.F90

@@ -111 +111 @@
       icount = 0
       !                                                       ! ==============
-      DO jn = 1,  nn_nmax                                         ! Iterative loop
+      DO jn = 1,  nitsor(kt - nit000 + 1)                     ! Iterative loop
          !                                                    ! ==============
          ! applied the lateral boundary conditions
@@ -153 +153 @@
          END DO
          icount = icount + 1
-         ! test of convergence
-         IF ( (jn > nn_nmin .AND. MOD( jn-nn_nmin, nn_nmod ) == 0) .OR. jn==nn_nmax) THEN
+         ! ! test of convergence
+         ! IF ( (jn > nn_nmin .AND. MOD( jn-nn_nmin, nn_nmod ) == 0) .OR. jn==nn_nmax ) THEN
+         IF ( jn == nitsor(kt - nit000 + 1) ) THEN
             SELECT CASE ( nn_sol_arp )
             CASE ( 0 )
@@ -160 +161 @@
                zres2 = MAXVAL( gcr_tl(2:nlci - 1,2:nlcj - 1) )
                IF( lk_mpp )  CALL mpp_max( zres2 ) ! max over the global domain
-               ! test of convergence
+               ! ! test of convergence
                res = SQRT( zres2 )
-               IF( zres2 < rn_resmax .OR. jn == nn_nmax ) THEN
-                  niter = jn
-                  ncut = 999
-                  ! Store number of iterations for adjoint computation
-                  istp = kt - nit000 + 1
-                  nitsor(istp) = niter
-               ENDIF
+               ! IF( zres2 < rn_resmax .OR. jn == nn_nmax ) THEN
+               !    niter = jn
+               !    ncut = 999
+               !    ! Store number of iterations for adjoint computation
+               !    istp = kt - nit000 + 1
+               !    nitsor(istp) = niter
+               ! ENDIF
             CASE ( 1 )                 ! relative precision
                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
+               ! ! test of convergence
                res = SQRT( rnorme )
-               IF( rnorme < epsr .OR. jn == nn_nmax ) THEN
-                  niter = jn
-                  ncut = 999
-                  ! Store number of iterations for adjoint computation
-                  istp = kt - nit000 + 1
-                  nitsor(istp) = niter
-               ENDIF
+               ! IF( rnorme < epsr .OR. jn == nn_nmax ) THEN
+               !    niter = jn
+               !    ncut = 999
+               !    ! Store number of iterations for adjoint computation
+               !    istp = kt - nit000 + 1
+               !    nitsor(istp) = niter
+               ! ENDIF
             END SELECT
             !****
@@ -188 +189 @@
             !****
          ENDIF
-         ! indicator of non-convergence or explosion
-         IF( jn == nn_nmax ) nitsor(istp) = jn
-         IF( jn == nn_nmax .OR. SQRT(epsr)/eps > 1.e+20 ) kindic = -2
-         IF( ncut == 999 ) GOTO 999
+         ! ! indicator of non-convergence or explosion
+         !      IF( jn == nn_nmax ) nitsor(istp) = jn
+         ! IF( jn == nn_nmax .OR. SQRT(epsr)/eps > 1.e+20 ) kindic = -2
+         ! IF( ncut == 999 ) GOTO 999
          !                                              ! =====================
       END DO                                            ! END of iterative loop