Changeset 1133 for trunk/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

Timestamp:

2008-06-24T17:41:07+02:00 (16 years ago)

Author:

smasson

Message:

new sbc namelist format, see ticket:1

File:

• trunk/NEMO/OPA_SRC/SBC/sbcblk_clio.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

@@ -121 +121 @@
       INTEGER, INTENT( in  ) ::   kt   ! ocean time step
       !!
-      INTEGER  ::   jf, ifpr, jfpr     ! dummy indices
+      INTEGER  ::   ifpr, jfpr         ! dummy indices
       INTEGER  ::   ierror             ! return error code
       !!
@@ -140 +140 @@
 
          ! (NB: frequency positive => hours, negative => months)
-         !            !    file     ! frequency !  variable  ! time intep !  clim  ! starting !
-         !            !    name     !  (hours)  !   name     !   (T/F)    !  (0/1) !  record  !
-         sn_utau = FLD_N( 'utau'    ,    24.    ,  'utau'    ,  .true.    ,    0   ,     0    ) 
-         sn_vtau = FLD_N( 'vtau'    ,    24.    ,  'vtau'    ,  .true.    ,    0   ,     0    ) 
-         sn_wndm = FLD_N( 'mwnd10m' ,    24.    ,  'm_10'    ,  .true.    ,    0   ,     0    ) 
-         sn_tair = FLD_N( 'tair10m' ,    24.    ,  't_10'    ,  .FALSE.   ,    0   ,     0    ) 
-         sn_humi = FLD_N( 'humi10m' ,    24.    ,  'q_10'    ,  .FALSE.   ,    0   ,     0    ) 
-         sn_ccov = FLD_N( 'ccover'  ,   -12.    ,  'cloud'   ,  .TRUE.    ,    0   ,     0    ) 
-         sn_prec = FLD_N( 'precip'  ,   -12.    ,  'precip'  ,  .TRUE.    ,    0   ,     0    ) 
+         !            !    file     ! frequency !  variable  ! time intep !  clim   ! 'yearly' or !
+         !            !    name     !  (hours)  !   name     !   (T/F)    !  (T/F)  !  'monthly'  !
+         sn_utau = FLD_N( 'utau'    ,    24.    ,  'utau'    ,  .true.    , .false. ,   'yearly'  ) 
+         sn_vtau = FLD_N( 'vtau'    ,    24.    ,  'vtau'    ,  .true.    , .false. ,   'yearly'  ) 
+         sn_wndm = FLD_N( 'mwnd10m' ,    24.    ,  'm_10'    ,  .true.    , .false. ,   'yearly'  ) 
+         sn_tair = FLD_N( 'tair10m' ,    24.    ,  't_10'    ,  .false.   , .false. ,   'yearly'  ) 
+         sn_humi = FLD_N( 'humi10m' ,    24.    ,  'q_10'    ,  .false.   , .false. ,   'yearly'  ) 
+         sn_ccov = FLD_N( 'ccover'  ,    -1.    ,  'cloud'   ,  .true.    , .false. ,   'yearly'  ) 
+         sn_prec = FLD_N( 'precip'  ,    -1.    ,  'precip'  ,  .true.    , .false. ,  ' yearly'  ) 
 
          REWIND( numnam )                    ! ... read in namlist namsbc_clio
@@ -163 +163 @@
             CALL ctl_stop( 'sbc_blk_clio: unable to allocate sf structure' )   ;   RETURN
          ENDIF
-         !
-         DO jf = 1, jpfld
-            WRITE(sf(jf)%clrootname,'(a,a)' )   TRIM( cn_dir ), TRIM( slf_i(jf)%clname )
-            sf(jf)%freqh   = slf_i(jf)%freqh
-            sf(jf)%clvar   = slf_i(jf)%clvar
-            sf(jf)%ln_tint = slf_i(jf)%ln_tint
-            sf(jf)%nclim   = slf_i(jf)%nclim
-            sf(jf)%nstrec  = slf_i(jf)%nstrec
-         END DO
-
-         IF(lwp) THEN      ! control print
-            WRITE(numout,*)            
-            WRITE(numout,*) 'sbc_blk_clio : flux formulattion for ocean surface boundary condition'
-            WRITE(numout,*) '~~~~~~~~~~~~ '
-            WRITE(numout,*) '          namsbc_clio Namelist'
-            WRITE(numout,*) '          list of files and frequency (>0: in hours ; <0 in months)'
-            DO jf = 1, jpfld
-                WRITE(numout,*) '               file root name: ' , TRIM( sf(jf)%clrootname ),   &
-                   &                          ' variable name: '  , TRIM( sf(jf)%clvar      )
-                WRITE(numout,*) '               frequency: '      ,       sf(jf)%freqh       ,   &
-                   &                          ' time interp: '    ,       sf(jf)%ln_tint     ,   &
-                   &                          ' climatology: '    ,       sf(jf)%nclim       ,   &
-                   &                          ' starting record: ',       sf(jf)%nstrec
-            END DO
-         ENDIF
+
+         ! fill sf with slf_i and control print
+         CALL fld_fill( sf, slf_i, cn_dir, 'sbc_blk_clio', 'flux formulation for ocean surface boundary condition', 'namsbc_clio' )
          !
       ENDIF