Changeset 7215 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

Timestamp:

2016-11-09T17:41:16+01:00 (7 years ago)

Author:

cbricaud

Message:

undo last commit in CRS ; back to rev7207

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) (2 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

@@ -223 +223 @@
      CALL crs_dom_e3( e1v, e2v, zfse3v, p_sfc_2d_crs=e1v_crs  , cd_type='V', p_mask=vmask, p_e3_crs=e3v_0_crs, p_e3_max_crs=e3v_max_0_crs)
 
-     DO jk = 1, jpk
-        DO ji = 1, jpi_crs
-           DO jj = 1, jpj_crs
-              IF( e3t_max_0_crs(ji,jj,jk) == 0._wp ) e3t_max_0_crs(ji,jj,jk) = e3t_1d(jk)
-              IF( e3w_max_0_crs(ji,jj,jk) == 0._wp ) e3w_max_0_crs(ji,jj,jk) = e3w_1d(jk)
-              IF( e3u_max_0_crs(ji,jj,jk) == 0._wp ) e3u_max_0_crs(ji,jj,jk) = e3t_1d(jk)
-              IF( e3v_max_0_crs(ji,jj,jk) == 0._wp ) e3v_max_0_crs(ji,jj,jk) = e3t_1d(jk)
-           ENDDO
-        ENDDO
-     ENDDO
+     WHERE(e3t_max_0_crs == 0._wp) e3t_max_0_crs=r_inf
+     WHERE(e3u_max_0_crs == 0._wp) e3u_max_0_crs=r_inf
+     WHERE(e3v_max_0_crs == 0._wp) e3v_max_0_crs=r_inf
+     WHERE(e3w_max_0_crs == 0._wp) e3w_max_0_crs=r_inf
 
 #if defined key_vvl
@@ -287 +281 @@
      CALL crs_dom_ope( gdept_0, 'MAX', 'T', tmask, gdept_0_crs, p_e3=zfse3t, psgn=1.0 ) 
      CALL crs_dom_ope( gdepw_0, 'MAX', 'W', tmask, gdepw_0_crs, p_e3=zfse3w, psgn=1.0 )
-
-     DO jk = 1, jpk
-        DO ji = 1, jpi_crs
-           DO jj = 1, jpj_crs
-              IF( gdept_0_crs(ji,jj,jk) .LE. 0._wp ) gdept_0_crs(ji,jj,jk) = gdept_1d(jk)
-              IF( gdepw_0_crs(ji,jj,jk) .LE. 0._wp ) gdepw_0_crs(ji,jj,jk) = gdepw_1d(jk)
-           ENDDO
-        ENDDO
-     ENDDO
-
 #if defined key_vvl
      gdept_n_crs(:,:,:) = gdept_0_crs(:,:,:)