Changeset 2028

Timestamp:

2010-07-29T13:43:21+02:00 (14 years ago)

Author:

rblod

Message:

Fix bug in obc, see ticket #689

Location:

trunk/NEMO/OPA_SRC/OBC

Files:

• obcini.F90 (modified) (4 diffs)
• obctra.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/OBC/obcini.F90

@@ -62 +62 @@
       NAMELIST/namobc/ rn_dpein, rn_dpwin, rn_dpnin, rn_dpsin,       &
          &             rn_dpeob, rn_dpwob, rn_dpnob, rn_dpsob,       &
-         &             rn_volemp, nn_obcdta, cn_obcdta, rn_volemp,   &
+         &             rn_volemp, nn_obcdta, cn_obcdta,    &
          &             ln_obc_clim, ln_vol_cst, ln_obc_fla
       !!----------------------------------------------------------------------
@@ -70 +70 @@
 
       ! convert DOCTOR namelist name into the OLD names
+      nbobc    = 0
       nobc_dta = nn_obcdta
       cffile   = cn_obcdta
@@ -149 +150 @@
       ENDIF
 
-      IF( nbobc /= 0 .AND. jperio /= 0 )   &
+      IF( nbobc >= 2 .AND. jperio /= 0 )   &
          &   CALL ctl_stop( ' Cyclic or symmetric, and open boundary condition are not compatible' )
 
@@ -441 +442 @@
             END DO
          END IF
-
          IF( lp_obc_north ) THEN ! ... North open boundary lateral surface
             DO jj = njn0, njn1

trunk/NEMO/OPA_SRC/OBC/obctra.F90

@@ -490 +490 @@
                   zin = sign( 1., -1.* z05cx )
                   zin = 0.5*( zin + abs(zin) )
-                  ztau = (1.-zin ) + zin * rtaus
+                  ztau = (1.-zin ) * rtausin + zin * rtaus
                   z05cx = z05cx * zin
+
          !... update (ta,sa) with radiative or climatological (t, s)
                   ta(ji,jj,jk) = ta(ji,jj,jk) * (1.-tsmsk(ji,jk)) +             &