Changes between Version 5 and Version 6 of 2011WP/2011Stream2/OpenBoundaries

Timestamp:

2011-03-11T17:46:09+01:00 (13 years ago)

Author:

davestorkey

Comment:

--

2011WP/2011Stream2/OpenBoundaries

@@ -161 +161 @@
    INTEGER, OPTIONAL  :: jit       ! barotropic subloop index
    
-   TYPE(FLD_N), ALLOCATABLE, DIMENSION(:,:) ::   blf_i
-   
-   ALLOCATE( bf   (nb_stream, nb_dta_max), STAT=ierror )
-   ALLOCATE( blf_i(nb_stream, nb_dta_max), STAT=ierror )
-
-   DO ib_stream = 1, nb_stream
-
-      IF( kt == nit000 ) THEN
-
-         zcount = 0
-         ! nn_barotropic must come first
-         IF( nn_barotropic .gt. 0 ) THEN         
-            ! set up information for SSH 
-            zcount = zcount + 1
-            ALLOCATE( bf(ib_stream,zcount)%fnow(jpib,jpjb,1) )
-            IF( ln_tint(ib_stream) ) ALLOCATE( bf(ib_stream,zcount)%fdta(jpib,jpjb,1,2) )
-            blf_i(ib_stream,zcount)%clname = cn_dta(ib_stream)//"_grid_T.nc"
-            ...
-            ! set up information for U
-            zcount = zcount + 1
-            ...
-            ! set up information for V
-            zcount = zcount + 1
+   TYPE(FLD_N), ALLOCATABLE, DIMENSION(:) ::   blf_i
+
+   IF( kt == nit000 ) THEN                ! First call kt=nit000  
+
+      REWIND ( numnam )       
+      DO ib_set = 1, nb_set   
+         ! set file information
+         cn_dir = './'        ! directory in which the model is executed
+         ! ... default values (NB: frequency positive => hours, negative => months)
+         !              !  file   ! frequency !  variable  ! time intep !  clim   ! 'yearly' or ! weights  ! rotation  !
+         !              !  name   !  (hours)  !   name     !   (T/F)    !  (T/F)  !  'monthly'  ! filename ! pairs     !
+         bn_tem      = 'bn_tem'   ,    24     , 'bn_tem' ,   .true.     , .false. , 'daily'     , ''       , ''
+         bn_sal      = 'bn_sal'   ,    24     , 'bn_sal' ,   .true.     , .false. , 'daily'     , ''       , ''
+         bn_uvel     = 'bn_uvel'  ,    24     , 'bn_uvel',   .true.     , .false. , 'daily'     , ''       , ''
+         bn_vvel     = 'bn_vvel'  ,    24     , 'bn_vvel',   .true.     , .false. , 'daily'     , ''       , ''
+         bn_ssh      = 'bn_ssh'   ,    24     , 'bn_ssh' ,   .true.     , .false. , 'daily'     , ''       , ''
+         bn_ubar     = 'bn_ubar'  ,    24     , 'bn_ubar',   .true.     , .false. , 'daily'     , ''       , ''
+         bn_vbar     = 'bn_vbar'  ,    24     , 'bn_vbar',   .true.     , .false. , 'daily'     , ''       , ''
+
+         READ   ( numnam, namobc_dta ) 
+
+         ! Only read in necessary fields for this set.
+         zcount = 0        
+         IF( nn_barotropic(ib_set) .gt. 0 ) THEN
+            zcount = zcount+1 ; jp_ssh = zcount
+            blf_i(jp_ssh) = bn_ssh
+            zcount = zcount+1 ; jp_ubar = zcount
+            blf_i(jp_ubar) = bn_ubar
+            zcount = zcount+1 ; jp_vbar = zcount
+            blf_i(jp_vbar) = bn_vbar
          ENDIF
-         IF ( nn_tra .gt. 0 ) THEN
-            ! set up information for T and S
-            ...
-         ENDIF
+         IF( nn_tra(ib_set) .gt. 0 ) THEN
          ....
-            
-         nn_dta(ib_stream) = zcount
-         CALL fld_fill( bf(ib_stream,1:nn_dta(ib_stream)), blf_i(ib_stream,1:nn_dta(ib_stream)), ... )
-      
-      ENDIF ! kt == nit000
-      
-      IF( PRESENT(jit) && nn_barotropic(ib_stream) .gt. 0 ) THEN
+         
+         nb_dta(ib_set) = zcount
+         CALL fld_fill( bf(1:nb_dta(ib_set)), blf_i(ib_set,1:nb_dta(ib_set)), ... )
+
+      END DO
+   END IF
+
+   DO ib_set = 1, nb_set   
+   
+      IF( PRESENT(jit) ) THEN
          ! Update barotropic boundary conditions only
          ! jit is optional argument for fld_read
-         CALL fld_read( kt, jit, nn_fobc, bf(ib_stream, 1:3) )
+         IF( nn_barotropic(ib_set) .gt. 0 ) THEN
+            CALL fld_read( kt, nn_fobc, bf(ib_set, 1:3), jit=jit )
+         ENDIF
       ELSE
-         CALL fld_read( kt, nn_fobc, bf(ib_stream, 1:nb_dta(ib_stream) )
+         IF ( nn_barotropic(ib_set) .gt. 0 .OR. &
+        &     nn_tra(ib_set)        .gt. 0 .OR. &
+        &     nn_dyn(ib_set)        .gt. 0 )      THEN
+            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
       
-      !
-      ! Update internal boundary data arrays from bf%fnow
-      !      
-
-   END DO  ! ib_stream
+      IF( .NOT. PRESENT(jit) ) THEN
+         IF( nn_tra(ib_set) .gt. 0 ) THEN
+         ....
+         
+
+   END DO  ! ib_set
    
    END SUBROUTINE