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

trunk/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -116 +116 @@
       !                                   !   Namelist
       !                                   ! ============
-      !                                         ! Default values NB: frequency>0 hours, <0 months)
-      !            !   file    ! frequency !  variable  ! time intep !  clim  ! starting !
-      !            !   name    !  (hours)  !   name     !   (T/F)    !  (0/1) !  record  !
-      sn_rnf = FLD_N( 'runoffs',   -12.    , 'sorunoff' ,  .TRUE.    ,    1   ,     0    )
-      sn_cnf = FLD_N( 'runoffs',     0.    , 'sorunoff' ,  .FALSE.   ,    1   ,     0    )
+      ! (NB: frequency positive => hours, negative => months)
+      !            !   file    ! frequency !  variable  ! time intep !  clim  ! 'yearly' or !
+      !            !   name    !  (hours)  !   name     !   (T/F)    !  (T/F) !  'monthly'  !
+      sn_rnf = FLD_N( 'runoffs',    -1.    , 'sorunoff' ,  .TRUE.    , .true. ,   'yearly'  )
+      sn_cnf = FLD_N( 'runoffs',     0.    , 'sorunoff' ,  .FALSE.   , .true. ,   'yearly'  )
 
       !
@@ -152 +152 @@
             CALL ctl_stop( 'sbc_rnf: unable to allocate sf_rnf structure' )   ;   RETURN
          ENDIF
-         !                                         ! namelist informations stored in sf_rnf structures
-         WRITE( sf_rnf(1)%clrootname, '(a,a)' )   TRIM( cn_dir ), TRIM( sn_rnf%clname )
-         sf_rnf(1)%freqh   = sn_rnf%freqh
-         sf_rnf(1)%clvar   = sn_rnf%clvar
-         sf_rnf(1)%ln_tint = sn_rnf%ln_tint
-         sf_rnf(1)%nclim   = sn_rnf%nclim
-         sf_rnf(1)%nstrec  = sn_rnf%nstrec
-         IF(lwp) THEN                              ! control print
-            WRITE(numout,*) '   Runoffs data read in the following file: '
-            WRITE(numout,*) '               root filename: '  , trim( sf_rnf(1)%clrootname ),   &
-               &                          ' variable name: '  , trim( sf_rnf(1)%clvar      )
-            WRITE(numout,*) '               frequency: '      ,       sf_rnf(1)%freqh       ,   &
-               &                          ' time interp: '    ,       sf_rnf(1)%ln_tint     ,   &
-               &                          ' climatology: '    ,       sf_rnf(1)%nclim       ,   &
-               &                          ' starting record: ',       sf_rnf(1)%nstrec
-         ENDIF
+
+         ! fill sf_rnf with sn_rnf and control print
+         CALL fld_fill( sf_rnf, (/ sn_rnf /), cn_dir, 'sbc_rnf_init', 'read runoffs data', 'namsbc_rnf' )
          !
       ENDIF
@@ -238 +225 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~~ '
 
-      WRITE(cl_rnfile, '(a,a)')   TRIM( cn_dir ), TRIM( sn_cnf%clname )
-      SELECT CASE( sn_cnf%nclim )
-      CASE( 0 )
-         WRITE(cl_rnfile, '(a,a,"_",i4,".nc")' ) TRIM( cn_dir ), TRIM( sn_cnf%clname ), nyear
-      CASE( 1 )
-         WRITE(cl_rnfile, '(a,a,  ".nc")' ) TRIM( cn_dir ), TRIM( sn_cnf%clname )
-      END SELECT
-
+      cl_rnfile = TRIM( cn_dir )//TRIM( sn_cnf%clname )
+      IF( .NOT. sn_cnf%ln_clim ) THEN   ;   WRITE(cl_rnfile, '(a,"_y",i4)' ) TRIM( cl_rnfile ), nyear    ! add year
+         IF( sn_cnf%cltype == 'monthly' )   WRITE(cl_rnfile, '(a,"m",i2)'  ) TRIM( cl_rnfile ), nmonth   ! add month
+      ENDIF
+  
       ! horizontal mask (read in NetCDF file)
       CALL iom_open ( cl_rnfile, inum )                           ! open file