Changeset 12822 for NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/SWE/domain.F90

Timestamp:

2020-04-28T11:10:38+02:00 (4 years ago)

Author:

gm

Message:

symmetric sterss tensor and half cell modifications (wet point only, ghost cells)

File:

• NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/SWE/domain.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/SWE/domain.F90

@@ -44 +44 @@
    USE lbclnk         ! ocean lateral boundary condition (or mpp link)
    USE lib_mpp        ! distributed memory computing library
-
+!!an45
+!   USE usrdef_nam, ONLY : ln_45machin
+   !
    IMPLICIT NONE
    PRIVATE
@@ -50 +52 @@
    PUBLIC   dom_init     ! called by nemogcm.F90
    PUBLIC   domain_cfg   ! called by nemogcm.F90
-
+#  include "do_loop_substitute.h90"
    !!-------------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -81 +83 @@
       INTEGER , DIMENSION(jpi,jpj) ::   ik_top , ik_bot       ! top and bottom ocean level
       REAL(wp), DIMENSION(jpi,jpj) ::   z1_hu_0, z1_hv_0
+      REAL(wp)::   zcoeff                                     ! local real
+
       !!----------------------------------------------------------------------
       !
@@ -154 +158 @@
          hf_0(:,:) = hf_0(:,:) + e3f_0(:,:,jk) * ssfmask(:,:)     ! CAUTION : only valid in SWE, not with bathymetry
       END DO
+      !
+!!anhf hf_0 = mean(ht_0*tmask) so hf = mimj( ht0 + ssht)
+! ne pas combiner avec an45 tout de suite
+!      DO_2D_10_10
+!         hf_0(ji,jj) = 0.25_wp * (   ht_0(ji,jj+1) * tmask(ji,jj+1,1) + ht_0(ji+1,jj+1) * tmask(ji+1,jj+1,1)   &
+!            &                      + ht_0(ji,jj  ) * tmask(ji,jj  ,1) + ht_0(ji+1,jj  ) * tmask(ji+1,jj  ,1)   )
+!      END_2D
+!      CALL lbc_lnk( 'domain', hf_0, 'F', 1. )      ! Lateral boundary conditions
+!!anhf
       !                                 ! Inverse of reference ocean thickness
       r1_ht_0(:,:) =  ssmask(:,:) / ( ht_0(:,:) + 1._wp -  ssmask(:,:) )
@@ -159 +172 @@
       r1_hv_0(:,:) = ssvmask(:,:) / ( hv_0(:,:) + 1._wp - ssvmask(:,:) )
       r1_hf_0(:,:) = ssfmask(:,:) / ( hf_0(:,:) + 1._wp - ssfmask(:,:) )
-      
+      !
+!!an45 Ligne de cote a 45deg : e1e2t *= ( mi(umask) + mj(vmask) ) /2
+!!                             idem pour e1e2f
+!      DO_2D_10_10
+!      zcoeff = 0.25_wp * (   umask(ji,jj+1,1) + umask(ji+1,jj+1,1)   &
+!         &                 + vmask(ji,jj  ,1) + vmask(ji+1,jj  ,1)   )
+!         IF ( zcoeff /= 0._wp )   THEN
+!               e1e2t(ji,jj) =    e1e2t(ji,jj) * zcoeff
+!            r1_e1e2t(ji,jj) = r1_e1e2t(ji,jj) / zcoeff
+!         ENDIF
+!      END_2D
+!      WRITE(numout,*) '   an45 half T cell e1e2t '
+!      zcoeff = 0.25_wp * (   umask(ji,jj+1,1) + umask(ji+1,jj+1,1)   &
+!         &                 + vmask(ji,jj  ,1) + vmask(ji+1,jj  ,1)   )
+!         IF ( zcoeff /= 0._wp )   THEN
+!               e1e2t(ji,jj) =    e1e2t(ji,jj) * zcoeff
+!            r1_e1e2t(ji,jj) = r1_e1e2t(ji,jj) / zcoeff
+!!an45
       !           !==  time varying part of coordinate system  ==!
       !