Changeset 2587 for branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/DYN/dynldf_tam.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/DYN/dynldf_tam.F90 (modified) (5 diffs)

branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/DYN/dynldf_tam.F90

@@ -287 +287 @@
          & ji,    &        ! dummy loop indices
          & jj,    &        
-         & jk     
+         & jk,    &
+         & jt     
       INTEGER, DIMENSION(jpi,jpj) :: &
          & iseed_2d        ! 2D seed for the random number generator
@@ -341 +342 @@
          & )
 
+      DO jt = 1, 2
+
+         IF (jt == 1) nldf=0  ! iso-level laplacian
+         IF (jt == 2) nldf=2  ! iso-level bilaplacian
+
       !==================================================================
       ! 1)      dx = ( ua_tl, va_tl, rotb_tl, hdivb_tl ) 
@@ -426 +432 @@
       va_tl   (:,:,:) = zva_tlin   (:,:,:)
 
-      CALL dyn_ldf_tan ( nit000 )
+         IF (nldf == 0 )  CALL dyn_ldf_lap_tan(   nit000 )
+         IF (nldf == 2 )  CALL dyn_ldf_bilap_tan( nit000 )
 
       zua_tlout(:,:,:) = ua_tl(:,:,:)
@@ -463 +470 @@
       va_ad(:,:,:) = zva_adin(:,:,:)
 
-      CALL dyn_ldf_adj ( nit000 )
+         IF (nldf == 0 )  CALL dyn_ldf_lap_adj(   nit000 )
+         IF (nldf == 2 )  CALL dyn_ldf_bilap_adj( nit000 )
 
       zua_adout   (:,:,:) = ua_ad   (:,:,:)
@@ -482 +490 @@
       ! Compare the scalar products
       ! 14 char:'12345678901234'
-      cl_name = 'dyn_ldf_adj   '
+         IF (nldf == 0 )  cl_name = 'dynldf_adj lap'
+         IF (nldf == 2 )  cl_name = 'dynldf_adj blp'
       CALL prntst_adj( cl_name, kumadt, zsp1, zsp2 )
+
+      END DO
 
       DEALLOCATE( &