Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM/closea.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/DOM/closea.F90 (modified) (7 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

@@ -44 +44 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2006) 
+   !! 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)
    !!----------------------------------------------------------------------
 
@@ -180 +180 @@
       INTEGER                     ::   ji, jj, jc, jn   ! dummy loop indices
       REAL(wp)                    ::   zze2
-      REAL(wp), DIMENSION (jpncs) ::   zemp
+      REAL(wp), DIMENSION (jpncs) ::   zfwf 
+ 
       !!----------------------------------------------------------------------
       !
@@ -216 +217 @@
       !                                                   !--------------------!
       !                                                   !  update emp, emps  !
-      zemp = 0.e0                                         !--------------------!
+      zfwf = 0.e0                                         !--------------------!
       DO jc = 1, jpncs
          DO jj = ncsj1(jc), ncsj2(jc)
             DO ji = ncsi1(jc), ncsi2(jc)
-               zemp(jc) = zemp(jc) + e1t(ji,jj) * e2t(ji,jj) * emp(ji,jj) * tmask_i(ji,jj)
+               zfwf(jc) = zfwf(jc) + e1t(ji,jj) * e2t(ji,jj) * ( emp(ji,jj)-rnf(ji,jj) ) * tmask_i(ji,jj) 
             END DO  
          END DO 
       END DO
-      IF( lk_mpp )   CALL mpp_sum ( zemp(:) , jpncs )       ! mpp: sum over all the global domain
+      IF( lk_mpp )   CALL mpp_sum ( zfwf(:) , jpncs )       ! mpp: sum over all the global domain
 
       IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN      ! Black Sea case for ORCA_R2 configuration
-         zze2    = ( zemp(3) + zemp(4) ) / 2.
-         zemp(3) = zze2
-         zemp(4) = zze2
+         zze2    = ( zfwf(3) + zfwf(4) ) / 2.
+         zfwf(3) = zze2
+         zfwf(4) = zze2
       ENDIF
 
@@ -236 +237 @@
          IF( ncstt(jc) == 0 ) THEN 
             ! water/evap excess is shared by all open ocean
-            emp (:,:) = emp (:,:) + zemp(jc) / surf(jpncs+1)
-            emps(:,:) = emps(:,:) + zemp(jc) / surf(jpncs+1)
+            emp (:,:) = emp (:,:) + zfwf(jc) / surf(jpncs+1)
+            emps(:,:) = emps(:,:) + zfwf(jc) / surf(jpncs+1)
          ELSEIF( ncstt(jc) == 1 ) THEN 
             ! Excess water in open sea, at outflow location, excess evap shared
-            IF ( zemp(jc) <= 0.e0 ) THEN 
+            IF ( zfwf(jc) <= 0.e0 ) THEN 
                 DO jn = 1, ncsnr(jc)
                   ji = mi0(ncsir(jc,jn))
@@ -246 +247 @@
                   IF (      ji > 1 .AND. ji < jpi   &
                       .AND. jj > 1 .AND. jj < jpj ) THEN 
-                      emp (ji,jj) = emp (ji,jj) + zemp(jc) /   &
+                      emp (ji,jj) = emp (ji,jj) + zfwf(jc) /   &
                          (FLOAT(ncsnr(jc)) * e1t(ji,jj) * e2t(ji,jj))
-                      emps(ji,jj) = emps(ji,jj) + zemp(jc) /   &
+                      emps(ji,jj) = emps(ji,jj) + zfwf(jc) /   &
                           (FLOAT(ncsnr(jc)) * e1t(ji,jj) * e2t(ji,jj))
                   END IF 
                 END DO 
             ELSE 
-                emp (:,:) = emp (:,:) + zemp(jc) / surf(jpncs+1)
-                emps(:,:) = emps(:,:) + zemp(jc) / surf(jpncs+1)
+                emp (:,:) = emp (:,:) + zfwf(jc) / surf(jpncs+1)
+                emps(:,:) = emps(:,:) + zfwf(jc) / surf(jpncs+1)
             ENDIF
          ELSEIF( ncstt(jc) == 2 ) THEN 
@@ -263 +264 @@
                   ji = mi0(ncsir(jc,jn))
                   jj = mj0(ncsjr(jc,jn)) ! Location of outflow in open ocean
-                  emp (ji,jj) = emp (ji,jj) + zemp(jc)   &
+                  emp (ji,jj) = emp (ji,jj) + zfwf(jc)   &
                       / (FLOAT(ncsnr(jc)) *  e1t(ji,jj) * e2t(ji,jj) )
-                  emps(ji,jj) = emps(ji,jj) + zemp(jc)   &
+                  emps(ji,jj) = emps(ji,jj) + zfwf(jc)   &
                       / (FLOAT(ncsnr(jc)) *  e1t(ji,jj) * e2t(ji,jj) )
                 END DO 
@@ -273 +274 @@
          DO jj = ncsj1(jc), ncsj2(jc)
             DO ji = ncsi1(jc), ncsi2(jc)
-               emp (ji,jj) = emp (ji,jj) - zemp(jc) / surf(jc)
-               emps(ji,jj) = emps(ji,jj) - zemp(jc) / surf(jc)
+               emp (ji,jj) = emp (ji,jj) - zfwf(jc) / surf(jc)
+               emps(ji,jj) = emps(ji,jj) - zfwf(jc) / surf(jc)
             END DO  
          END DO