Changeset 11083 for NEMO/branches/UKMO/NEMO_4.0_GO6_mixing/src/ICE/icethd_zdf_bl99.F90

Timestamp:

2019-06-06T16:29:54+02:00 (5 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0_GO6_mixing : Update to be relative to rev 11081 of NEMO_4.0_mirror.

File:

• NEMO/branches/UKMO/NEMO_4.0_GO6_mixing/src/ICE/icethd_zdf_bl99.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0_GO6_mixing/src/ICE/icethd_zdf_bl99.F90

@@ -206 +206 @@
       !
       l_T_converged(:) = .FALSE.
-      !                                                          !============================!
       ! Convergence calculated until all sub-domain grid points have converged
       ! Calculations keep going for all grid points until sub-domain convergence (vectorisation optimisation)
       ! but values are not taken into account (results independant of MPI partitioning)
       !
+      !                                                                            !============================!
       DO WHILE ( ( .NOT. ALL (l_T_converged(1:npti)) ) .AND. iconv < iconv_max )   ! Iterative procedure begins !
-         !                                                       !============================!
+         !                                                                         !============================!
          iconv = iconv + 1
          !
@@ -742 +742 @@
                   zdti_max = MAX ( zdti_max , MAXVAL( ABS( t_s_1d(ji,1:nlay_s) - ztsb(ji,1:nlay_s) ) ) )
                   ! t_i
-                  DO jk = 0, nlay_i
+                  DO jk = 1, nlay_i
                      ztmelts       = -rTmlt * sz_i_1d(ji,jk) + rt0 
                      t_i_1d(ji,jk) =  MAX( MIN( t_i_1d(ji,jk), ztmelts ), rt0 - 100._wp )
@@ -856 +856 @@
          t_i_1d    (1:npti,:) = ztiold        (1:npti,:)
          qcn_ice_1d(1:npti)   = qcn_ice_top_1d(1:npti)
+
+         !!clem
+         ! remettre t_su_1d, qns_ice_1d et dqns_ice_1d comme avant puisqu'on devrait faire comme si on avant conduction = input
+         !clem
       ENDIF
       !