Changeset 3625 for branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/TOP_SRC/TRP

Timestamp:

2012-11-21T14:19:18+01:00 (12 years ago)

Author:

acc

Message:

Branch dev_NOC_2012_r3555. #1006. Step 7. Check in code now merged with dev_r3385_NOCS04_HAMF

File:

• branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) (5 diffs)

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90

@@ -63 +63 @@
       REAL(wp) ::   zsrau, zse3t   ! temporary scalars
       CHARACTER (len=22) :: charout
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zemps
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: zsfx
       REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrtrd
       !!---------------------------------------------------------------------
@@ -70 +70 @@
       !
       ! Allocate temporary workspace
-                      CALL wrk_alloc( jpi, jpj,      zemps  )
+                      CALL wrk_alloc( jpi, jpj,      zsfx   )
       IF( l_trdtrc )  CALL wrk_alloc( jpi, jpj, jpk, ztrtrd )
 
@@ -80 +80 @@
 
 
-      IF( lk_offline ) THEN          ! emps in dynamical files contains emps - rnf
-         zemps(:,:) = emps(:,:)  
+      IF( lk_offline ) THEN          ! sfx in dynamical files contains sfx  - rnf
+         zsfx(:,:) = sfx(:,:)  
       ELSE                           ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff
          IF( lk_vvl ) THEN                      ! volume variable
-            zemps(:,:) = emps(:,:) - emp(:,:)   
-!!ch         zemps(:,:) = 0.
+            zsfx(:,:) = sfx(:,:) - emp(:,:)   
+!!ch         zsfx(:,:) = 0.
          ELSE                                   ! linear free surface
-            IF( ln_rnf ) THEN  ;  zemps(:,:) = emps(:,:) - rnf(:,:)   !  E-P-R
-            ELSE               ;  zemps(:,:) = emps(:,:)
+            IF( ln_rnf ) THEN  ;  zsfx(:,:) = sfx(:,:) - rnf(:,:)   !  E-P-R
+            ELSE               ;  zsfx(:,:) = sfx(:,:)
             ENDIF 
          ENDIF 
@@ -102 +102 @@
             DO ji = fs_2, fs_jpim1   ! vector opt.
                zse3t = 1. / fse3t(ji,jj,1)
-               tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + zemps(ji,jj) *  zsrau * trn(ji,jj,1,jn) * zse3t
+               tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + zsfx(ji,jj) *  zsrau * trn(ji,jj,1,jn) * zse3t
             END DO
          END DO
@@ -117 +117 @@
                                            CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
       ENDIF
-                      CALL wrk_dealloc( jpi, jpj,      zemps  )
+                      CALL wrk_dealloc( jpi, jpj,      zsfx   )
       IF( l_trdtrc )  CALL wrk_dealloc( jpi, jpj, jpk, ztrtrd )
       !