Changeset 747 for branches

Timestamp:

2007-12-07T11:47:08+01:00 (16 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:

• sbcmod.F90 (modified) (3 diffs)
• sbcrnf.F90 (modified) (3 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -56 +56 @@
    INTEGER , PUBLIC ::   nn_fwb      = 0         !: type of FreshWater Budget control (=0/1/2)
    NAMELIST/namsbc/ nn_fsbc, ln_ana, ln_flx, ln_blk_clio, ln_blk_core, ln_cpl,   &
-      &             nn_ice , ln_rnf, ln_ssr, nn_fwb
+      &             nn_ice , ln_dm2dc, ln_rnf, ln_ssr, nn_fwb
 
    INTEGER ::   nsbc   ! type of surface boundary condition (deduced from namsbc informations)
@@ -65 +65 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header: $
+   !! $Id: $
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -243 +243 @@
          CALL prt_ctl(tab3d_1=tn     , clinfo1=' sst  - : ', mask1=tmask, ovlap=1, kdim=1)
          CALL prt_ctl(tab3d_1=sn     , clinfo1=' sss  - : ', mask1=tmask, ovlap=1, kdim=1)
-         CALL prt_ctl(tab2d_1=utau   , clinfo1=' utau - : ', tab2d_2=vtau, clinfo2=' vtau - : ', ovlap=1)
+         CALL prt_ctl(tab2d_1=utau   , clinfo1=' utau - : ', mask1=umask, &
+                      tab2d_2=vtau   , clinfo2=' vtau - : ', mask2=vmask, ovlap=1)
       ENDIF
 

branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -32 +32 @@
    REAL(wp)          , PUBLIC ::   rn_avt_rnf = 0.e0    !: runoffs, value of the additional vertical mixing coef. [m2/s]
    CHARACTER(len=100), PUBLIC ::   cn_dir     = './'    !: Root directory for location of ssr files
-   TYPE(FLD_N)       , PUBLIC ::   sn_rnf               !: informations about the runoff file to be read
-   TYPE(FLD_N)       , PUBLIC ::   sn_cnf               !: informations about the runoff mouth file to be read
+   TYPE(FLD_N)       , PUBLIC ::   sn_rnf               !: information about the runoff file to be read
+   TYPE(FLD_N)       , PUBLIC ::   sn_cnf               !: information about the runoff mouth file to be read
    NAMELIST/namsbc_rnf/ nn_runoff, rn_hrnf, rn_avt_rnf, cn_dir, sn_rnf, sn_cnf
 
@@ -40 +40 @@
    REAL(wp), PUBLIC, DIMENSION(jpk)     ::   rnfmsk_z    !: river mouth mask (vert.)
 
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_rnf   ! structure of input SST (file informations, fields read)
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_rnf   ! structure of input SST (file information, fields read)
 
    !!----------------------------------------------------------------------
@@ -74 +74 @@
          !            !   name    !  (hours)  !   name     !   (T/F)    !  (0/1) !  record  !
          sn_rnf = FLD_N( 'runoffs',   -12.    , 'sorunoff' ,  .TRUE.    ,    1   ,     0    )
-         sn_rnf = FLD_N( 'runoffs',     0.    , 'sorunoff' ,  .FALSE.   ,    1   ,     0    )
+         sn_cnf = FLD_N( 'runoffs',     0.    , 'sorunoff' ,  .FALSE.   ,    1   ,     0    )
 
          !