Ignore:
Timestamp:
2017-09-08T17:09:25+02:00 (3 years ago)
Author:
clem
Message:

changes in style - part5 - almost done

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90

    r8498 r8514  
    2020   USE ice            ! LIM variables 
    2121   USE ice1D          ! LIM thermodynamics 
     22   USE icethd_sal     ! sea-ice: salinity profiles 
    2223   ! 
    2324   USE in_out_manager ! I/O manager 
     
    107108      !!------------------------------------------------------------------ 
    108109 
    109       ! Discriminate between varying salinity (nn_icesal=2) and prescribed cases (other values) 
     110      ! Discriminate between time varying salinity and constant 
    110111      SELECT CASE( nn_icesal )                  ! varying salinity or not 
    111          CASE( 1, 3 )   ;   zswitch_sal = 0._wp   ! prescribed salinity profile 
    112          CASE( 2 )      ;   zswitch_sal = 1._wp   ! varying salinity profile 
     112         CASE( 1 , 3 )   ;   zswitch_sal = 0._wp   ! prescribed salinity profile 
     113         CASE( 2 )       ;   zswitch_sal = 1._wp   ! varying salinity profile 
    113114      END SELECT 
    114115 
     
    406407 
    407408      num_iter_max = 1 
    408       IF( nn_icesal == 2 ) num_iter_max = 5 
    409  
     409      IF( nn_icesal == 2 )   num_iter_max = 5  ! salinity varying in time 
     410       
    410411      ! Iterative procedure 
    411412      DO ji = 1, nidx 
     
    586587         hfx_out_1d(ji)  = hfx_out_1d(ji) + ( zq_rema(ji) * a_i_1d(ji) ) * r1_rdtice 
    587588 
    588          IF( ln_limctl .AND. zq_rema(ji) < 0. .AND. lwp ) WRITE(numout,*) 'ALERTE zq_rema <0 = ', zq_rema(ji) 
     589         IF( ln_icectl .AND. zq_rema(ji) < 0. .AND. lwp ) WRITE(numout,*) 'ALERTE zq_rema <0 = ', zq_rema(ji) 
    589590      END DO 
    590591 
     
    613614         sfx_sni_1d(ji) = sfx_sni_1d(ji) + sss_1d(ji) * a_i_1d(ji) * zfmdt * r1_rdtice  
    614615 
    615          ! virtual salt flux to keep salinity constant 
     616         ! Case constant salinity in time: virtual salt flux to keep salinity constant 
    616617         IF( nn_icesal == 1 .OR. nn_icesal == 3 )  THEN 
    617618            sfx_bri_1d(ji) = sfx_bri_1d(ji) - sss_1d (ji) * a_i_1d(ji) * zfmdt                  * r1_rdtice  & ! put back sss_m     into the ocean 
     
    665666      REAL(wp), DIMENSION(:,:), INTENT(in   ) :: pin   ! previous fraction lead ( 1. - a_i_b ) 
    666667      REAL(wp), DIMENSION(:,:), INTENT(inout) :: pout 
    667       pout = ( 1._wp - ( pin )**rn_betas ) 
     668      pout = ( 1._wp - ( pin )**rn_blow_s ) 
    668669   END SUBROUTINE ice_thd_snwblow_2d 
    669670 
     
    671672      REAL(wp), DIMENSION(:), INTENT(in   ) :: pin 
    672673      REAL(wp), DIMENSION(:), INTENT(inout) :: pout 
    673       pout = ( 1._wp - ( pin )**rn_betas ) 
     674      pout = ( 1._wp - ( pin )**rn_blow_s ) 
    674675   END SUBROUTINE ice_thd_snwblow_1d 
    675676 
Note: See TracChangeset for help on using the changeset viewer.