Changeset 10193

Timestamp:

2018-10-15T12:31:58+02:00 (6 years ago)

Author:

andmirek

Message:

Ticket #2139 new approach

Location:

NEMO/branches/2018/dev_r10190_ice_thd_zdf/src/ICE

Files:

• icethd.F90 (modified) (2 diffs)
• icethd_zdf_bl99.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r10190_ice_thd_zdf/src/ICE/icethd.F90

@@ -212 +212 @@
          END DO
 
-         IF( lk_mpp )         CALL mpp_ini_ice( npti , numout )
-
          IF( npti > 0 ) THEN  ! If there is no ice, do nothing.
             !                                                                
@@ -250 +248 @@
             !                                                       ! --- & Move to 2D arrays --- !
             !
-            IF( lk_mpp )      CALL mpp_comm_free( ncomm_ice ) !RB necessary ??
          ENDIF
          !

NEMO/branches/2018/dev_r10190_ice_thd_zdf/src/ICE/icethd_zdf_bl99.F90

@@ -222 +222 @@
       !
       liter(:) = .TRUE.                                          !============================!
-!     DO iconv = 1, iconv_max                                    ! Iterative procedure begins !
-      DO WHILE ( zdti_max > zdti_bnd .AND. iconv < iconv_max)
-         zdti_max = 0._wp
-!        IF(itot<1) EXIT
-         iconv = iconv + 1
+      DO iconv = 1, iconv_max                                    ! Iterative procedure begins !
+         IF(itot<1) EXIT
          DO ji = 1, npti
           IF(liter(ji)) THEN
-!            zdti_max = 0._wp
+            zdti_max = 0._wp
             !
             ztib(:, ji) = tt_i_1d(:, ji)
@@ -662 +659 @@
         ENDIF ! k_jules
 
-!       IF(zdti_max.le.zdti_bnd) THEN
-!         liter(ji) = .FALSE.
-!         itot = itot - 1
-!       ENDIF
+        IF(zdti_max.le.zdti_bnd) THEN
+          liter(ji) = .FALSE.
+          itot = itot - 1
+        ENDIF
 
         ENDIF ! liter
         END DO ! ji
-        IF( lk_mpp ) CALL mpp_max( zdti_max, kcom=ncomm_ice )
       END DO  ! End of the do while iterative procedure
 !need to move this part where all processors are available