Changes between Version 11 and Version 12 of 2011WP/2011Stream2/OpenBoundaries

Timestamp:

2011-03-29T13:47:08+02:00 (13 years ago)

Author:

davestorkey

Comment:

--

2011WP/2011Stream2/OpenBoundaries

@@ -223 +223 @@
    END IF
 
-
+   jstart = 1
+   jfld = 0
    DO ib_set = 1, nb_set   
-   
-      IF( PRESENT(jit) ) THEN
-         ! Update barotropic boundary conditions only
-         ! jit is optional argument for fld_read
-         IF( nn_barotropic(ib_set) .gt. 0 ) THEN
-            CALL fld_read( kt, nn_fobc, bf(ib_set, 1:3), jit=jit )
-         ENDIF
-      ELSE
-         IF ( nn_barotropic(ib_set) .gt. 0 .OR. &
-        &     nn_tra(ib_set)        .gt. 0 .OR. &
-        &     nn_dyn(ib_set)        .gt. 0 )      THEN
+      IF( nn_dtactl(ib_set) = 1 ) THEN
+      
+         IF( PRESENT(jit) ) THEN
+            ! Update barotropic boundary conditions only
+            ! jit is optional argument for fld_read
+            IF( nn_dyn2d(ib_set) .gt. 0 ) THEN
+               jend = jstart + 2
+               CALL fld_read( kt, nn_fobc, bf(jstart:jend), jit=jit )
+            ENDIF
+         ELSE
+            jend = jstart + nb_obc(ib_set) - 1
             CALL fld_read( kt, nn_fobc, bf(ib_set, 1:nb_dta(ib_set) )
          ENDIF
-      ENDIF
-
-      IF( nn_barotropic .gt. 0 ) THEN
-         sshbdy(ib_set,:) = bf(ib_set, jp_ssh)%fnow
-         ubar(ib_set,:) = bf(ib_set, jp_ubar)%fnow
-         ...
-      ENDIF
+
+         IF( nn_dyn2d .gt. 0 ) THEN
+            jpfld = jpfld + 1
+            sshbdy(ib_set,:) = bf(jpfld)%fnow
+            jpfld = jpfld + 1
+            ubar(ib_set,:) = bf(jpfld)%fnow
+            ...
+         ENDIF
       
-      IF( .NOT. PRESENT(jit) ) THEN
-         IF( nn_tra(ib_set) .gt. 0 ) THEN
-         ....
+         IF( .NOT. PRESENT(jit) ) THEN
+            IF( nn_tra(ib_set) .gt. 0 ) THEN
+               jpfld = jpfld + 1
+               sshbdy(ib_set,:) = bf(jpfld)%fnow
+               ....
          
 
+      END IF ! nn_dtactl(ib_set) = 1
    END DO  ! ib_set