Changeset 63 for trunk

Timestamp:

12/27/12 21:41:35 (11 years ago)

Author:

smasson

Message:

correct pb with agrif and obc, following changset 3692 of NEMO

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• dynnxt.F90 (modified) (6 diffs)
• dynspg_flt.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -56 +56 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: dynnxt.F90 3294 2012-01-28 16:44:18Z rblod $ 
+   !! $Id: dynnxt.F90 3692 2012-11-28 07:54:04Z rblod $ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -156 +156 @@
 # if defined key_obc
       !                                !* OBC open boundaries
-      CALL obc_dyn( kt )
+      IF( lk_obc ) CALL obc_dyn( kt )
       !
       IF( .NOT. lk_dynspg_flt ) THEN
@@ -163 +163 @@
          !                                       sshn_b (= after ssha_b) for time-splitting case (lk_dynspg_ts=T)
          !                              - Correct the barotropic velocities
-         CALL obc_dyn_bt( kt )
+         IF( lk_obc ) CALL obc_dyn_bt( kt )
          !
 !!gm ERROR - potential BUG: sshn should not be modified at this stage !!   ssh_nxt not alrady called
          CALL lbc_lnk( sshn, 'T', 1. )         ! Boundary conditions on sshn
          !
-         IF( ln_vol_cst )   CALL obc_vol( kt )
+         IF( lk_obc .AND. ln_vol_cst )   CALL obc_vol( kt )
          !
          IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshn, clinfo1=' ssh      : ', mask1=tmask )
@@ -175 +175 @@
 # elif defined key_bdy
       !                                !* BDY open boundaries
-      IF( lk_dynspg_exp ) CALL bdy_dyn( kt )
-      IF( lk_dynspg_ts )  CALL bdy_dyn( kt, dyn3d_only=.true. )
+      IF( lk_bdy .AND. lk_dynspg_exp ) CALL bdy_dyn( kt )
+      IF( lk_bdy .AND. lk_dynspg_ts  ) CALL bdy_dyn( kt, dyn3d_only=.true. )
 
 !!$   Do we need a call to bdy_vol here??
@@ -248 +248 @@
                DO jk = 1, jpkm1                       ! Leap-Frog - Asselin filter and swap: 
                   DO jj = 1, jpj                      !                   applied on thickness weighted velocity
-                     DO ji = 1, jpim1                 !                              ---------------------------
+                     DO ji = 1, jpi                   !                              ---------------------------
                         zue3a = ua(ji,jj,jk) * fse3u_a(ji,jj,jk)
                         zve3a = va(ji,jj,jk) * fse3v_a(ji,jj,jk)
@@ -268 +268 @@
                fse3u_b(:,:,1:jpkm1) = ze3u_f(:,:,1:jpkm1)      ! e3u_b <-- filtered scale factor
                fse3v_b(:,:,1:jpkm1) = ze3v_f(:,:,1:jpkm1)
-               CALL lbc_lnk( ub, 'U', -1. )                    ! lateral boundary conditions
-               CALL lbc_lnk( vb, 'V', -1. )
             ENDIF
             !

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -62 +62 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: dynspg_flt.F90 3294 2012-01-28 16:44:18Z rblod $
+   !! $Id: dynspg_flt.F90 3692 2012-11-28 07:54:04Z rblod $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -187 +187 @@
 
 #if defined key_obc
-      CALL obc_dyn( kt )      ! Update velocities on each open boundary with the radiation algorithm
-      CALL obc_vol( kt )      ! Correction of the barotropic componant velocity to control the volume of the system
+      IF( lk_obc ) CALL obc_dyn( kt )   ! Update velocities on each open boundary with the radiation algorithm
+      IF( lk_obc)  CALL obc_vol( kt )   ! Correction of the barotropic componant velocity to control the volume of the system
 #endif
 #if defined key_bdy
-      CALL bdy_dyn( kt )      ! Update velocities on each open boundary
-      CALL bdy_vol( kt )      ! Correction of the barotropic component velocity to control the volume of the system
+      IF( lk_bdy ) CALL bdy_dyn( kt )   ! Update velocities on each open boundary
+      IF( lk_bdy ) CALL bdy_vol( kt )   ! Correction of the barotropic component velocity to control the volume of the system
 #endif
 #if defined key_agrif