Changeset 3692

Timestamp:

2012-11-28T08:54:04+01:00 (11 years ago)

Author:

rblod

Message:

correct pb with agrif and obc (potentially bdy) see ticket #1029

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• dynnxt.F90 (modified) (3 diffs)
• dynspg_flt.F90 (modified) (1 diff)

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

@@ -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??

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

@@ -188 +188 @@
 
 #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