Changeset 2236 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DYN/divcur.F90

Timestamp:

2010-10-12T20:49:32+02:00 (14 years ago)

Author:

cetlod

Message:

First guess of NEMO_v3.3

File:

• branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DYN/divcur.F90 (modified) (6 diffs)

branches/DEV_r2106_LOCEAN2010/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         ! river runoff 
+   USE sbc_oce, ONLY : ln_rnf   ! surface boundary condition: ocean
 
    IMPLICIT NONE
@@ -79 +80 @@
       !!   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
@@ -132 +134 @@
             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
@@ -245 +239 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      IF( ln_rnf )  CALL sbc_rnf_div( hdivn )          ! runoffs (update hdivn field)
       
       ! 4. Lateral boundary conditions on hdivn and rotn
@@ -346 +342 @@
          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
@@ -374 +362 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      
+
+      IF( ln_rnf )  CALL sbc_rnf_div( hdivn )          ! runoffs (update hdivn field)
+
       ! 4. Lateral boundary conditions on hdivn and rotn
       ! ---------------------------------=======---======