New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 4732 for branches/2014 – NEMO

Changeset 4732 for branches/2014


Ignore:
Timestamp:
2014-07-29T11:43:18+02:00 (10 years ago)
Author:
vancop
Message:

cosmetic changes

Location:
branches/2014/dev_4728_CNRS04_coupled_interface/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_4728_CNRS04_coupled_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

    r4731 r4732  
    138138         ! masked sea surface freezing temperature [Kelvin] 
    139139         t_bo(:,:) = ( tfreez( sss_m ) +  rt0 ) * tmask(:,:,1) + rt0 * ( 1. - tmask(:,:,1) ) 
     140 
    140141 
    141142         !                                           ! Ice albedo 
     
    367368      !!                    
    368369      !! ** Purpose :   update the ice surface boundary condition by averaging and / or 
    369      !!                redistributing fluxes on ice categories                    
     370      !!                redistributing fluxes on ice categories                    
    370371      !! 
    371372      !! ** Method  :   average then redistribute  
     
    408409         z_dql_m(:,:) = fice_ice_ave ( pdql_ice (:,:,:) ) 
    409410         DO jl = 1, jpl 
    410             pdqns_ice(:,:,jl) = z_dqn_m(:,:) 
    411             pdqla_ice(:,:,jl) = z_dql_m(:,:) 
     411            pdqn_ice(:,:,jl) = z_dqn_m(:,:) 
     412            pdql_ice(:,:,jl) = z_dql_m(:,:) 
    412413         END DO 
    413414         ! 
  • branches/2014/dev_4728_CNRS04_coupled_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r4730 r4732  
    8484      NAMELIST/namsbc/ nn_fsbc   , ln_ana    , ln_flx,  ln_blk_clio, ln_blk_core, ln_cpl,   & 
    8585         &             ln_blk_mfs, ln_apr_dyn, nn_ice,  nn_ice_embd, ln_dm2dc   , ln_rnf,   & 
    86          &             ln_ssr    , nn_fwb    , ln_cdgw , ln_wave , ln_sdw, nn_lsm, nn_iceflx 
     86         &             ln_ssr    , nn_fwb    , ln_cdgw , ln_wave , ln_sdw, nn_lsm, nn_limflx 
    8787      INTEGER  ::   ios 
    8888      !!---------------------------------------------------------------------- 
     
    140140      SELECT CASE ( nn_limflx) 
    141141      CASE ( -1 ) 
    142          IF(lwp) THEN WRITE(numout,*) '              Use of per-category fluxes (nn_limflx = -1) ' 
     142         IF(lwp) WRITE(numout,*) '              Use of per-category fluxes (nn_limflx = -1) ' 
    143143      CASE ( 0  ) 
    144          IF(lwp) THEN WRITE(numout,*) '              Average per-category fluxes (nn_limflx = 0) '  
     144         IF(lwp) WRITE(numout,*) '              Average per-category fluxes (nn_limflx = 0) '  
    145145      CASE ( 1  ) 
    146          IF(lwp) THEN WRITE(numout,*) '              Average then redistribute per-category fluxes (nn_limflx = 1) ' 
     146         IF(lwp) WRITE(numout,*) '              Average then redistribute per-category fluxes (nn_limflx = 1) ' 
    147147      CASE ( 2  ) 
    148          IF(lwp) THEN WRITE(numout,*) '              Redistribute a single flux over categories (nn_limflx = 2) ' 
     148         IF(lwp) WRITE(numout,*) '              Redistribute a single flux over categories (nn_limflx = 2) ' 
    149149      END SELECT 
    150150      ! 
Note: See TracChangeset for help on using the changeset viewer.