Changeset 8342 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_da.F90

Timestamp:

2017-07-15T17:27:14+02:00 (7 years ago)

Author:

clem

Message:

simplify the code

File:

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

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

@@ -101 +101 @@
       !!---------------------------------------------------------------------
       INTEGER             ::   ji, jj, jk, jl     ! dummy loop indices
-      INTEGER             ::   nidx
       REAL(wp) ::   ztmelts             ! local scalar
       REAL(wp) ::   zEi          ! specific enthalpy of sea ice (J/kg)
@@ -131 +130 @@
       zastar = 1._wp / ( 1._wp - (rn_dmin / zdmax)**(1._wp/rn_beta) )
 
-      CALL tab_2d_1d( nidx, at_i_1d(1:nidx), at_i , jpi, jpj, idxice(1:nidx) )
-      CALL tab_2d_1d( nidx, t_bo_1d(1:nidx), t_bo , jpi, jpj, idxice(1:nidx) )
-      CALL tab_2d_1d( nidx, sst_1d (1:nidx), sst_m, jpi, jpj, idxice(1:nidx) )
+      CALL tab_2d_1d( nidx, idxice(1:nidx), at_i_1d(1:nidx), at_i  )
+      CALL tab_2d_1d( nidx, idxice(1:nidx), t_bo_1d(1:nidx), t_bo  )
+      CALL tab_2d_1d( nidx, idxice(1:nidx), sst_1d (1:nidx), sst_m )
 
       DO ji = 1, nidx   
@@ -148 +147 @@
       DO jl = 1, jpl
 
-         CALL tab_2d_1d( nidx, a_i_1d    (1:nidx), a_i(:,:,jl) , jpi, jpj, idxice(1:nidx) )
-         CALL tab_2d_1d( nidx, ht_i_1d   (1:nidx), ht_i(:,:,jl), jpi, jpj, idxice(1:nidx) )
-         CALL tab_2d_1d( nidx, ht_s_1d   (1:nidx), ht_s(:,:,jl), jpi, jpj, idxice(1:nidx) )
-         CALL tab_2d_1d( nidx, sm_i_1d   (1:nidx), sm_i(:,:,jl), jpi, jpj, idxice(1:nidx) )
-         CALL tab_2d_1d( nidx, sfx_lam_1d(1:nidx), sfx_lam     , jpi, jpj, idxice(1:nidx) )
-         CALL tab_2d_1d( nidx, hfx_thd_1d(1:nidx), hfx_thd     , jpi, jpj, idxice(1:nidx) )
-         CALL tab_2d_1d( nidx, wfx_lam_1d(1:nidx), wfx_lam     , jpi, jpj, idxice(1:nidx) )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), a_i_1d    (1:nidx), a_i(:,:,jl)  )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), ht_i_1d   (1:nidx), ht_i(:,:,jl) )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), ht_s_1d   (1:nidx), ht_s(:,:,jl) )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), sm_i_1d   (1:nidx), sm_i(:,:,jl) )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), sfx_lam_1d(1:nidx), sfx_lam      )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), hfx_thd_1d(1:nidx), hfx_thd      )
+         CALL tab_2d_1d( nidx, idxice(1:nidx), wfx_lam_1d(1:nidx), wfx_lam      )
          DO jk = 1, nlay_i
-            CALL tab_2d_1d( nidx, e_i_1d(1:nidx,jk), e_i(:,:,jk,jl), jpi, jpj, idxice(1:nidx) )
+            CALL tab_2d_1d( nidx, idxice(1:nidx), e_i_1d(1:nidx,jk), e_i(:,:,jk,jl) )
          END DO
          DO jk = 1, nlay_s
-            CALL tab_2d_1d( nidx, e_s_1d(1:nidx,jk), e_s(:,:,jk,jl), jpi, jpj, idxice(1:nidx) )
+            CALL tab_2d_1d( nidx, idxice(1:nidx), e_s_1d(1:nidx,jk), e_s(:,:,jk,jl) )
          END DO
 
@@ -196 +195 @@
 !! je pense qu'il faut ajuster e_i mais je ne sais pas comment
          DO jk = 1, nlay_s
-            CALL tab_1d_2d( nidx, e_s(:,:,jk,jl), idxice, e_s_1d(1:nidx,jk), jpi, jpj)
+            CALL tab_1d_2d( nidx, idxice(1:nidx), e_s_1d(1:nidx,jk), e_s(:,:,jk,jl) )
          END DO
          DO jk = 1, nlay_i
-            CALL tab_1d_2d( nidx, e_i(:,:,jk,jl), idxice, e_i_1d(1:nidx,jk), jpi, jpj)
+            CALL tab_1d_2d( nidx, idxice(1:nidx), e_i_1d(1:nidx,jk), e_i(:,:,jk,jl) )
          END DO
          
-         CALL tab_1d_2d( nidx, a_i (:,:,jl), idxice, a_i_1d    (1:nidx), jpi, jpj )
-         CALL tab_1d_2d( nidx, ht_i(:,:,jl), idxice, ht_i_1d   (1:nidx), jpi, jpj )
-         CALL tab_1d_2d( nidx, ht_s(:,:,jl), idxice, ht_s_1d   (1:nidx), jpi, jpj )
-         CALL tab_1d_2d( nidx, sfx_lam     , idxice, sfx_lam_1d(1:nidx), jpi, jpj )
-         CALL tab_1d_2d( nidx, hfx_thd     , idxice, hfx_thd_1d(1:nidx), jpi, jpj )
-         CALL tab_1d_2d( nidx, wfx_lam     , idxice, wfx_lam_1d(1:nidx), jpi, jpj )
+         CALL tab_1d_2d( nidx, idxice(1:nidx), a_i_1d    (1:nidx), a_i (:,:,jl) )
+         CALL tab_1d_2d( nidx, idxice(1:nidx), ht_i_1d   (1:nidx), ht_i(:,:,jl) )
+         CALL tab_1d_2d( nidx, idxice(1:nidx), ht_s_1d   (1:nidx), ht_s(:,:,jl) )
+         CALL tab_1d_2d( nidx, idxice(1:nidx), sfx_lam_1d(1:nidx), sfx_lam      )
+         CALL tab_1d_2d( nidx, idxice(1:nidx), hfx_thd_1d(1:nidx), hfx_thd      )
+         CALL tab_1d_2d( nidx, idxice(1:nidx), wfx_lam_1d(1:nidx), wfx_lam      )
 
       END DO