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

Timestamp:

2020-12-02T16:23:27+01:00 (3 years ago)

Author:

jchanut

Message:

Manually merge with Christian's branch agrif top sponge/interp #2129

File:

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

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

@@ -940 +940 @@
          ELSE
          
+            IF ( Agrif_Parent(ln_zps) ) THEN ! Account for partial cells 
+                                             ! linear vertical interpolation
+               DO jj=j1,j2
+                  DO ji=i1,i2
+                     !
+                     N_in  = mbkt(ji,jj)
+                     N_out = mbkt(ji,jj)
+                     z_in(1) = ptab(ji,jj,1,n2)
+                     tabin(1,1:jpts) = ptab(ji,jj,1,1:jpts)
+                     DO jk=2, N_in
+                        z_in(jk) = ptab(ji,jj,jk,n2)
+                        tabin(jk,1:jpts) = ptab(ji,jj,jk,1:jpts)
+                     END DO
+                     IF (.NOT.ln_linssh) z_in(1:N_in) = z_in(1:N_in) - ptab(ji,jj,k2,n2)
+                     z_out(1) = 0.5_wp * e3t(ji,jj,1,Krhs_a)
+                     DO jk=2, N_out
+                        z_out(jk) = z_out(jk-1) + 0.5_wp * (e3t(ji,jj,jk-1,Krhs_a) + e3t(ji,jj,jk,Krhs_a))
+                     END DO
+                     IF (.NOT.ln_linssh) z_out(1:N_out) = z_out(1:N_out) - ssh(ji,jj,Krhs_a)
+                     CALL remap_linear(tabin(1:N_in,1:jpts),z_in(1:N_in),ptab(ji,jj,1:N_out,1:jpts), &
+                                   &   z_out(1:N_out),N_in,N_out,jpts)  
+                  END DO
+               END DO
+            ENDIF
+
             DO jn =1, jpts
-
-               IF ( Agrif_Parent(ln_zps) ) THEN ! Account for partial cells 
-                                                ! linear vertical interpolation
-                  DO jj=j1,j2
-                     DO ji=i1,i2
-                        !
-                        N_in  = mbkt(ji,jj)
-                        N_out = mbkt(ji,jj)
-                        z_in(1) = ptab(ji,jj,1,n2)
-                        tabin(1,1:jpts) = ptab(ji,jj,1,1:jpts)
-                        DO jk=2, N_in
-                           z_in(jk) = ptab(ji,jj,jk,n2)
-                           tabin(jk,1:jpts) = ptab(ji,jj,jk,1:jpts)
-                        END DO
-                        IF (.NOT.ln_linssh) z_in(1:N_in) = z_in(1:N_in) - ptab(ji,jj,k2,n2)
-                        z_out(1) = 0.5_wp * e3t(ji,jj,1,Krhs_a)
-                        DO jk=2, N_out
-                           z_out(jk) = z_out(jk-1) + 0.5_wp * (e3t(ji,jj,jk-1,Krhs_a) + e3t(ji,jj,jk,Krhs_a))
-                        END DO
-                        IF (.NOT.ln_linssh) z_out(1:N_out) = z_out(1:N_out) - ssh(ji,jj,Krhs_a)
-                        CALL remap_linear(tabin(1:N_in,1:jpts),z_in(1:N_in),ptab(ji,jj,1:N_out,1:jpts), &
-                                      &   z_out(1:N_out),N_in,N_out,jpts)  
-                     END DO
-                  END DO
-
-               ENDIF
-
                ts(i1:i2,j1:j2,1:jpk,jn,Krhs_a) = ptab(i1:i2,j1:j2,1:jpk,jn)*tmask(i1:i2,j1:j2,1:jpk)
-
             END DO
          ENDIF