Changeset 4618 for branches/2014

Timestamp:

2014-04-07T16:03:49+02:00 (10 years ago)

Author:

gm

Message:

#1260 : LDF improvements, correct a bug in trcldf.F90

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) (1 diff)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

@@ -74 +74 @@
 
       SELECT CASE ( nldf )                       ! compute lateral mixing trend and add it to the general trend
-      CASE ( 0 )   ;   CALL tra_ldf_lap     ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb     , tra, jpts, 1)  ! iso-level laplacian
+      CASE ( 0 )   ;   CALL tra_ldf_lap     ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb     , tra, jptra, 1)  ! iso-level laplacian
       CASE ( 1 )                                                                                      ! rotated laplacian
          IF( ln_traldf_triad ) THEN                                                          
-                       CALL tra_ldf_iso_triad( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jpts, 1 )    ! triad operator
+                       CALL tra_ldf_iso_triad( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jptra, 1 )    ! triad operator
          ELSE                                                                                
-                       CALL tra_ldf_iso      ( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jpts, 1 )    ! Madec operator
-         ENDIF
-      CASE ( 2 )   ;   CALL tra_ldf_blp      ( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb     , tra, jpts )    ! iso-level bilaplacian
-      CASE ( 3 )   ;   CALL tra_ldf_iso_blp  ( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb     , tra, jpts )    ! rotated   bilaplacian
+                       CALL tra_ldf_iso      ( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jptra, 1 )    ! Madec operator
+         ENDIF
+      CASE ( 2 )   ;   CALL tra_ldf_blp      ( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb     , tra, jptra )    ! iso-level bilaplacian
+      CASE ( 3 )   ;   CALL tra_ldf_iso_blp  ( kt, nittrc000,'TRC', gtru, gtrv, ahtu, ahtv, trb     , tra, jptra )    ! rotated   bilaplacian
          !
       CASE ( -1 )                                ! esopa: test all possibility with control print
-         CALL tra_ldf_lap   ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, tra, jpts, 1 ) 
+         CALL tra_ldf_lap   ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, tra, jptra, 1 ) 
          WRITE(charout, FMT="('ldf0')")   ;   CALL prt_ctl_trc_info(charout)
                                               CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd')
          IF( ln_traldf_triad ) THEN
-            CALL tra_ldf_iso_triad( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jpts, 1 )
-         ELSE
-            CALL tra_ldf_iso      ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jpts, 1 )  
+            CALL tra_ldf_iso_triad( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jptra, 1 )
+         ELSE
+            CALL tra_ldf_iso      ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, trb, tra, jptra, 1 )  
          ENDIF
          WRITE(charout, FMT="('ldf1')")   ;   CALL prt_ctl_trc_info(charout)
                                               CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
-         CALL tra_ldf_blp   ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, tra, jpts        ) 
+         CALL tra_ldf_blp   ( kt, nittrc000, 'TRC', gtru, gtrv, ahtu, ahtv, trb, tra, jptra        ) 
          WRITE(charout, FMT="('ldf2')")   ;   CALL prt_ctl_trc_info(charout)
                                               CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )