Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90 (modified) (8 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -4 +4 @@
    !! Ocean diagnostics:  ocean tracers and dynamic trends
    !!=====================================================================
-   !! History :  9.0  !  04-08  (C. Talandier) Original code
-   !!                 !  05-04  (C. Deltel)    Add Asselin trend in the ML budget
+   !! History :  1.0  !  2004-08  (C. Talandier) Original code
+   !!             -   !  2005-04  (C. Deltel)    Add Asselin trend in the ML budget
+   !!            3.3  ! 2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 #if  defined key_trdtra || defined key_trddyn || defined key_trdmld || defined key_trdvor || defined key_esopa
@@ -36 +37 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
 CONTAINS
 
-   SUBROUTINE trd_mod( ptrdx, ptrdy, ktrd, ctype, kt, cnbpas )
+   SUBROUTINE trd_mod( ptrdx, ptrdy, ktrd, ctype, kt )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE trd_mod  ***
@@ -53 +54 @@
       INTEGER, INTENT( in ) ::   ktrd                              ! tracer trend index
       CHARACTER(len=3), INTENT( in ) ::   ctype                    ! momentum or tracers trends type 'DYN'/'TRA'
-      CHARACTER(len=3), INTENT( in ), OPTIONAL ::   cnbpas         ! number of passage
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( inout ) ::   ptrdx ! Temperature or U trend 
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( inout ) ::   ptrdy ! Salinity    or V trend
       !!
       INTEGER ::   ji, jj
-      CHARACTER(len=3) ::   ccpas                                  ! number of passage
       REAL(wp), DIMENSION(jpi,jpj) ::   ztswu, ztswv               ! 2D workspace
       REAL(wp), DIMENSION(jpi,jpj) ::   ztbfu, ztbfv               ! 2D workspace
@@ -65 +64 @@
 
       z2dx(:,:)   = 0.e0   ;   z2dy(:,:)   = 0.e0                  ! initialization of workspace arrays
-
-      ! Control of optional arguments
-      ccpas = 'fst'
-      IF( PRESENT(cnbpas) )  ccpas = cnbpas
 
       IF( neuler == 0 .AND. kt == nit000    ) THEN   ;   r2dt =      rdt      ! = rdtra (restarting with Euler time stepping)
@@ -95 +90 @@
             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, clpas=ccpas )   
+               CALL trd_icp( ptrdx, ptrdy, jpicpt_zad, ctype )   
                ! compute the surface flux condition wn(:,:,1)*tn(:,:,1)
                z2dx(:,:) = wn(:,:,1)*tn(:,:,1)/fse3t(:,:,1)
@@ -222 +217 @@
 
       ENDIF
-
+      !
    END SUBROUTINE trd_mod
 
-#   else
+#else
    !!----------------------------------------------------------------------
    !!   Default case :                                         Empty module
@@ -235 +230 @@
 
 CONTAINS
-   SUBROUTINE trd_mod(ptrd3dx, ptrd3dy, ktrd , ctype, kt, cnbpas)   ! Empty routine
-      REAL, DIMENSION(:,:,:), INTENT( in ) ::   &
-          ptrd3dx,                     &                           ! Temperature or U trend 
-          ptrd3dy                                                  ! Salinity    or V trend
-      INTEGER, INTENT( in ) ::   ktrd                              ! momentum or tracer trend index
-      INTEGER, INTENT( in ) ::   kt                                ! Time step
-      CHARACTER(len=3), INTENT( in ) ::  ctype                     ! momentum or tracers trends type
-      CHARACTER(len=3), INTENT( in ), OPTIONAL ::   cnbpas         ! number of passage
-      WRITE(*,*) 'trd_3d: You should not have seen this print! error ?', ptrd3dx(1,1,1)
-      WRITE(*,*) ' "   ": You should not have seen this print! error ?', ptrd3dy(1,1,1)
-      WRITE(*,*) ' "   ": You should not have seen this print! error ?', ktrd
-      WRITE(*,*) ' "   ": You should not have seen this print! error ?', ctype
-      WRITE(*,*) ' "   ": You should not have seen this print! error ?', kt
-      WRITE(*,*) ' "   ": You should not have seen this print! error ?', cnbpas
+   SUBROUTINE trd_mod(ptrd3dx, ptrd3dy, ktrd , ctype, kt )   ! Empty routine
+      REAL    ::   ptrd3dx(:,:,:), ptrd3dy(:,:,:)
+      INTEGER ::   ktrd, kt                            
+      CHARACTER(len=3) ::  ctype                  
+      WRITE(*,*) 'trd_3d: You should not have seen this print! error ?', ptrd3dx(1,1,1), ptrd3dy(1,1,1)
+      WRITE(*,*) ' "   ": You should not have seen this print! error ?', ktrd, ctype, kt
    END SUBROUTINE trd_mod
-#   endif
+#endif
 
    SUBROUTINE trd_mod_init
@@ -259 +246 @@
       !!----------------------------------------------------------------------
       USE in_out_manager          ! I/O manager
-
+      !!    
       NAMELIST/namtrd/ nn_trd, nn_ctls, cn_trdrst_in, cn_trdrst_out, ln_trdmld_restart, rn_ucf, ln_trdmld_instant
       !!----------------------------------------------------------------------