Changeset 9545 for branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

Timestamp:

2018-05-03T18:47:30+02:00 (6 years ago)

Author:

jchanut

Message:

Add diagnostics in diawri - revert to old interface interpolation - change default regriding parameters - add linear ramp at startup

File:

• branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) (1 diff)

branches/2018/dev_r8864_nemo_v3_6_ZTILDE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -158 +158 @@
       CALL iom_put("tpt_dep", fsdept_n(:,:,:) )
       IF( iom_use("gdepwt") )  THEN
-         z3d(:,:,1) = (gdepw_n(:,:,1)-sshn(:,:))*tmask(:,:,1)
+#if defined key_vvl
+         z3d(:,:,1) = (fsdepw(:,:,1)-sshn(:,:))*tmask(:,:,1)
          DO jk=2,jpk
-            z3d(:,:,jk) = (gdepw_n(:,:,jk)-sshn(:,:))*tmask(:,:,jk-1)
-         END DO
+            z3d(:,:,jk) = (fsdepw(:,:,jk)-sshn(:,:))*tmask(:,:,jk-1)
+         END DO
+#else
+         z3d(:,:,1) = 0._wp
+         DO jk=2,jpk
+            z3d(:,:,jk) = fsdepw(:,:,jk)*tmask(:,:,jk-1)
+         END DO
+#endif
          CALL iom_put("gdepwt" , z3d(:,:,:) )
+      END IF
+
+      IF( iom_use("gdepwu") )  THEN
+         z2d(:,:) = 0._wp
+         DO jj = 1, jpjm1
+            DO ji = 1, fs_jpim1   ! vector opt.
+               z2d(ji,jj) = 0.5_wp * umask(ji,jj,1) * r1_e12u(ji,jj)                             &
+                        &          * ( e12t(ji,jj) * sshn(ji,jj) + e12t(ji+1,jj) * sshn(ji+1,jj) )
+            END DO
+         END DO
+         CALL lbc_lnk( z2d(:,:), 'U', 1._wp )
+
+         z3d(:,:,1)=0._wp
+         DO jk=2,jpk
+            z3d(:,:,jk) = z3d(:,:,jk-1) + fse3u_n(:,:,jk-1) * umask(:,:,jk-1)
+         END DO
+
+         z3d(:,:,1) = (z3d(:,:,1)-z2d(:,:))*umask(:,:,1)
+         DO jk=2,jpk
+            z3d(:,:,jk) = (z3d(:,:,jk)-z2d(:,:))*umask(:,:,jk-1)
+         END DO
+         CALL iom_put("gdepwu" , z3d(:,:,:) )
+      END IF
+
+      IF( iom_use("gdepwv") )  THEN
+         z2d(:,:) = 0._wp
+         DO jj = 1, jpjm1
+            DO ji = 1, fs_jpim1   ! vector opt.
+               z2d(ji,jj) = 0.5_wp * vmask(ji,jj,1) * r1_e12v(ji,jj)                             &
+                        &          * ( e12t(ji,jj) * sshn(ji,jj) + e12t(ji,jj+1) * sshn(ji,jj+1) )
+            END DO
+         END DO
+         CALL lbc_lnk( z2d(:,:), 'V', 1._wp )
+
+         z3d(:,:,1)=0._wp
+         DO jk=2,jpk
+            z3d(:,:,jk) = z3d(:,:,jk-1) + fse3v_n(:,:,jk-1) * vmask(:,:,jk-1)
+         END DO
+
+         z3d(:,:,1) = (z3d(:,:,1)-z2d(:,:))*vmask(:,:,1)
+         DO jk=2,jpk
+            z3d(:,:,jk) = (z3d(:,:,jk)-z2d(:,:))*vmask(:,:,jk-1)
+         END DO
+         CALL iom_put("gdepwv" , z3d(:,:,:) )
       END IF