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 10925 – NEMO

Changeset 10925


Ignore:
Timestamp:
2019-05-03T14:32:01+02:00 (4 years ago)
Author:
clem
Message:

complete previous commit

Location:
NEMO/releases/release-4.0/src/ICE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/releases/release-4.0/src/ICE/icestp.F90

    r10535 r10925  
    433433      tau_icebfr(:,:)   = 0._wp   ! landfast ice param only (clem: important to keep the init here) 
    434434      cnd_ice   (:,:,:) = 0._wp   ! initialisation: effective conductivity at the top of ice/snow (ln_cndflx=T) 
     435      qcn_ice   (:,:,:) = 0._wp   ! initialisation: conductive flux (ln_cndflx=T & ln_cndemule=T) 
    435436      qtr_ice_bot(:,:,:) = 0._wp  ! initialization: part of solar radiation transmitted through the ice needed at least for outputs 
    436437      ! 

  • NEMO/releases/release-4.0/src/ICE/icethd_zdf_bl99.F90

    r10923 r10925  
    206206      ! 
    207207      l_T_converged(:) = .FALSE. 
    208       !                                                          !============================! 
    209208      ! Convergence calculated until all sub-domain grid points have converged 
    210209      ! Calculations keep going for all grid points until sub-domain convergence (vectorisation optimisation) 
    211210      ! but values are not taken into account (results independant of MPI partitioning) 
    212211      ! 
     212      !                                                                            !============================! 
    213213      DO WHILE ( ( .NOT. ALL (l_T_converged(1:npti)) ) .AND. iconv < iconv_max )   ! Iterative procedure begins ! 
    214          !                                                       !============================! 
     214         !                                                                         !============================! 
    215215         iconv = iconv + 1 
    216216         ! 
    … …  
    856856         t_i_1d    (1:npti,:) = ztiold        (1:npti,:) 
    857857         qcn_ice_1d(1:npti)   = qcn_ice_top_1d(1:npti) 
     858 
     859         !!clem 
     860         ! remettre t_su_1d, qns_ice_1d et dqns_ice_1d comme avant puisqu'on devrait faire comme si on avant conduction = input 
     861         !clem 
    858862      ENDIF 
    859863      ! 
Note: See TracChangeset for help on using the changeset viewer.