Changeset 8517 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90

Timestamp:

2017-09-12T20:46:13+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part6 - one more round

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90

@@ -127 +127 @@
       !
       INTEGER, PARAMETER ::   nitermax = 20    
-      !
-      REAL(wp) :: zvi_b, zsmv_b, zei_b, zfs_b, zfw_b, zft_b 
       !!-----------------------------------------------------------------------------
-      IF( nn_timing == 1 )  CALL timing_start('icerdgrft')
+      ! controls
+      IF( nn_timing == 1 )   CALL timing_start('icerdgrft')                                                             ! timing
+      IF( ln_icediachk   )   CALL ice_cons_hsm(0, 'icerdgrft', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
 
       IF( kt == nit000 ) THEN
@@ -140 +140 @@
          !
       ENDIF      
-      !                    ! conservation test
-      IF( ln_icediachk )   CALL ice_cons_hsm(0, 'icerdgrft', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
 
       !-----------------------------------------------------------------------------!
@@ -284 +282 @@
       CALL ice_var_agg( 1 ) 
 
-      !-----------------------------------------------------------------------------!
-      ! control prints
-      !-----------------------------------------------------------------------------!
-      !                    ! conservation test
-      IF( ln_icediachk )   CALL ice_cons_hsm(1, 'icerdgrft', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
-
-      !                    ! control prints
-      IF( ln_ctl       )   CALL ice_prt3D( 'icerdgrft' )
-      !
-      IF( nn_timing == 1 )  CALL timing_stop('icerdgrft')
+      ! controls
+      IF( ln_icediachk   )   CALL ice_cons_hsm(1, 'icerdgrft', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
+      IF( ln_ctl         )   CALL ice_prt3D   ('icerdgrft')                                                             ! prints
+      IF( nn_timing == 1 )   CALL timing_stop ('icerdgrft')                                                             ! timing
       !
    END SUBROUTINE ice_rdgrft
@@ -795 +787 @@
       ELSEIF( ln_str_H79 ) THEN      ! Ice strength => Hibler (1979) method             !
       !                              !--------------------------------------------------!
-         strength(:,:) = rn_pstar * vt_i(:,:) * EXP( - rn_crhg * ( 1._wp - at_i(:,:) )  ) * tmask(:,:,1)
+         strength(:,:) = rn_pstar * SUM( v_i(:,:,:), dim=3 ) * EXP( -rn_crhg * ( 1._wp - SUM( a_i(:,:,:), dim=3 ) ) )
          !
          ismooth = 1