Changeset 14035

Timestamp:

2020-12-03T12:18:31+01:00 (4 years ago)

Author:

jchanut

Message:

#2222, remove linear vertical extrapolation over partial cells + correct initial state interp for top

Location:

NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/NST

Files:

• agrif_top_interp.F90 (modified) (1 diff)
• vremap.F90 (modified) (1 diff)

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

@@ -125 +125 @@
                   
                   ! 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:

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

@@ -380 +380 @@
          IF     ( pzout(jkout) <=  pzin(  1    ) ) THEN ! Surface extrapolation  
             DO jn = 1, kn_var 
-               ptout(jkout,jn) = ptin(1 ,jn) + &
-                               & (pzout(jkout) - pzin(1)) / (pzin(2)    - pzin(1)) &
-                               &                          * (ptin(2,jn) - ptin(1,jn))
+! linear
+!               ptout(jkout,jn) = ptin(1 ,jn) + &
+!                               & (pzout(jkout) - pzin(1)) / (pzin(2)    - pzin(1)) &
+!                               &                          * (ptin(2,jn) - ptin(1,jn))
+               ptout(jkout,jn) = ptin(1,jn)
             END DO
          ELSEIF ( pzout(jkout) >= pzin(kjpk_in) ) THEN ! Bottom extrapolation 
             DO jn = 1, kn_var 
-               ptout(jkout,jn) = ptin(kjpk_in ,jn) + &
-                               & (pzout(jkout) - pzin(kjpk_in)) / (pzin(kjpk_in)    - pzin(kjpk_in-1)) &
-                               &                                * (ptin(kjpk_in,jn) - ptin(kjpk_in-1,jn))
+! linear
+!               ptout(jkout,jn) = ptin(kjpk_in ,jn) + &
+!                               & (pzout(jkout) - pzin(kjpk_in)) / (pzin(kjpk_in)    - pzin(kjpk_in-1)) &
+!                               &                                * (ptin(kjpk_in,jn) - ptin(kjpk_in-1,jn))
+               ptout(jkout,jn) = ptin(kjpk_in ,jn)
             END DO
          ELSEIF ( ( pzout(jkout) > pzin(1) ).AND.( pzout(jkout) < pzin(kjpk_in) )) THEN