Changeset 15124

Timestamp:

2021-07-15T16:05:59+02:00 (3 years ago)

Author:

dbruciaferri

Message:

removing old style substitution

Location:

NEMO/branches/UKMO/tools_r4.0-HEAD_dev_MEs/DOMAINcfg/src

Files:

• domzgr_substitute.h90 (deleted)
• vectopt_loop_substitute.h90 (deleted)
• zgrmes.f90 (modified) (4 diffs)

NEMO/branches/UKMO/tools_r4.0-HEAD_dev_MEs/DOMAINcfg/src/zgrmes.f90

@@ -49 +49 @@
                                                  ! each vertical sub-zone
       !! * Substitutions
-#  include "domzgr_substitute.h90"
-#  include "vectopt_loop_substitute.h90"
+!#include "domzgr_substitute.h90"
+!#include "vectopt_loop_substitute.h90"
 
 CONTAINS
@@ -906 +906 @@
       CALL lbc_lnk( e3vw_0, 'V', 1._wp )
 
-      fsdepw(:,:,:) = gdepw_0 (:,:,:)
-      fsde3w(:,:,:) = gde3w_0(:,:,:)
-      !
       where (e3t_0   (:,:,:).eq.0.0)  e3t_0(:,:,:) = 1.0
       where (e3u_0   (:,:,:).eq.0.0)  e3u_0(:,:,:) = 1.0
@@ -917 +914 @@
       where (e3vw_0  (:,:,:).eq.0.0)  e3vw_0(:,:,:) = 1.0
 
-#if defined key_agrif
-      ! Ensure meaningful vertical scale factors in ghost lines/columns
-      IF( .NOT. Agrif_Root() ) THEN
-         !  
-         IF((nbondi == -1).OR.(nbondi == 2)) THEN
-            e3u_0(1,:,:) = e3u_0(2,:,:)
-         ENDIF
-         !
-         IF((nbondi ==  1).OR.(nbondi == 2)) THEN
-            e3u_0(nlci-1,:,:) = e3u_0(nlci-2,:,:)
-         ENDIF
-         !
-         IF((nbondj == -1).OR.(nbondj == 2)) THEN
-            e3v_0(:,1,:) = e3v_0(:,2,:)
-         ENDIF
-         !
-         IF((nbondj ==  1).OR.(nbondj == 2)) THEN
-            e3v_0(:,nlcj-1,:) = e3v_0(:,nlcj-2,:)
-         ENDIF
-         !
-      ENDIF
-#endif    
-
-      fsdept(:,:,:) = gdept_0 (:,:,:)
-      fsdepw(:,:,:) = gdepw_0 (:,:,:)
-      fsde3w(:,:,:) = gde3w_0(:,:,:)
-      fse3t (:,:,:) = e3t_0   (:,:,:)
-      fse3u (:,:,:) = e3u_0   (:,:,:)
-      fse3v (:,:,:) = e3v_0   (:,:,:)
-      fse3f (:,:,:) = e3f_0   (:,:,:)
-      fse3w (:,:,:) = e3w_0   (:,:,:)
-      fse3uw(:,:,:) = e3uw_0  (:,:,:)
-      fse3vw(:,:,:) = e3vw_0  (:,:,:)
-
       IF( lwp ) WRITE(numout,*) 'Refine mbathy'
       DO jj = 1, jpj
          DO ji = 1, jpi
             DO jk = 1, jpkm1
-               IF( scobot(ji,jj) >= fsdept(ji,jj,jk) )   mbathy(ji,jj) = MAX( 2, jk )
+               IF( scobot(ji,jj) >= gdept_0(ji,jj,jk) )   mbathy(ji,jj) = MAX( 2, jk )
             END DO
             IF( scobot(ji,jj) == 0._wp               )   mbathy(ji,jj) = 0
@@ -991 +954 @@
             DO jk = 1, mbathy(ji,jj)
                ! check coordinate is monotonically increasing
-               IF (fse3w(ji,jj,jk) <= 0._wp .OR. fse3t(ji,jj,jk) <= 0._wp ) THEN
+               IF (e3w_0(ji,jj,jk) <= 0._wp .OR. e3t_0(ji,jj,jk) <= 0._wp ) THEN
                   WRITE(ctmp1,*) 'ERROR zgr_mes :   e3w   or e3t   =< 0  at point (i,j,k)= ', ji, jj, jk
                   WRITE(numout,*) 'ERROR zgr_mes :   e3w   or e3t   =< 0  at point (i,j,k)= ', ji, jj, jk
-                  WRITE(numout,*) 'e3w',fse3w(ji,jj,:)
-                  WRITE(numout,*) 'e3t',fse3t(ji,jj,:)
+                  WRITE(numout,*) 'e3w',e3w_0(ji,jj,:)
+                  WRITE(numout,*) 'e3t',e3t_0(ji,jj,:)
                   CALL ctl_stop( ctmp1 )
                ENDIF
                ! and check it has never gone negative
-               IF ( fsdepw(ji,jj,jk) < 0._wp .OR. fsdept(ji,jj,jk) < 0._wp ) THEN
+               IF ( gdepw_0(ji,jj,jk) < 0._wp .OR. gdept_0(ji,jj,jk) < 0._wp ) THEN
                   WRITE(ctmp1,*) 'ERROR zgr_mes :   gdepw or gdept =< 0  at point (i,j,k)= ', ji, jj, jk
                   WRITE(numout,*) 'ERROR zgr_mes :   gdepw   or gdept   =< 0  at point (i,j,k)= ', ji, jj, jk
-                  WRITE(numout,*) 'gdepw',fsdepw(ji,jj,:)
-                  WRITE(numout,*) 'gdept',fsdept(ji,jj,:)
+                  WRITE(numout,*) 'gdepw',gdepw_0(ji,jj,:)
+                  WRITE(numout,*) 'gdept',gdept_0(ji,jj,:)
                   CALL ctl_stop( ctmp1 )
                ENDIF