Changeset 13005 for NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/SWE/ldfdyn.F90

Timestamp:

2020-06-02T17:46:26+02:00 (4 years ago)

Author:

gm

Message:

ADE and more options to AM98 config

File:

• NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/SWE/ldfdyn.F90 (modified) (3 diffs)

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

@@ -25 +25 @@
    USE lib_mpp         ! distribued memory computing library
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-
+   !
+   USE usrdef_nam , ONLY : ln_dynldf_lap_PM
+   !
    IMPLICIT NONE
    PRIVATE
@@ -60 +62 @@
    INTEGER           , PUBLIC ::   nldf_dyn         !: type of lateral diffusion used defined from ln_dynldf_... (namlist logicals)
    LOGICAL           , PUBLIC ::   l_ldfdyn_time    !: flag for time variation of the lateral eddy viscosity coef.
-
+!!an
+   !LOGICAL           , PUBLIC ::   ll_dynldf_lap_PM !: flag for P.Marchand modification on viscosity
+!!an
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ahmt, ahmf   !: eddy viscosity coef. at T- and F-points [m2/s or m4/s]
    REAL(wp),         ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   dtensq       !: horizontal tension squared         (Smagorinsky only)
@@ -323 +327 @@
          IF( .NOT.l_ldfdyn_time ) THEN             !* No time variation 
             IF(     ln_dynldf_lap ) THEN                 !   laplacian operator (mask only)
-               ahmt(:,:,1:jpkm1) =       ahmt(:,:,1:jpkm1)   * tmask(:,:,1:jpkm1)
-               WRITE(numout,*) ' ahmt tmask '
+!!an          !
+            WRITE(numout,*) '   ln_dynldf_lap_PM = ',ln_dynldf_lap_PM 
+               IF(     ln_dynldf_lap_PM ) THEN                 !   laplacian operator (mask only)
 !! mask tension at the coast (equivalent of ghostpoints at T)
-!              DO jk = 1, jpk
-!                 DO jj = 1, jpjm1
-!                    DO ji = 1, jpim1      ! NO vector opt.
-!                       ! si sum(fmask)==3 = mouillé (on touche pas)
-!                       ! si sum = 2 alors on met a 0 zsum = fmask + fmask + fmask,.. et si zsum < 2 -> 0 sinon = 1
-!                       zsum =   fmask(ji,jj  ,jk) + fmask(ji+1,jj  ,jk)   &
-!                          &   + fmask(ji,jj+1,jk) + fmask(ji+1,jj+1,jk)
-!                       IF ( zsum < 2._wp )   ahmt(ji,jj,jk) = 0
-!                       !
-!                       !ahmt(ji,jj,jk) = ahmt(ji,jj,jk) * fmask(ji,jj  ,jk) * fmask(ji+1,jj  ,jk)   &
-!                       !   &                            * fmask(ji,jj+1,jk) * fmask(ji+1,jj+1,jk)
-!                    END DO
-!                 END DO
-!              END DO
-!              ahmt(jpi,:,1:jpkm1) =  0._wp
-!              ahmt(:,jpj,1:jpkm1) =  0._wp
-!              WRITE(numout,*) '   an45 ahmt x0'
-
-               ahmf(:,:,1:jpkm1) =       ahmf(:,:,1:jpkm1)   * fmask(:,:,1:jpkm1)
-               WRITE(numout,*) ' ahmf fmask '
-!!an apply no slip at the coast (ssfmask = 1 within the domain and at the coast contrary to fmask in free slip)
-!               DO jk = 1, jpkm1
-!                  ahmf(:,:,jk) =    ahmf(:,:,jk) * ( 2._wp * ssfmask(:,:) - fmask(:,:,jk) )
-!               END DO
-!               WRITE(numout,*) '   an45 ahmf x2'
-
+                  DO jk = 1, jpk
+                     DO jj = 1, jpjm1
+                        DO ji = 1, jpim1      ! NO vector opt.
+                           ! si sum(fmask)==3 = mouillé (on touche pas)
+                           ! si sum = 2 alors on met a 0 zsum = fmask + fmask + fmask,.. et si zsum < 2 -> 0 sinon = 1
+                           zsum =   fmask(ji,jj  ,jk) + fmask(ji+1,jj  ,jk)   &
+                              &   + fmask(ji,jj+1,jk) + fmask(ji+1,jj+1,jk)
+                           IF ( zsum < 2._wp )   ahmt(ji,jj,jk) = 0
+                           !
+                           !ahmt(ji,jj,jk) = ahmt(ji,jj,jk) * fmask(ji,jj  ,jk) * fmask(ji+1,jj  ,jk)   &
+                           !   &                            * fmask(ji,jj+1,jk) * fmask(ji+1,jj+1,jk)
+                        END DO
+                     END DO
+                  END DO
+                  ahmt(jpi,:,1:jpkm1) =  0._wp
+                  ahmt(:,jpj,1:jpkm1) =  0._wp
+                  WRITE(numout,*) '  ahmt x0'
+!! apply no slip at the coast (ssfmask = 1 within the domain and at the coast contrary to fmask in free slip)
+                   DO jk = 1, jpkm1
+                      ahmf(:,:,jk) =    ahmf(:,:,jk) * ( 2._wp * ssfmask(:,:) - fmask(:,:,jk) )
+                   END DO
+                   WRITE(numout,*) '  ahmf x2'
+               ELSE
+               ! classic boundary condition on the viscosity coefficient
+                  ahmt(:,:,1:jpkm1) =       ahmt(:,:,1:jpkm1)   * tmask(:,:,1:jpkm1)
+                  WRITE(numout,*) ' ahmt tmasked '
+                  ahmf(:,:,1:jpkm1) =       ahmf(:,:,1:jpkm1)   * fmask(:,:,1:jpkm1)
+                  WRITE(numout,*) ' ahmf fmasked '
+               ENDIF
+!!an         !                 
             ELSEIF( ln_dynldf_blp ) THEN                 ! bilaplacian operator (square root + mask)
                ahmt(:,:,1:jpkm1) = SQRT( ahmt(:,:,1:jpkm1) ) * tmask(:,:,1:jpkm1)