Changeset 13024 for utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_update.F90

Timestamp:

2020-06-03T16:26:23+02:00 (4 years ago)

Author:

rblod

Message:

First version of new nesting tools merged with domaincfg, see ticket #2129

File:

• utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_update.F90 (modified) (9 diffs)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_update.F90

@@ -6 +6 @@
 
 if (agrif_root()) return
+
 call agrif_update_variable(bottom_level_id,locupdate=(/npt_copy,0/),procname = update_bottom_level)
+
 
       Agrif_UseSpecialValueInUpdate = .TRUE.
@@ -14 +16 @@
       Agrif_UseSpecialValueInUpdate = .FALSE.
 
-call agrif_update_variable(e3u_id,procname = update_e3u)
-call agrif_update_variable(e3v_id,procname = update_e3v)
+!call agrif_update_variable(e3u_id,procname = update_e3u)
+!call agrif_update_variable(e3v_id,procname = update_e3v)
       
 end subroutine agrif_update_all
@@ -46 +48 @@
          WHERE (mbkt(i1:i2,j1:j2)==0)
            ssmask(i1:i2,j1:j2) = 0.
+         ELSEWHERE
+           ssmask(i1:i2,j1:j2) = 1.
          END WHERE
            
@@ -69 +73 @@
                DO jj=j1,j2
                   DO ji=i1,i2
-                   if (mbkt(ji,jj) < jk) then
+                   if (mbkt(ji,jj) <= jk) then
                      tabres(ji,jj,jk) = e3t_0(ji,jj,jk)
                    else
@@ -81 +85 @@
                DO jj=j1,j2
                   DO ji=i1,i2
-                   if (mbkt(ji,jj) < jk) then
+                   if (mbkt(ji,jj) <= jk) then
+                     e3t_0(ji,jj,jk) = MAX(tabres(ji,jj,jk),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
+                   else
                      e3t_0(ji,jj,jk) = e3t_1d(jk)
-                   else
-                     e3t_0(ji,jj,jk) = MAX(tabres(ji,jj,jk),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
                    endif
                   END DO
@@ -113 +117 @@
           do jj=j1,j2
           do ji=i1,i2
-           if (min(mbkt(ji,jj),mbkt(ji+1,jj))<jk) then
+           if (min(mbkt(ji,jj),mbkt(ji+1,jj))<=jk) then
             tabres(ji,jj,jk) = zrhoy * e2u(ji,jj) * MIN(e3zps_min,e3t_1d(jk)*e3zps_rat)
            else
@@ -125 +129 @@
             DO jj=j1,j2
                DO ji=i1,i2
-                 if (min(mbkt(ji,jj),mbkt(ji+1,jj))<jk) then
-                   e3u_0(ji,jj,jk)=e3t_1d(jk)
+                 if (min(mbkt(ji,jj),mbkt(ji+1,jj))<=jk) then
+                   e3u_0(ji,jj,jk)=MAX(tabres(ji,jj,jk) / e2u(ji,jj),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
                  else
-                   e3u_0(ji,jj,jk) = MAX(tabres(ji,jj,jk) / e2u(ji,jj),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
+                   e3u_0(ji,jj,jk) = e3t_1d(jk)
                  endif
                END DO
@@ -157 +161 @@
           do jj=j1,j2
           do ji=i1,i2
-           if (min(mbkt(ji,jj),mbkt(ji,jj+1))<jk) then
+           if (min(mbkt(ji,jj),mbkt(ji,jj+1))<=jk) then
             tabres(ji,jj,jk) = zrhox * e1v(ji,jj) * MIN(e3zps_min,e3t_1d(jk)*e3zps_rat)
            else
@@ -169 +173 @@
             DO jj=j1,j2
                DO ji=i1,i2
-                 if (min(mbkt(ji,jj),mbkt(ji,jj+1))<jk) then
-                   e3v_0(ji,jj,jk)=e3t_1d(jk)
+                 if (min(mbkt(ji,jj),mbkt(ji,jj+1))<=jk) then
+                   e3v_0(ji,jj,jk)=MAX(tabres(ji,jj,jk) / e1v(ji,jj),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
                  else
-                   e3v_0(ji,jj,jk) = MAX(tabres(ji,jj,jk) / e1v(ji,jj),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
+                   e3v_0(ji,jj,jk) = e3t_1d(jk)
                  endif
                END DO