Changeset 8822 for branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

Timestamp:

2017-11-27T14:55:00+01:00 (6 years ago)

Author:

timgraham

Message:

Bug fixes in interp and update.
Modified update to deal with none matching depths at U/V points

File:

• branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (5 diffs)

branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -665 +665 @@
              IF (ptab(ji,jj,jk,n2) == 0) EXIT
              N_in = N_in + 1
-             tabin(jk,:) = ptab(ji,jj,jk,n1:n2-1)/ptab(ji,jj,jk,n2)
-             h_in(N_in) = ptab(ji,jj,jk,n2)/(e1e2t(ji,jj))
+             tabin(jk,:) = ptab(ji,jj,jk,n1:n2-1)/(ptab(ji,jj,jk,n2))
+             h_in(N_in) = ptab(ji,jj,jk,n2)/(e1e2t(ji,jj)*zrhoxy)
            END DO
            N_out = 0
@@ -716 +716 @@
 
          !
-         western_side  = (nb == 1).AND.(ndir == 1)
-         eastern_side  = (nb == 1).AND.(ndir == 2)
-         southern_side = (nb == 2).AND.(ndir == 1)
-         northern_side = (nb == 2).AND.(ndir == 2)
-         !
          zrhox = Agrif_Rhox()
          ! 
@@ -939 +934 @@
                   N_in = N_in + 1
                   tabin(jk) = ptab(ji,jj,jk,1)/ptab(ji,jj,jk,2)
-                  h_in(N_in) = ptab(ji,jj,jk,2)/(e2u(ji,jj)) 
+                  h_in(N_in) = ptab(ji,jj,jk,2)/(e2u(ji,jj)*zrhoy) 
               ENDDO
          
@@ -968 +963 @@
               ENDIF
               call reconstructandremap(tabin(1:N_in),h_in(1:N_in),ptab_child(ji,jj,1:N_out),h_out(1:N_out),N_in,N_out)
-         
             ENDDO
          ENDDO
@@ -1050 +1044 @@
                   N_in = N_in + 1
                   tabin(jk) = ptab(ji,jj,jk,1)/ptab(ji,jj,jk,2)
-                  h_in(N_in) = ptab(ji,jj,jk,2)/(e1v(ji,jj))
+                  h_in(N_in) = ptab(ji,jj,jk,2)/(e1v(ji,jj)*zrhox)
                enddo
                IF (N_in == 0) THEN