Changeset 3317 for branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2012-02-23T12:21:08+01:00 (12 years ago)

Author:

gm

Message:

Ediag branche: #927 restructuration of the trdicp computation - part I

File:

• branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (5 diffs)

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -104 +104 @@
       !! ** Action  : - Update the 1st level of (ta,sa) with the trend associated
       !!                with the tracer surface boundary condition 
-      !!              - save the trend it in ttrd ('key_trdtra')
+      !!              - send trends to trdtra module (l_trdtra=T)
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
@@ -123 +123 @@
       zsrau = 1. / rau0             ! initialization
 
-      IF( l_trdtra )   THEN                    !* Save ta and sa trends
+      IF( l_trdtra ) THEN                    !* Save ta and sa trends
          CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds ) 
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
@@ -145 +145 @@
               & iom_varid( numror, 'sbc_hc_b', ldstop = .FALSE. ) > 0 ) THEN
             IF(lwp) WRITE(numout,*) '          nit000-1 surface tracer content forcing fields red in the restart file'
-            zfact = 0.5e0
+            zfact = 0.5_wp
             CALL iom_get( numror, jpdom_autoglo, 'sbc_hc_b', sbc_tsc_b(:,:,jp_tem) )   ! before heat content sbc trend
             CALL iom_get( numror, jpdom_autoglo, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal) )   ! before salt content sbc trend
          ELSE                                         ! No restart or restart not found: Euler forward time stepping
-            zfact = 1.e0
+            zfact = 1._wp
             sbc_tsc_b(:,:,:) = 0.e0
          ENDIF
       ELSE                                         ! Swap of forcing fields
          !                                         ! ----------------------
-         zfact = 0.5e0
+         zfact = 0.5_wp
          sbc_tsc_b(:,:,:) = sbc_tsc(:,:,:)
       ENDIF
@@ -206 +206 @@
       !----------------------------------------
       !
-      zfact = 0.5e0
 
       ! Effect on (t,s) due to river runoff (dilution effect automatically applied via vertical tracer advection) 
       IF( ln_rnf ) THEN  
+         zfact = 0.5_wp
          DO jj = 2, jpj 
             DO ji = fs_2, fs_jpim1
-               zdep = 1. / h_rnf(ji,jj)
-               zdep = zfact * zdep  
+               zdep = zfact / h_rnf(ji,jj)
                IF ( rnf(ji,jj) /= 0._wp ) THEN
                   DO jk = 1, nk_rnf(ji,jj)
@@ -225 +224 @@
          END DO  
       ENDIF  
-!!gm  It should be useless
+!!gm  It should be useless  ==>> to be suppressed !
       CALL lbc_lnk( tsa(:,:,:,jp_tem), 'T', 1. )    ;    CALL lbc_lnk( tsa(:,:,:,jp_sal), 'T', 1. )
+!!gm : end of useless
 
       IF( l_trdtra )   THEN                      ! save the horizontal diffusive trends for further diagnostics