Changeset 10538

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.)

Location:

NEMO/trunk/src

Files:

• ICE/icectl.F90 (modified) (1 diff)
• ICE/icedyn.F90 (modified) (6 diffs)
• OCE/LBC/lib_mpp.F90 (modified) (1 diff)

NEMO/trunk/src/ICE/icectl.F90

@@ -156 +156 @@
             IF ( ABS( zt   ) > zt_sill )   WRITE(numout,*) 'violation enthalpy [GW]       (',cd_routine,') = ',zt
             IF ( zvmin < -epsi10 )         WRITE(numout,*) 'violation v_i<0  [m]          (',cd_routine,') = ',zvmin
-            IF ( zamax > MAX(rn_amax_n,rn_amax_s)+epsi10 .AND. cd_routine /= 'icedyn_adv' .AND. cd_routine /= 'icedyn_rdgrft' )  &
+            IF ( zamax > MAX( rn_amax_n, rn_amax_s ) + epsi10   &
+               & .AND. cd_routine /= 'icedyn_adv' .AND. cd_routine /= 'icedyn_rdgrft' .AND. cd_routine /= 'Hbig' ) &
                &                           WRITE(numout,*) 'violation a_i>amax            (',cd_routine,') = ',zamax
             IF ( zamin < -epsi10 )         WRITE(numout,*) 'violation a_i<0               (',cd_routine,') = ',zamin
-!clem: the following check fails when using UM3-5 advection scheme (see comments in icedyn_adv.F90)
+!clem: the following check fails when using UMx advection scheme (see comments in icedyn_adv.F90)
 !            IF ( ABS(zvtrp ) > zv_sill .AND. cd_routine == 'icedyn_adv' ) THEN
 !                                           WRITE(numout,*) 'violation vtrp [Mt/day]       (',cd_routine,') = ',zvtrp

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

NEMO/trunk/src/OCE/LBC/lib_mpp.F90

@@ -160 +160 @@
    INTEGER, PUBLIC                               ::   ncom_freq                    !: frequency of comm diagnostic
    INTEGER, PUBLIC , DIMENSION(:,:), ALLOCATABLE ::   ncomm_sequence               !: size of communicated arrays (halos)
-   INTEGER, PARAMETER, PUBLIC                    ::   ncom_rec_max = 2000          !: max number of communication record
+   INTEGER, PARAMETER, PUBLIC                    ::   ncom_rec_max = 3000          !: max number of communication record
    INTEGER, PUBLIC                               ::   n_sequence_lbc = 0           !: # of communicated arraysvia lbc
    INTEGER, PUBLIC                               ::   n_sequence_glb = 0           !: # of global communications