Changeset 10538 for NEMO/trunk/src/ICE/icedyn.F90

Timestamp:

2019-01-17T11:41:10+01:00 (5 years ago)

Author:

clem

Message:

increase the max number of communications (needed when using bdy which produces a lot of comm.)

File:

• NEMO/trunk/src/ICE/icedyn.F90 (modified) (6 diffs)

NEMO/trunk/src/ICE/icedyn.F90

@@ -81 +81 @@
       !
       ! controls
-      IF( ln_timing    )   CALL timing_start('icedyn')                                                             ! timing
-      IF( ln_icediachk )   CALL ice_cons_hsm(0, 'icedyn', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
+      IF( ln_timing )   CALL timing_start('icedyn')
       !
       IF( kt == nit000 .AND. lwp ) THEN
@@ -182 +181 @@
 
       END SELECT
-       !
-      ! controls
-      IF( ln_icediachk )   CALL ice_cons_hsm(1, 'icedyn', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
-      IF( ln_timing    )   CALL timing_stop ('icedyn')                                                             ! timing
+      !
+      ! controls
+      IF( ln_timing )   CALL timing_stop ('icedyn')
       !
    END SUBROUTINE ice_dyn
@@ -212 +210 @@
       REAL(wp) ::   zhip, zhi, zhs, zvs_excess, zfra
       !!-------------------------------------------------------------------
+      ! controls
+      IF( ln_icediachk )   CALL ice_cons_hsm(0, 'Hbig', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
       !
       CALL ice_var_zapsmall                       !-- zap small areas
@@ -270 +270 @@
       WHERE( a_ip(:,:,:) > a_i(:,:,:) )   a_ip(:,:,:) = a_i(:,:,:)
       !
+      ! controls
+      IF( ln_icediachk )   CALL ice_cons_hsm(1, 'Hbig', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
+      !
    END SUBROUTINE Hbig
 
@@ -285 +288 @@
       INTEGER ::   jl         ! dummy loop indices
       !!-------------------------------------------------------------------
+      ! controls
+      IF( ln_icediachk )   CALL ice_cons_hsm(0, 'Hpiling', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
       !
       CALL ice_var_zapsmall                       !-- zap small areas
@@ -294 +299 @@
          END WHERE
       END DO
+      ! controls
+      IF( ln_icediachk )   CALL ice_cons_hsm(1, 'Hpiling', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
       !
    END SUBROUTINE Hpiling