Changeset 1170

Timestamp:

2008-08-11T14:28:51+02:00 (16 years ago)

Author:

rblod

Message:

Correct a bug for euler forward time stepping see ticket #231 , add correction for bdy (non defined fields)

Location:

trunk/NEMO/OPA_SRC

Files:

• BDY/bdy_oce.F90 (modified) (1 diff)
• DYN/dynspg_ts.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/BDY/bdy_oce.F90

@@ -78 +78 @@
    !!   Dummy module                NO Unstructured Open Boundary Condition
    !!----------------------------------------------------------------------
+   LOGICAL ::   ln_bdy_tides = .false.  !: =T apply tidal harmonic forcing along open boundaries
 #endif
 

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -346 +346 @@
          ! Time interpolation of open boundary condition data
          IF( lk_obc )   CALL obc_dta_bt( kt, jit )
-         IF( lk_bdy .or. lk_bdy_tides)   CALL bdy_dta_bt( kt, jit+1 )
+         IF( lk_bdy .OR. ln_bdy_tides)   CALL bdy_dta_bt( kt, jit+1 )
 
          ! Horizontal divergence of barotropic transports
@@ -370 +370 @@
 #endif
 
-         IF( lk_bdy .or. lk_bdy_tides ) THEN
+#if defined key_bdy
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -376 +376 @@
                END DO
             END DO
-         ENDIF
+#endif
 
          ! Sea surface height from the barotropic system
@@ -475 +475 @@
          !         - Correct the barotropic transports
          IF( lk_obc )   CALL obc_fla_ts
-         IF( lk_bdy .or. lk_bdy_tides )   CALL bdy_dyn_fla
+         IF( lk_bdy .OR. ln_bdy_tides )   CALL bdy_dyn_fla
 
          ! ... Boundary conditions on ua_e, va_e, ssha_e
@@ -492 +492 @@
          ! Time filter and swap of dynamics arrays
          ! ---------------------------------------
-         IF( neuler == 0 .AND. jit == 1 ) THEN   ! Euler (forward) time stepping
+         IF( jit == 1 ) THEN   ! Euler (forward) time stepping
             sshb_e (:,:) = sshn_e(:,:)
             zub_e  (:,:) = zun_e (:,:)
@@ -590 +590 @@
 #endif
 
-      IF ( lk_bdy .or. lk_bdy_tides ) THEN
+#if defined key_bdy
          DO jj = 1, jpj
            DO ji = 1, jpi
@@ -596 +596 @@
            END DO
          END DO
-      ENDIF
+#endif
 
       ! sea surface height