Changeset 2818 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90

Timestamp:

2011-08-08T10:16:41+02:00 (13 years ago)

Author:

davestorkey

Message:

Bug fixes for the dynspg_ts case.

File:

• branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 (modified) (2 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90

@@ -206 +206 @@
                ! Update barotropic boundary conditions only
                ! jit is optional argument for fld_read
-               IF( nn_dyn2d(ib_obc) .gt. 0 .and. nn_tides(ib_obc) .ne. 1 ) THEN
-                  jend = jstart + 2
-                  CALL fld_read( kt=kt, kn_fsbc=1, sd=bf(jstart:jend), map=nbmap_ptr(jstart:jend), jit=jit )
+               IF( nn_dyn2d(ib_obc) .gt. 0 ) THEN
+                  IF( nn_tides(ib_obc) .eq. 1 ) THEN
+                     dta_obc(ib_obc)%ssh(:) = 0.0
+                     dta_obc(ib_obc)%u2d(:) = 0.0
+                     dta_obc(ib_obc)%v2d(:) = 0.0
+                  ELSE
+                     jend = jstart + 2
+                     CALL fld_read( kt=kt, kn_fsbc=1, sd=bf(jstart:jend), map=nbmap_ptr(jstart:jend), jit=jit )
+                  ENDIF
                ENDIF
                IF( nn_tides(ib_obc) .gt. 0 ) THEN
@@ -217 +223 @@
                   jend = jstart + nb_obc_fld(ib_obc) - 1
                   CALL fld_read( kt=kt, kn_fsbc=1, sd=bf(jstart:jend), map=nbmap_ptr(jstart:jend), timeshift=1 )
+               ENDIF
+               IF( nn_tides(ib_obc) .eq. 1 ) THEN
+                  dta_obc(ib_obc)%ssh(:) = 0.0
+                  dta_obc(ib_obc)%u2d(:) = 0.0
+                  dta_obc(ib_obc)%v2d(:) = 0.0
                ENDIF
                IF( nn_tides(ib_obc) .gt. 0 ) THEN