Changeset 1601 for trunk/NEMO/OPA_SRC/SBC/sbcblk_core.F90

Timestamp:

2009-08-11T12:09:19+02:00 (15 years ago)

Author:

ctlod

Message:

Doctor naming of OPA namelist variables , see ticket: #526

File:

• trunk/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcblk_core.F90

@@ -54 +54 @@
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf   ! structure of input fields (file informations, fields read)
          
-   !! * CORE bulk parameters
+   !                                             !!! CORE bulk parameters
    REAL(wp), PARAMETER ::   rhoa =    1.22        ! air density
    REAL(wp), PARAMETER ::   cpa  = 1000.5         ! specific heat of air
@@ -62 +62 @@
    REAL(wp), PARAMETER ::   Cice =    1.63e-3     ! transfer coefficient over ice
 
-   LOGICAL  ::   ln_2m = .FALSE.                  !: logical flag for height of air temp. and hum
-   REAL(wp) ::   alpha_precip=1.                  !: multiplication factor for precipitation
+   !                                !!* Namelist namsbc_core : CORE bulk parameters
+   LOGICAL  ::   ln_2m = .FALSE.     ! logical flag for height of air temp. and hum
+   REAL(wp) ::   rn_pfac = 1.        ! multiplication factor for precipitation
 
    !! * Substitutions
@@ -115 +116 @@
       TYPE(FLD_N) ::   sn_wndi, sn_wndj, sn_humi, sn_qsr       ! informations about the fields to be read
       TYPE(FLD_N) ::   sn_qlw , sn_tair, sn_prec, sn_snow      !   "                                 "
-      NAMELIST/namsbc_core/ cn_dir, ln_2m, alpha_precip, sn_wndi, sn_wndj, sn_humi, sn_qsr,   &
-         &                                               sn_qlw , sn_tair, sn_prec, sn_snow
+      NAMELIST/namsbc_core/ cn_dir, ln_2m, rn_pfac, sn_wndi, sn_wndj, sn_humi, sn_qsr,   &
+         &                                                sn_qlw , sn_tair, sn_prec, sn_snow
       !!---------------------------------------------------------------------
 
@@ -124 +125 @@
          ! set file information (default values)
          cn_dir = './'       ! directory in which the model is executed
-
+         !
          ! (NB: frequency positive => hours, negative => months)
          !            !    file     ! frequency !  variable  ! time intep !  clim   ! 'yearly' or ! weights  ! rotation   !
@@ -136 +137 @@
          sn_prec = FLD_N( 'precip'  ,    -1.    ,  'precip'  ,  .true.    , .false. ,   'yearly'  , ''       , ''         )
          sn_snow = FLD_N( 'snow'    ,    -1.    ,  'snow'    ,  .true.    , .false. ,   'yearly'  , ''       , ''         )
-
+         !
          REWIND( numnam )                    ! ... read in namlist namsbc_core
          READ  ( numnam, namsbc_core )
-
+         !
          ! store namelist information in an array
          slf_i(jp_wndi) = sn_wndi   ;   slf_i(jp_wndj) = sn_wndj
@@ -145 +146 @@
          slf_i(jp_tair) = sn_tair   ;   slf_i(jp_humi) = sn_humi
          slf_i(jp_prec) = sn_prec   ;   slf_i(jp_snow) = sn_snow
-         
+         !
          ! set sf structure
          ALLOCATE( sf(jpfld), STAT=ierror )
@@ -151 +152 @@
             CALL ctl_stop( 'sbc_blk_core: unable to allocate sf structure' )   ;   RETURN
          ENDIF
-
          DO ifpr= 1, jpfld
             ALLOCATE( sf(ifpr)%fnow(jpi,jpj) )
             ALLOCATE( sf(ifpr)%fdta(jpi,jpj,2) )
          END DO
-
+         !
          ! fill sf with slf_i and control print
          CALL fld_fill( sf, slf_i, cn_dir, 'sbc_blk_core', 'flux formulattion for ocean surface boundary condition', 'namsbc_core' )
          !
       ENDIF
-
 
       CALL fld_read( kt, nn_fsbc, sf )                   ! input fields provided at the current time-step
@@ -327 +326 @@
       qns(:,:) = zqlw(:,:) - zqsb(:,:) - zqla(:,:)      ! Downward Non Solar flux
 !CDIR COLLAPSE
-      emp (:,:) = zevap(:,:) - sf(jp_prec)%fnow(:,:) * alpha_precip * tmask(:,:,1)
+      emp (:,:) = zevap(:,:) - sf(jp_prec)%fnow(:,:) * rn_pfac * tmask(:,:,1)
 !CDIR COLLAPSE
       emps(:,:) = emp(:,:)
@@ -533 +532 @@
        
 !CDIR COLLAPSE
-      p_tpr(:,:) = sf(jp_prec)%fnow(:,:) * alpha_precip      ! total precipitation [kg/m2/s]
-!CDIR COLLAPSE
-      p_spr(:,:) = sf(jp_snow)%fnow(:,:) * alpha_precip      ! solid precipitation [kg/m2/s]
-      CALL iom_put( 'snowpre', p_spr )                       ! Snow precipitation 
+      p_tpr(:,:) = sf(jp_prec)%fnow(:,:) * rn_pfac      ! total precipitation [kg/m2/s]
+!CDIR COLLAPSE
+      p_spr(:,:) = sf(jp_snow)%fnow(:,:) * rn_pfac      ! solid precipitation [kg/m2/s]
+      CALL iom_put( 'snowpre', p_spr )                  ! Snow precipitation 
       !
       IF(ln_ctl) THEN