Changeset 2128 for branches/devukmo2010/NEMO/OPA_SRC/DYN/divcur.F90

Timestamp:

2010-09-28T14:29:51+02:00 (14 years ago)

Author:

rfurner

Message:

merged branches OBS, ASM, Rivers, BDY & mixed_dynldf ready for vn3.3 merge

File:

• branches/devukmo2010/NEMO/OPA_SRC/DYN/divcur.F90 (modified) (8 diffs)

branches/devukmo2010/NEMO/OPA_SRC/DYN/divcur.F90

@@ -14 +14 @@
    USE in_out_manager  ! I/O manager
    USE obc_oce         ! ocean lateral open boundary condition
-   USE bdy_oce        ! Unstructured open boundaries variables
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE sbcrnf, ONLY  : rnf_dep, rnf_mod_dep  ! River runoff
+   USE phycst,  ONLY : rau0                  ! physical constant
+   USE sbc_oce, ONLY : ln_rnf, rnf           ! surface boundary condition: ocean
 
    IMPLICIT NONE
@@ -79 +81 @@
       !!   9.0  !  03-08  (G. Madec)  merged of cur and div, free form, F90
       !!        !  05-01  (J. Chanut, A. Sellar) unstructured open boundaries
+      !! NEMO 3.3  !  2010-09  (D.Storkey and E.O'Dea) bug fixes for BDY module
       !!----------------------------------------------------------------------
       !! * Arguments
@@ -89 +92 @@
       REAL(wp), DIMENSION(   jpi  ,1:jpj+2) ::   zwu   ! workspace
       REAL(wp), DIMENSION(-1:jpi+2,  jpj  ) ::   zwv   ! workspace
+      REAL(wp) ::  zraur,  zdep   ! temporary scalar
       !!----------------------------------------------------------------------
 
@@ -131 +135 @@
             IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
          ENDIF
-#endif         
-#if defined key_bdy
-         ! unstructured open boundaries (div must be zero behind the open boundary)
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               hdivn(ji,jj,jk)=hdivn(ji,jj,jk)*bdytmask(ji,jj)
-            END DO
-         END DO
 #endif         
          IF( .NOT. AGRIF_Root() ) THEN
@@ -244 +240 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      IF ( ln_rnf ) THEN
+      zraur = 1. / rau0
+        DO ji=1,jpi
+          DO jj=1,jpj
+            zdep = 1. / rnf_dep(ji,jj)
+            DO jk=1,rnf_mod_dep(ji,jj)
+              hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - rnf(ji,jj)*zraur*zdep
+            ENDDO
+          ENDDO
+        ENDDO
+      ENDIF
       
       ! 4. Lateral boundary conditions on hdivn and rotn
@@ -301 +309 @@
       !! * Local declarations
       INTEGER  ::   ji, jj, jk          ! dummy loop indices
+      REAL(wp) ::  zraur,  zdep   ! temporary scalar
       !!----------------------------------------------------------------------
 
@@ -344 +353 @@
          ENDIF
 #endif         
-#if defined key_bdy
-         ! unstructured open boundaries (div must be zero behind the open boundary)
-         DO jj = 1, jpj
-           DO ji = 1, jpi
-             hdivn(ji,jj,jk)=hdivn(ji,jj,jk)*bdytmask(ji,jj)
-           END DO
-         END DO
-#endif        
          IF( .NOT. AGRIF_Root() ) THEN
             IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east
@@ -372 +373 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      
+
+      IF ( ln_rnf ) THEN
+      zraur = 1. / rau0
+        DO ji=1,jpi
+          DO jj=1,jpj
+            zdep = 1. / rnf_dep(ji,jj)
+            DO jk=1,rnf_mod_dep(ji,jj)
+              hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - rnf(ji,jj)*zraur*zdep
+            ENDDO
+          ENDDO
+        ENDDO
+      ENDIF
+
       ! 4. Lateral boundary conditions on hdivn and rotn
       ! ---------------------------------=======---======