Changeset 2587 for branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/tamtst.F90

Timestamp:

2011-02-15T12:58:59+01:00 (13 years ago)

Author:

vidard

Message:

refer to ticket #798

File:

• branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/tamtst.F90 (modified) (11 diffs)

branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/tamtst.F90

@@ -54 +54 @@
 #endif
 
+   USE step_tam_cpd        ! Temporary
+
    IMPLICIT NONE
 
@@ -60 +62 @@
 
    PUBLIC &
-      & tstopt, &          !: Scalar product test of the adjoint routines
+      & tsttam, &          !: Scalar product test of the adjoint routines
       & numadt             !: File unit number for adjoint test output
 
@@ -69 +71 @@
 CONTAINS
 
-   SUBROUTINE tstopt
+   SUBROUTINE tsttam
       !!-----------------------------------------------------------------------
       !!
-      !!                  ***  ROUTINE tstopt  ***
+      !!                  ***  ROUTINE tsttam  ***
       !!
-      !! ** Purpose : Apply various tests (linearization, adjoint, gradient)
-      !!              on the NEMOVAR code.
+      !! ** Purpose : Apply various tests (linearization, adjoint)
+      !!              on the NEMOTAM code.
       !!
       !! ** Method  : 
@@ -85 +87 @@
       !!        ! 07-11 (A. Weaver) Add adjoint tests
       !!        ! 09-03 (I. Mirouze) Filter call depends on type
-      !!        ! 09-08 (F. Vigilant) Add tangent tests
+      !!        ! 09-08 (F. Vigilant) Split TAM and Var and add tangent tests
       !!-----------------------------------------------------------------------
       !! * Modules used
@@ -133 +135 @@
       CALL par_esp
 
-      ! ---------------------------------------------------------------
-      ! 1) Test the adjoint of the components of B
-      ! ---------------------------------------------------------------
-
-      ! Moved to NEMOVAR
-
-      ! -----------------------------------------------------
-      ! 2) Test the adjoint of H
-      ! -----------------------------------------------------
-
-      ! Moved to NEMOVAR
-
 #if defined key_tam
-      ! -----------------------------------------------------
-      ! 3) Test the adjoint of the simplification operator
-      ! -----------------------------------------------------
-
-      ! Not yet implemented
-
-      ! -----------------------------------------------------
-      ! 4) Test the adjoint of the components of M (NEMOTAM)
-      ! -----------------------------------------------------
 
       IF ( ln_tst_nemotam ) THEN
 
          IF ( ln_tst_cpd_tam ) THEN
+            ! -----------------------------------------------------
+            ! 1) Test the adjoint of the components of M (NEMOTAM)
+            ! -----------------------------------------------------
             ! *** initialize the reference trajectory
             ! ------------
@@ -206 +190 @@
             IF (lwp) WRITE(numadt,*)
 
-            IF( lk_dynspg_rl ) &
-                & CALL dyn_spg_adj_tst( numadt )    ! Surface pressure gradient
+            CALL dyn_spg_adj_tst( numadt )    ! Surface pressure gradient
 
             IF (lwp) WRITE(numadt,*)
@@ -292 +275 @@
          ENDIF
 
-         ! *** Time-loop operator
-         ! ----------------------
+         ! -----------------------------------------------------
+         ! 2) Test the adjoint of of M (NEMOTAM)
+         ! -----------------------------------------------------
          IF ( ln_tst_stp_tam ) THEN
 
@@ -303 +287 @@
 
          ENDIF
-
-         ! *** Tangent accuracy
+#if defined key_tst_tlm
+         ! -----------------------------------------------------
+         ! 3)  Test the Tangent accuracy
          ! ----------------------
          IF ( ln_tst_tan ) THEN     
@@ -310 +295 @@
             IF (ln_tst_tan_cpd) THEN
 
-               CALL flush(numout)
-
                CALL dyn_hpg_tlm_tst( numadt )
 
-               CALL flush(numout)
-
-               IF( lk_dynspg_rl ) &
-                  & CALL dyn_spg_tlm_tst( numadt )
-
-               CALL flush(numout)
+               CALL dyn_spg_tlm_tst( numadt )
+
+               CALL sol_sor_tlm_tst( numadt )
 
                CALL zps_hde_tlm_tst( numadt )
 
-               CALL flush(numout)
-
                CALL tra_sbc_tlm_tst( numadt )
 
-               CALL flush(numout)
-
                CALL dyn_adv_tlm_tst( numadt )
 
-               CALL flush(numout)
-
                CALL eos_tlm_tst( numadt )
 
-               CALL flush(numout)
-
                CALL bn2_tlm_tst( numadt )
 
-               CALL flush(numout)
-
                CALL tra_zdf_tlm_tst( numadt )
 
-               CALL flush(numout)
-
                CALL tra_adv_tlm_tst( numadt )       
 
-               CALL flush(numout)
-            
                CALL tra_ldf_tlm_tst( numadt ) 
        
-               CALL flush(numout)
             ELSE
 
@@ -363 +328 @@
 
          ENDIF
-
+#endif
       ENDIF
 #endif
@@ -372 +337 @@
       IF (lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) ' tstopt: Finished testing operators'
+         WRITE(numout,*) ' tsttam: Finished testing operators'
          WRITE(numout,*) ' ------'
          WRITE(numout,*)
       ENDIF
       CALL flush(numout)
-   END SUBROUTINE tstopt
+   END SUBROUTINE tsttam
 
 END MODULE tamtst