Changeset 7222 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90

Timestamp:

2016-11-14T15:34:11+01:00 (7 years ago)

Author:

cbricaud

Message:

CRS branch: cleaning

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) (6 diffs)

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

@@ -62 +62 @@
       !!      2. At time of output, rescale [1] by dimension and time
       !!         to yield the spatial and temporal average.
-      !!  See. diawri_dimg.h90, sbcmod.F90
       !!
       !! ** Method  :  
       !!----------------------------------------------------------------------
       !!
-      
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
       !!
-      INTEGER               ::   ji, jj, jk              ! dummy loop indices
-      !!
+      INTEGER                             :: ji, jj, jk              ! dummy loop indices
+      REAL(wp)                            :: z2dcrsu, z2dcrsv
+      REAL(wp)                            :: z1_2dt
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zfse3t, zfse3u, zfse3v, zfse3w ! 3D workspace for e3
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zt, zs , ztmp
       REAL(wp), POINTER, DIMENSION(:,:)   :: z2d,z2d_crs
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zt_crs, zs_crs
-      REAL(wp):: z2dcrsu, z2dcrsv
-      REAL(wp):: z1_2dt
-      REAL(wp):: zmin,zmax
-      INTEGER :: i,j,ijis,ijie,ijjs,ijje
-      INTEGER ::  iji,ijj
-      INTEGER :: jl,jm,jn
-      !!
       !!----------------------------------------------------------------------
 
@@ -216 +208 @@
       CALL crs_dom_e3( e1v, e2v, zfse3v, p_sfc_2d_crs=e1v_crs  , cd_type='V', p_mask=vmask, p_e3_crs=zs_crs, p_e3_max_crs=e3v_max_n_crs)
 
-      !cbr ??????????????????? faut pas mettre le profile 1d plutot ???????????
-      WHERE(e3t_max_n_crs == 0._wp) e3t_max_n_crs=r_inf
-      WHERE(e3u_max_n_crs == 0._wp) e3u_max_n_crs=r_inf
-      WHERE(e3v_max_n_crs == 0._wp) e3v_max_n_crs=r_inf
-      WHERE(e3w_max_n_crs == 0._wp) e3w_max_n_crs=r_inf
+      DO jk = 1, jpk
+         DO ji = 1, jpi_crs
+            DO jj = 1, jpj_crs
+               IF( e3t_max_n_crs(ji,jj,jk) == 0._wp ) e3t_max_n_crs(ji,jj,jk) = e3t_1d(jk)
+               IF( e3w_max_n_crs(ji,jj,jk) == 0._wp ) e3w_max_n_crs(ji,jj,jk) = e3w_1d(jk)
+               IF( e3u_max_n_crs(ji,jj,jk) == 0._wp ) e3u_max_n_crs(ji,jj,jk) = e3t_1d(jk)
+               IF( e3v_max_n_crs(ji,jj,jk) == 0._wp ) e3v_max_n_crs(ji,jj,jk) = e3t_1d(jk)
+            ENDDO
+         ENDDO
+      ENDDO
 
       ! depth
       CALL crs_dom_ope( gdepw_n, 'MAX', 'T', tmask, gdept_n_crs, p_e3=zfse3t, psgn=1.0 )
       CALL crs_dom_ope( gdepw_n, 'MAX', 'W', tmask, gdepw_n_crs, p_e3=zfse3w, psgn=1.0 )
+      DO jk = 1, jpk
+         DO ji = 1, jpi_crs
+            DO jj = 1, jpj_crs
+               IF( gdept_n_crs(ji,jj,jk) .LE. 0._wp ) gdept_n_crs(ji,jj,jk) = gdept_1d(jk)
+               IF( gdepw_n_crs(ji,jj,jk) .LE. 0._wp ) gdepw_n_crs(ji,jj,jk) = gdepw_1d(jk)
+            ENDDO
+         ENDDO
+      ENDDO
 
       ! volume and facvol
@@ -257 +262 @@
       !  U-velocity
       CALL crs_dom_ope( un, 'SUM', 'U', umask, un_crs, p_e12=e2u, p_e3=zfse3u, p_surf_crs=e2e3u_msk, psgn=-1.0 )
-      un_crs(:,:,:) = un_crs(:,:,:)*umask_crs(:,:,:) !cbr utile ??????????????????
       CALL iom_put( "uoce"  , un_crs )   ! i-current 
 
       !  V-velocity
       CALL crs_dom_ope( vn, 'SUM', 'V', vmask, vn_crs, p_e12=e1v, p_e3=zfse3v, p_surf_crs=e1e3v_msk, psgn=-1.0 )
-      vn_crs(:,:,:) = vn_crs(:,:,:)*vmask_crs(:,:,:) !cbr utile ??????????????????
       CALL iom_put( "voce"  , vn_crs )   ! i-current 
 
@@ -346 +349 @@
       zfse3t(:,:,:) = 1._wp
       zt(:,:,:) = tmask(:,:,:)
-      ssha(:,:) = ssha(:,:) * tmask(:,:,1)  !cbr utile ??????????????????
       CALL crs_dom_ope( ssha , 'VOL', 'T', zt, ssha_crs , p_e12=e1e2t,  p_e3=zfse3t , psgn=1.0 )
 
@@ -371 +373 @@
       ENDDO
 
-      !zt_crs=ocean_volume_crs_t ; zs_crs=facvol_t after time !!! ça sert à quoi ???????????????????????????????????????????
-      CALL crs_dom_facvol( tmask, 'T', e1t, e2t, zfse3t, zt_crs, zs_crs )
-
-#endif
-
-#if defined key_vvl
+#endif
+
+#if defined key_vvl
+
       z1_2dt = 1._wp / ( 2. * rdt )                         ! set time step size (Euler/Leapfrog)
       IF( neuler == 0 .AND. kt == nit000 )   z1_2dt = 1._wp / rdt
+
       wn_crs(:,:,jpk) = 0._wp
       DO jk = jpkm1, 1, -1
@@ -399 +400 @@
 
 #endif
-      CALL crs_lbc_lnk( wn_crs, 'W', 1.0 )   !!!!!!!pas utile, nan ??????????????????????
-      wn_crs(:,:,:) = wn_crs(:,:,:) * tmask_crs(:,:,:)   !!!!!!!pas utile, nan ??????????????????????
-
       CALL iom_put( "woce", wn_crs  )   ! vertical velocity
 
+      !---------------------------------------------------------------------------------------------------
       !  free memory
       CALL wrk_dealloc( jpi, jpj, jpk, zfse3t, zfse3w )