Changeset 14000 for NEMO

Timestamp:

2020-12-02T15:03:17+01:00 (3 years ago)

Author:

jchanut

Message:

#2222, fixes an allocation pb if child initialized from parent (optional)

File:

• NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/NST/agrif_oce_interp.F90 (modified) (4 diffs)

NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/NST/agrif_oce_interp.F90

@@ -831 +831 @@
    SUBROUTINE interptsn( ptab, i1, i2, j1, j2, k1, k2, n1, n2, before )
       !!----------------------------------------------------------------------
-      !!                  *** ROUTINE interptsn ***
-      !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2), INTENT(inout) ::   ptab
       INTEGER                                     , INTENT(in   ) ::   i1, i2, j1, j2, k1, k2, n1, n2
@@ -902 +900 @@
                   
                   ! Intermediate grid:
-                  DO jk = 1, N_in
-                     h_in_i(jk) = e3t0_parent(ji,jj,jk) * & 
-                       &       (1._wp + ptab(ji,jj,k2,n2)/(ht0_parent(ji,jj)*ssmask(ji,jj) + 1._wp - ssmask(ji,jj)))
-                  END DO
-                  z_in_i(1) = 0.5_wp * h_in_i(1)
-                  DO jk=2,N_in
-                     z_in_i(jk) = z_in_i(jk-1) + 0.5_wp * ( h_in_i(jk) + h_in_i(jk-1) )
-                  END DO
-                  z_in_i(1:N_in) = z_in_i(1:N_in)  - ptab(ji,jj,k2,n2)
+                  IF ( l_vremap ) THEN
+                     DO jk = 1, N_in
+                        h_in_i(jk) = e3t0_parent(ji,jj,jk) * & 
+                          &       (1._wp + ptab(ji,jj,k2,n2)/(ht0_parent(ji,jj)*ssmask(ji,jj) + 1._wp - ssmask(ji,jj)))
+                     END DO
+                     z_in_i(1) = 0.5_wp * h_in_i(1)
+                     DO jk=2,N_in
+                        z_in_i(jk) = z_in_i(jk-1) + 0.5_wp * ( h_in_i(jk) + h_in_i(jk-1) )
+                     END DO
+                     z_in_i(1:N_in) = z_in_i(1:N_in)  - ptab(ji,jj,k2,n2)
+                  ENDIF                              
 
                   ! Output (Child) grid:
@@ -1080 +1080 @@
                      !   h_in(jk) = ptab(ji,jj,jk,2)/(e2u(ji,jj)*zrhoy) 
                      !ENDIF
-                     h_in(jk) = e3u0_parent(ji,jj,jk) 
-                     zhtot = zhtot + h_in(jk)
+                     IF ( l_vremap ) THEN
+                        h_in(jk) = e3u0_parent(ji,jj,jk) 
+                        zhtot = zhtot + h_in(jk)
+                     ENDIF
                      IF( h_in(jk) .GT. 0. ) THEN
                      tabin(jk) = ptab(ji,jj,jk,1)/(e2u(ji,jj)*zrhoy*h_in(jk))
@@ -1203 +1205 @@
                      !   h_in(jk) = ptab(ji,jj,jk,2)/(e1v(ji,jj)*zrhox) 
                      !ENDIF
-                     h_in(jk) = e3v0_parent(ji,jj,jk)
-                     zhtot = zhtot + h_in(jk)
+                     IF (l_vremap) THEN
+                        h_in(jk) = e3v0_parent(ji,jj,jk)
+                        zhtot = zhtot + h_in(jk)
+                     ENDIF
                      IF( h_in(jk) .GT. 0. ) THEN
                        tabin(jk) = ptab(ji,jj,jk,1)/(e1v(ji,jj)*zrhox*h_in(jk))