Changeset 601

Timestamp:

2007-02-20T15:41:10+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_009 : CT+RB : - add clpas optional argument when calling trd_icp () for the trend jpicpt_zad

• add interface for trd_icp and declarations of dummy module trd_icp_2d, trd_icp_3d

Location:

trunk/NEMO/OPA_SRC/TRD

Files:

• trdicp.F90 (modified) (2 diffs)
• trdmod.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/TRD/trdicp.F90

@@ -701 +701 @@
    !!   Default case :                                         Empty module
    !!----------------------------------------------------------------------
+   INTERFACE trd_icp
+      MODULE PROCEDURE trd_2d, trd_3d
+   END INTERFACE
+
 CONTAINS
    SUBROUTINE trd_2d( ptrd2dx, ptrd2dy, ktrd , ctype, clpas )       ! Empty routine
       REAL, DIMENSION(:,:) ::   ptrd2dx, ptrd2dy
-      CHARACTER(len=3), INTENT(in), OPTIONAL ::   clpas     ! number of passage
+      INTEGER                     , INTENT(in   ) ::   ktrd         ! tracer trend index
+      CHARACTER(len=3)            , INTENT(in   ) ::   ctype        ! momentum ('DYN') or tracers ('TRA') trends
+      CHARACTER(len=3), INTENT(in), OPTIONAL ::   clpas             ! number of passage
       WRITE(*,*) 'trd_2d: You should not have seen this print! error ?', &
           &       ptrd2dx(1,1), ptrd2dy(1,1), ktrd, ctype, clpas
@@ -710 +716 @@
    SUBROUTINE trd_3d( ptrd3dx, ptrd3dy, ktrd , ctype, clpas )       ! Empty routine
       REAL, DIMENSION(:,:,:) ::   ptrd3dx, ptrd3dy
-      CHARACTER(len=3), INTENT(in), OPTIONAL ::   clpas     ! number of passage
+      INTEGER                     , INTENT(in   ) ::   ktrd         ! tracer trend index
+      CHARACTER(len=3)            , INTENT(in   ) ::   ctype        ! momentum ('DYN') or tracers ('TRA') trends
+      CHARACTER(len=3), INTENT(in), OPTIONAL ::   clpas             ! number of passage
       WRITE(*,*) 'trd_3d: You should not have seen this print! error ?', &
           &       ptrd3dx(1,1,1), ptrd3dy(1,1,1), ktrd, ctype, clpas

trunk/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -97 +97 @@
             CASE ( jptra_trd_yad )   ;   CALL trd_icp( ptrdx, ptrdy, jpicpt_yad, ctype )   ! y- horiz adv
             CASE ( jptra_trd_zad )                                                         ! z- vertical adv 
-               CALL trd_icp( ptrdx, ptrdy, jpicpt_zad, ctype, ccpas )   
-               ! compute the surface flux condition wn(:,:,1)*tn(:,:,1)                                                                   
+               CALL trd_icp( ptrdx, ptrdy, jpicpt_zad, ctype, clpas=ccpas )   
+               ! compute the surface flux condition wn(:,:,1)*tn(:,:,1)
                z2dx(:,:) = wn(:,:,1)*tn(:,:,1)/fse3t(:,:,1)
                z2dy(:,:) = wn(:,:,1)*sn(:,:,1)/fse3t(:,:,1)