Changeset 3402 for branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

Timestamp:

2012-05-25T18:43:49+02:00 (12 years ago)

Author:

acc

Message:

Branch: dev_r3385_NOCS04_HAMF; #665. Stage 2 of 2012 development: suppression of emps array and introduction of sfx (salt flux) array with associated code to setup the options for embedding the seaice into the ocean

File:

• branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) (7 diffs)

branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

@@ -173 +173 @@
       !!      put as run-off in open ocean.
       !!
-      !! ** Action  :   emp, emps   updated surface freshwater fluxes at kt
+      !! ** Action  :   emp   updated surface freshwater flux at kt
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean model time step
@@ -214 +214 @@
       ENDIF
       !                                                   !--------------------!
-      !                                                   !  update emp, emps  !
+      !                                                   !  update emp        !
       zfwf = 0.e0                                         !--------------------!
       DO jc = 1, jpncs
@@ -236 +236 @@
             ! water/evap excess is shared by all open ocean
             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
@@ -247 +246 @@
                       emp (ji,jj) = emp (ji,jj) + zfwf(jc) /   &
                          (FLOAT(ncsnr(jc)) * e1t(ji,jj) * e2t(ji,jj))
-                      emps(ji,jj) = emps(ji,jj) + zfwf(jc) /   &
-                          (FLOAT(ncsnr(jc)) * e1t(ji,jj) * e2t(ji,jj))
                   END IF 
                 END DO 
             ELSE 
                 emp (:,:) = emp (:,:) + zfwf(jc) / surf(jpncs+1)
-                emps(:,:) = emps(:,:) + zfwf(jc) / surf(jpncs+1)
             ENDIF
          ELSEIF( ncstt(jc) == 2 ) THEN 
@@ -264 +260 @@
                   emp (ji,jj) = emp (ji,jj) + zfwf(jc)   &
                       / (FLOAT(ncsnr(jc)) *  e1t(ji,jj) * e2t(ji,jj) )
-                  emps(ji,jj) = emps(ji,jj) + zfwf(jc)   &
-                      / (FLOAT(ncsnr(jc)) *  e1t(ji,jj) * e2t(ji,jj) )
                 END DO 
             ENDIF 
@@ -273 +267 @@
             DO ji = ncsi1(jc), ncsi2(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 
@@ -280 +273 @@
       !
       CALL lbc_lnk( emp , 'T', 1. )
-      CALL lbc_lnk( emps, 'T', 1. )
       !
    END SUBROUTINE sbc_clo