Changeset 1133 for trunk/NEMO/OPA_SRC/SBC/sbcflx.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/sbcflx.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcflx.F90

@@ -106 +106 @@
       NAMELIST/namsbc_flx/ cn_dir, sn_utau, sn_vtau, sn_qtot, sn_qsr, sn_emp
       !!---------------------------------------------------------------------
-   INTEGER , PARAMETER ::   jp_utau = 1   ! index of wind stress (i-component) file
-   INTEGER , PARAMETER ::   jp_vtau = 2   ! index of wind stress (j-component) file
-   INTEGER , PARAMETER ::   jp_qtot = 3   ! index of total (non solar+solar) heat file
-   INTEGER , PARAMETER ::   jp_qsr  = 4   ! index of solar heat file
-   INTEGER , PARAMETER ::   jp_emp  = 5   ! index of evaporation-precipation file
-
-
       !                                         ! ====================== !
       IF( kt == nit000 ) THEN                   !  First call kt=nit000  !
@@ -119 +112 @@
          cn_dir = './'        ! directory in which the model is executed
          ! ... default values (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.nc' ,    24.    ,  'utau'    ,  .FALSE.   ,    0   ,     0    )
-         sn_vtau = FLD_N( 'vtau.nc' ,    24.    ,  'vtau'    ,  .FALSE.   ,    0   ,     0    )
-         sn_qtot = FLD_N( 'qtot.nc' ,    24.    ,  'qtot'    ,  .FALSE.   ,    0   ,     0    )
-         sn_qsr  = FLD_N( 'qsr.nc'  ,    24.    ,  'qsr'     ,  .FALSE.   ,    0   ,     0    )
-         sn_emp  = FLD_N( 'emp.nc'  ,    24.    ,  'emp'     ,  .FALSE.   ,    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'    ,  .false.   , .false. ,   'yearly'  )
+         sn_vtau = FLD_N(   'vtau'  ,    24.    ,  'vtau'    ,  .false.   , .false. ,   'yearly'  )
+         sn_qtot = FLD_N(   'qtot'  ,    24.    ,  'qtot'    ,  .false.   , .false. ,   'yearly'  )
+         sn_qsr  = FLD_N(   'qsr'   ,    24.    ,  'qsr'     ,  .false.   , .false. ,   'yearly'  )
+         sn_emp  = FLD_N(   'emp'   ,    24.    ,  'emp'     ,  .false.   , .false. ,   'yearly'  )
 
          REWIND ( numnam )               ! ... read in namlist namflx
@@ -137 +130 @@
          ! set sf structure
          ALLOCATE( sf(jpfld), STAT=ierror )
-         IF( ierror > 0 ) THEN
-            CALL ctl_stop( 'sbc_flx: unable to allocate sf structure' )   ;   RETURN
+         IF( ierror > 0 ) THEN   
+            CALL ctl_stop( 'sbc_flx: 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_flx : flux formulation for ocean surface boundary condition'
-            WRITE(numout,*) '~~~~~~~ '
-            WRITE(numout,*) '          namsbc_flx Namelist'
-            WRITE(numout,*) '          list of files and frequency (>0: in hours ; <0 in months)'
-            DO jf = 1, jpfld
-                WRITE(numout,*) '               root filename: '  , 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_flx', 'flux formulation for ocean surface boundary condition', 'namsbc_flx' )
          !
       ENDIF