Changeset 747


Ignore:
Timestamp:
2007-12-07T11:47:08+01:00 (14 years ago)
Author:
ctlod
Message:

Modifications related to the re-organization of new SBC namelist, see ticket:#27

Location:
branches/dev_001_SBC/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcmod.F90

    r702 r747  
    5656   INTEGER , PUBLIC ::   nn_fwb      = 0         !: type of FreshWater Budget control (=0/1/2) 
    5757   NAMELIST/namsbc/ nn_fsbc, ln_ana, ln_flx, ln_blk_clio, ln_blk_core, ln_cpl,   & 
    58       &             nn_ice , ln_rnf, ln_ssr, nn_fwb 
     58      &             nn_ice , ln_dm2dc, ln_rnf, ln_ssr, nn_fwb 
    5959 
    6060   INTEGER ::   nsbc   ! type of surface boundary condition (deduced from namsbc informations) 
     
    6565   !!---------------------------------------------------------------------- 
    6666   !!   OPA 9.0 , LOCEAN-IPSL (2006)  
    67    !! $Header: $ 
     67   !! $Id: $ 
    6868   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    6969   !!---------------------------------------------------------------------- 
     
    243243         CALL prt_ctl(tab3d_1=tn     , clinfo1=' sst  - : ', mask1=tmask, ovlap=1, kdim=1) 
    244244         CALL prt_ctl(tab3d_1=sn     , clinfo1=' sss  - : ', mask1=tmask, ovlap=1, kdim=1) 
    245          CALL prt_ctl(tab2d_1=utau   , clinfo1=' utau - : ', tab2d_2=vtau, clinfo2=' vtau - : ', ovlap=1) 
     245         CALL prt_ctl(tab2d_1=utau   , clinfo1=' utau - : ', mask1=umask, & 
     246                      tab2d_2=vtau   , clinfo2=' vtau - : ', mask2=vmask, ovlap=1) 
    246247      ENDIF 
    247248 
  • branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcrnf.F90

    r702 r747  
    3232   REAL(wp)          , PUBLIC ::   rn_avt_rnf = 0.e0    !: runoffs, value of the additional vertical mixing coef. [m2/s] 
    3333   CHARACTER(len=100), PUBLIC ::   cn_dir     = './'    !: Root directory for location of ssr files 
    34    TYPE(FLD_N)       , PUBLIC ::   sn_rnf               !: informations about the runoff file to be read 
    35    TYPE(FLD_N)       , PUBLIC ::   sn_cnf               !: informations about the runoff mouth file to be read 
     34   TYPE(FLD_N)       , PUBLIC ::   sn_rnf               !: information about the runoff file to be read 
     35   TYPE(FLD_N)       , PUBLIC ::   sn_cnf               !: information about the runoff mouth file to be read 
    3636   NAMELIST/namsbc_rnf/ nn_runoff, rn_hrnf, rn_avt_rnf, cn_dir, sn_rnf, sn_cnf 
    3737 
     
    4040   REAL(wp), PUBLIC, DIMENSION(jpk)     ::   rnfmsk_z    !: river mouth mask (vert.) 
    4141 
    42    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_rnf   ! structure of input SST (file informations, fields read) 
     42   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_rnf   ! structure of input SST (file information, fields read) 
    4343 
    4444   !!---------------------------------------------------------------------- 
     
    7474         !            !   name    !  (hours)  !   name     !   (T/F)    !  (0/1) !  record  ! 
    7575         sn_rnf = FLD_N( 'runoffs',   -12.    , 'sorunoff' ,  .TRUE.    ,    1   ,     0    ) 
    76          sn_rnf = FLD_N( 'runoffs',     0.    , 'sorunoff' ,  .FALSE.   ,    1   ,     0    ) 
     76         sn_cnf = FLD_N( 'runoffs',     0.    , 'sorunoff' ,  .FALSE.   ,    1   ,     0    ) 
    7777 
    7878         ! 
Note: See TracChangeset for help on using the changeset viewer.