Changeset 3327 for branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90

Timestamp:

2012-03-14T16:09:33+01:00 (12 years ago)

Author:

gm

Message:

Ediag branche: #927 correct a few problems and clean trdtra

File:

• branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) (4 diffs)

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90

@@ -70 +70 @@
       REAL(wp)                  , INTENT(in) ::   pdt            ! time step [s]
       !
+      INTEGER ::   jk   ! dummy loop indices
       REAL(wp), POINTER, DIMENSION(:,:)   ::   z2d   ! 2D workspace 
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   zpe   ! 3D workspace 
@@ -87 +88 @@
 
       SELECT CASE ( ktrd )
-      CASE ( jptra_xad  )   ;   CALL iom_put( "petrd_xad", zke )   ! zonal    advection
-      CASE ( jptra_yad  )   ;   CALL iom_put( "petrd_yad", zke )   ! merid.   advection
-      CASE ( jptra_zad  )   ;   CALL iom_put( "petrd_zad", zke )   ! vertical advection
+      CASE ( jptra_xad  )   ;   CALL iom_put( "petrd_xad", zpe )   ! zonal    advection
+      CASE ( jptra_yad  )   ;   CALL iom_put( "petrd_yad", zpe )   ! merid.   advection
+      CASE ( jptra_zad  )   ;   CALL iom_put( "petrd_zad", zpe )   ! vertical advection
                                 IF( .NOT.lk_vvl ) THEN                   ! cst volume : adv flux through z=0 surface
                                    CALL wrk_alloc( jpi, jpj, z2d )
-                                   z2d(:,:) = wn(:,:,1) * (   drau_dt(:,:,1) * tsn(:,:,1,jp_tem) 
+                                   z2d(:,:) = wn(:,:,1) * (   drau_dt(:,:,1) * tsn(:,:,1,jp_tem)    &
                                       &                     + drau_ds(:,:,1) * tsn(:,:,1,jp_sal)  ) / fse3t(:,:,1)
                                    CALL iom_put( "petrd_sad" , z2d )
@@ -104 +105 @@
       CASE ( jptra_npc  )   ;   CALL iom_put( "petrd_npc" , zpe )   ! non penetr convect adjustment
       CASE ( jptra_nsr  )   ;   CALL iom_put( "petrd_for" , zpe )   ! surface forcing + runoff (ln_rnf=T)
-      CASE ( jptra_qsr  )   ;   CALL iom_put( "petrd_qsr" , zke )   ! air-sea : penetrative sol radiat
-      CASE ( jptra_bbc  )   ;   CALL iom_put( "petrd_bbc", zke )   ! bottom bound cond (geoth flux)
-      CASE ( jptra_atf  )   ;   CALL iom_put( "petrd_atf", zke )   ! asselin time filter (last trend)
+      CASE ( jptra_qsr  )   ;   CALL iom_put( "petrd_qsr" , zpe )   ! air-sea : penetrative sol radiat
+      CASE ( jptra_bbc  )   ;   CALL iom_put( "petrd_bbc" , zpe )   ! bottom bound cond (geoth flux)
+      CASE ( jptra_atf  )   ;   CALL iom_put( "petrd_atf" , zpe )   ! asselin time filter (last trend)
                                 IF( .NOT.lk_vvl ) THEN                   ! cst volume : ssh term (otherwise include in e3t variation)
                                    CALL wrk_alloc( jpi, jpj, z2d )
-                                   z2d(:,:) = ( ssha(:,:) - sshb(:,:) )   &
-                                      &     * (   drau_dt(:,:,1) * tsn(:,:,1,jp_tem) 
+                                   z2d(:,:) = ( ssha(:,:) - sshb(:,:) )                 &
+                                      &     * (   drau_dt(:,:,1) * tsn(:,:,1,jp_tem)    &
                                       &         + drau_ds(:,:,1) * tsn(:,:,1,jp_sal)  ) / ( fse3t(:,:,1) * pdt )
                                    CALL iom_put( "petrd_sad" , z2d )
@@ -141 +142 @@
       IF ( lk_vvl               )   CALL ctl_stop('trd_pen_init : PE trends not coded for variable volume')
       !
-      r1_2_rau0 = 0.5_wp / rau0
-      !
    END SUBROUTINE trd_pen_init
 
    !!======================================================================
-END MODULE trdtra
+END MODULE trdpen