Changeset 2797 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2011-07-11T12:53:56+02:00 (13 years ago)

Author:

davestorkey

Message:

Delete BDY module and first implementation of new OBC module.

1. Initial restructuring.
2. Use fldread to read open boundary data.

File:

• branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (3 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -26 +26 @@
    USE lbclnk          ! ocean lateral boundary condition (or mpp link)
    USE lib_mpp         ! MPP library
-   USE obc_par         ! open boundary cond. parameter
    USE obc_oce
-   USE bdy_oce
    USE diaar5, ONLY:   lk_diaar5
    USE iom
@@ -175 +173 @@
 #endif
 #if defined key_obc
-      IF( Agrif_Root() ) THEN 
-         ssha(:,:) = ssha(:,:) * obctmsk(:,:)
-         CALL lbc_lnk( ssha, 'T', 1. )                 ! absolutly compulsory !! (jmm)
-      ENDIF
-#endif
-#if defined key_bdy
-      ssha(:,:) = ssha(:,:) * bdytmask(:,:)
-      CALL lbc_lnk( ssha, 'T', 1. ) 
+      ssha(:,:) = ssha(:,:) * obctmask(:,:)
+      CALL lbc_lnk( ssha, 'T', 1. )                 ! absolutly compulsory !! (jmm)
 #endif
 
@@ -217 +209 @@
             &                      - ( fse3t_a(:,:,jk) - fse3t_b(:,:,jk) )    &
             &                         * tmask(:,:,jk) * z1_2dt
-#if defined key_bdy
-         wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
+#if defined key_obc
+         wn(:,:,jk) = wn(:,:,jk) * obctmask(:,:)
 #endif
       END DO