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 10531 for NEMO/trunk/src/ICE – NEMO

Changeset 10531 for NEMO/trunk/src/ICE


Ignore:
Timestamp:
2019-01-16T14:17:50+01:00 (5 years ago)
Author:
clem
Message:

remove nn_virtual_itd options and replace them by ln_virtual_itd

Location:
NEMO/trunk/src/ICE
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/ice.F90

    r10425 r10531  
    114114   INTEGER           , PUBLIC ::   nlay_i           !: number of ice  layers  
    115115   INTEGER           , PUBLIC ::   nlay_s           !: number of snow layers  
    116    INTEGER           , PUBLIC ::   nn_virtual_itd   !: virtual ITD mono-category parameterizations (1-3) or not (0) 
     116   LOGICAL           , PUBLIC ::   ln_virtual_itd   !: virtual ITD mono-category parameterization (T) or not (F) 
    117117   LOGICAL           , PUBLIC ::   ln_icedyn        !: flag for ice dynamics (T) or not (F) 
    118118   LOGICAL           , PUBLIC ::   ln_icethd        !: flag for ice thermo   (T) or not (F) 
  • NEMO/trunk/src/ICE/icedyn_rdgrft.F90

    r10511 r10531  
    586586                  &                                      + rhos * vsrft(ji) * ( 1._wp - rn_fsnwrft ) ) * r1_rdtice 
    587587 
    588                ! Put the melt pond water into the ocean 
    589                ! clem: I think the following lines must be commented since there 
    590                !       is no net mass flux between melt ponds and the ocean (see icethd_pnd.F90 for ex.) 
    591                !IF ( ln_pnd_fwb ) THEN 
    592                !   wfx_pnd_1d(ji) = wfx_pnd_1d(ji) + ( rhow * vprdg(ji) * ( 1._wp - rn_fpndrdg )   &        ! fresh water source for ocean 
    593                !      &                              + rhow * vprft(ji) * ( 1._wp - rn_fpndrft ) ) * r1_rdtice 
    594                !ENDIF 
    595  
    596588               ! virtual salt flux to keep salinity constant 
    597589               IF( nn_icesal /= 2 )  THEN 
  • NEMO/trunk/src/ICE/iceforcing.F90

    r10425 r10531  
    145145         SELECT CASE( nice_jules ) 
    146146         CASE( np_jules_ACTIVE )  !    compute conduction flux and surface temperature (as in Jules surface module) 
    147                                   CALL blk_ice_qcn    ( nn_virtual_itd, t_su, t_bo, h_s, h_i ) 
     147                                  CALL blk_ice_qcn    ( ln_virtual_itd, t_su, t_bo, h_s, h_i ) 
    148148         END SELECT 
    149149      CASE ( jp_purecpl )         !--- coupled formulation 
  • NEMO/trunk/src/ICE/icestp.F90

    r10519 r10531  
    297297      INTEGER  ::   ios                 ! Local integer 
    298298      !! 
    299       NAMELIST/nampar/ jpl, nlay_i, nlay_s, nn_virtual_itd, ln_icedyn, ln_icethd, rn_amax_n, rn_amax_s,  & 
     299      NAMELIST/nampar/ jpl, nlay_i, nlay_s, ln_virtual_itd, ln_icedyn, ln_icethd, rn_amax_n, rn_amax_s,  & 
    300300         &             cn_icerst_in, cn_icerst_indir, cn_icerst_out, cn_icerst_outdir 
    301301      !!------------------------------------------------------------------- 
     
    317317         WRITE(numout,*) '         number of ice  layers                               nlay_i    = ', nlay_i 
    318318         WRITE(numout,*) '         number of snow layers                               nlay_s    = ', nlay_s 
    319          WRITE(numout,*) '         virtual ITD param for jpl=1 (1-3) or not (0)   nn_virtual_itd = ', nn_virtual_itd 
     319         WRITE(numout,*) '         virtual ITD param for jpl=1 (T) or not (F)     ln_virtual_itd = ', ln_virtual_itd 
    320320         WRITE(numout,*) '         Ice dynamics       (T) or not (F)                   ln_icedyn = ', ln_icedyn 
    321321         WRITE(numout,*) '         Ice thermodynamics (T) or not (F)                   ln_icethd = ', ln_icethd 
     
    324324      ENDIF 
    325325      !                                        !--- check consistency 
    326       IF ( jpl > 1 .AND. nn_virtual_itd == 1 ) THEN 
    327          nn_virtual_itd = 0 
     326      IF ( jpl > 1 .AND. ln_virtual_itd ) THEN 
     327         ln_virtual_itd = .FALSE. 
    328328         IF(lwp) WRITE(numout,*) 
    329          IF(lwp) WRITE(numout,*) '   nn_virtual_itd forced to 0 as jpl>1, no need with multiple categories to emulate them' 
     329         IF(lwp) WRITE(numout,*) '   ln_virtual_itd forced to false as jpl>1, no need with multiple categories to emulate them' 
    330330      ENDIF 
    331331      ! 
  • NEMO/trunk/src/ICE/icethd.F90

    r10511 r10531  
    233233                              CALL ice_thd_temp                     ! --- temperature update --- ! 
    234234            ! 
    235 !!gm please create a new logical (l_thd_mono or a better explicit name) set one for all in icestp.F90 module 
    236 !!gm        l_thd_mono = ln_icedH .AND. ( ( nn_virtual_itd == 1 .OR. nn_virtual_itd == 4 ) .AND. jpl == 1 ) 
    237 !!gm        by the way, the different options associated with nn_virtual_itd =1 to 4  are quite impossible to identify 
    238 !!gm        more comment to add when ready the namelist, with an explicit print in the ocean.output 
    239             IF( ln_icedH ) THEN 
    240                IF ( ( nn_virtual_itd == 1 .OR. nn_virtual_itd == 3 ) .AND. jpl == 1 ) THEN 
    241                               CALL ice_thd_mono                      ! --- extra lateral melting if virtual_itd --- ! 
    242                END IF 
    243             END IF 
     235            IF( ln_icedH .AND. ln_virtual_itd ) & 
     236               &              CALL ice_thd_mono                     ! --- extra lateral melting if virtual_itd --- ! 
    244237            ! 
    245238            IF( ln_icedA )    CALL ice_thd_da                       ! --- lateral melting --- ! 
  • NEMO/trunk/src/ICE/icethd_zdf_bl99.F90

    r10425 r10531  
    265265         zghe(1:npti) = 1._wp 
    266266         ! 
    267          SELECT CASE ( nn_virtual_itd ) 
    268          ! 
    269          CASE ( 1 , 2 ) 
     267         IF( ln_virtual_itd ) THEN 
    270268            ! 
    271269            zepsilon = 0.1_wp 
     
    277275            END DO 
    278276            ! 
    279          END SELECT 
     277         ENDIF 
    280278         ! 
    281279         !----------------- 
Note: See TracChangeset for help on using the changeset viewer.