Changeset 4589 for branches

Timestamp:

2014-03-26T11:24:30+01:00 (10 years ago)

Author:

pabouttier

Message:

Remove useless options and cosmetic changes in step_tam.F90

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/step_tam.F90 (modified) (11 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/step_tam.F90

@@ -152 +152 @@
       ! apply tracer assimilation increment   ... not needed in tangent
                              CALL tra_sbc_tan( kstp )       ! surface boundary condition
-      IF( ln_traqsr      )   CALL tra_qsr_tan( kstp )       ! penetrative solar radiation qsr
+      !IF( ln_traqsr      )   CALL tra_qsr_tan( kstp )       ! penetrative solar radiation qsr
       IF( ln_trabbc      )   CALL tra_bbc_tan( kstp )       ! bottom heat flux
       IF( lk_trabbl  )       CALL tra_bbl_tan( kstp )   ! diffusive bottom boundary layer scheme
@@ -279 +279 @@
 
       IF( ln_dynhpg_imp  ) THEN                             ! semi-implicit hpg
-         IF( ln_zps    )     CALL zps_hde_adj( kstp, jpts, tsa, gtsu, gtsv, tsa_ad,      &   ! Partial steps: time filtered hor. gradient
+         IF( ln_zps    )     CALL zps_hde_adj( kstp, jpts, tsa, tsa_ad,      &   ! Partial steps: time filtered hor. gradient
             &                                  rhd_ad, gtsu_ad, gru_ad, gtsv_ad,         &   ! of t, s, rd at the bottom ocean level
             &                                  grv_ad )
@@ -286 +286 @@
       ELSE                                                                                   ! centered hpg (default case)
                              CALL tra_nxt_adj( kstp )                                        ! tracer fields at next time step
-         IF( ln_zps    )     CALL zps_hde_adj( kstp, jpts, tsn, gtsu, gtsv, tsn_ad,      &   ! Partial steps: time filtered hor. gradient
+         IF( ln_zps    )     CALL zps_hde_adj( kstp, jpts, tsn, tsn_ad,      &   ! Partial steps: time filtered hor. gradient
             &                                  rhd_ad, gtsu_ad, gru_ad, gtsv_ad,         &   ! of t, s, rd at the bottom ocean level
             &                                  grv_ad )
@@ -303 +303 @@
       IF( ln_trabbc      )   CALL tra_bbc_adj( kstp )       ! bottom heat flux
 
-      IF( ln_traqsr      )   CALL tra_qsr_adj( kstp )       ! penetrative solar radiation qsr
+      !IF( ln_traqsr      )   CALL tra_qsr_adj( kstp )       ! penetrative solar radiation qsr
 
                              CALL tra_sbc_adj( kstp )       ! surface boundary condition
@@ -499 +499 @@
 
 
-      !DO jpert = 1, jpertmax
-      jpert = 6
+      DO jpert = jpertmax, 1, -1
+      
          !--------------------------------------------------------------------
          ! Reset the tangent and adjoint variables
@@ -580 +580 @@
          ENDIF
 
-         IF (jpert>0) THEN
+         CALL     oce_tam_init( 1 )    ! allocate/initialize tl variables
+         CALL sbc_oce_tam_init( 1 )
+         CALL sol_oce_tam_init( 1 )
+#if defined key_tradmp
+         CALL trc_oce_tam_init( 1 )
+         strdmp_tl = 0.0_wp
+         ttrdmp_tl = 0.0_wp
+#endif
 
             !CALL     oce_tam_init( 1 )    ! allocate/initialize tl variables
@@ -591 +598 @@
 
             emp_tl(:,:) = 0.0_wp
-#if defined key_tradmp
-            strdmp_tl = 0.0_wp
-            ttrdmp_tl = 0.0_wp
-#endif
             a_fwb_tl = 0.0_wp
 
@@ -639 +642 @@
                           &               * e1u(ji,jj) * e2u(ji,jj) * fse3u(ji,jj,jk) &
                           &               * umask(ji,jj,jk) * wesp_u
-                  END DO
-               END DO
-            END DO
-
-            DO jk = 1, jpk
-               DO jj = nldj, nlej
-                  DO ji = nldi, nlei
                      zvn_adin(ji,jj,jk) = zvn_tlout(ji,jj,jk) &
                           &               * e1v(ji,jj) * e2v(ji,jj) * fse3v(ji,jj,jk) &
                           &               * vmask(ji,jj,jk) * wesp_u
-                  END DO
-               END DO
-            END DO
-
-            DO jk = 1, jpk
-               DO jj = nldj, nlej
-                  DO ji = nldi, nlei
                      ztn_adin(ji,jj,jk) = ztn_tlout(ji,jj,jk) &
                           &               * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) &
                           &               * tmask(ji,jj,jk) * wesp_t(jk)
-                  END DO
-               END DO
-            END DO
-
-            DO jk = 1, jpk
-               DO jj = nldj, nlej
-                  DO ji = nldi, nlei
                      zsn_adin(ji,jj,jk) = zsn_tlout(ji,jj,jk) &
                           &               * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) &
@@ -696 +678 @@
             ! Call the adjoint routine: dx^* = L^T dy^*
             !--------------------------------------------------------------------
-            !CALL     oce_tam_init( 2 )    ! allocate/initialize adj variables
-            !CALL sbc_oce_tam_init( 2 )
-            !CALL sol_oce_tam_init( 2 )
-            !CALL trc_oce_tam_init( 2 )
-
+            CALL     oce_tam_init( 2 )    ! allocate/initialize adj variables
+            CALL sbc_oce_tam_init( 2 )
+            CALL sol_oce_tam_init( 2 )
+#if defined key_tradmp
+            CALL trc_oce_tam_init( 2 )
+            strdmp_ad = 0.0_wp
+            ttrdmp_ad = 0.0_wp
+#endif
             qrp_ad = 0.0_wp
             erp_ad = 0.0_wp
             emp_ad(:,:) = 0.0_wp
-#if defined key_tradmp
-            strdmp_ad = 0.0_wp
-            ttrdmp_ad = 0.0_wp
-#endif
+
             a_fwb_ad = 0.0_wp
 
@@ -720 +702 @@
             !CALL sol_oce_tam_deallocate( 1 )
             !CALL trc_oce_tam_deallocate( 1 )
+            istp = nitend
+            CALL  trj_rea( istp, -1 )
 
             DO istp = nitend, nit000, -1
@@ -762 +746 @@
             END SELECT
             CALL prntst_adj( cl_name, kumadt, zsp1, zsp2 )
-         endif
-      !END DO
+      END DO
+
+      nitsor(:) = jp_it0adj  ! restore nitsor to avoid non reproducible results with or without the tests
 
       DEALLOCATE(                                 &