Changeset 109 for trunk/NEMO/OPA_SRC/DYN/dynhpg_atsk.F90

Timestamp:

2004-06-28T12:21:11+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE069 : Vorticity diagnostics has been added

File:

• trunk/NEMO/OPA_SRC/DYN/dynhpg_atsk.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/DYN/dynhpg_atsk.F90

@@ -113 +113 @@
             ua(ji,jj,1) = ua(ji,jj,1) + zhpi(ji,jj,1) + zuap
             va(ji,jj,1) = va(ji,jj,1) + zhpj(ji,jj,1) + zvap
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
             ! save the trend for diagnostics
             utrd(ji,jj,1,1) = zhpi(ji,jj,1) + zuap
@@ -139 +139 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zhpi(ji,jj,jk) + zuap
                va(ji,jj,jk) = va(ji,jj,jk) + zhpj(ji,jj,jk) + zvap
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
                ! save the momentum trends for diagnostics
                utrd(ji,jj,jk,1) = zhpi(ji,jj,jk) + zuap
@@ -226 +226 @@
             ua(ji,jj,1) = ua(ji,jj,1) + zhpi(ji,jj,1)
             va(ji,jj,1) = va(ji,jj,1) + zhpj(ji,jj,1)
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
             ! save the momentum trends for diagnostics
             utrd(ji,jj,1,1) = zhpi(ji,jj,1)
@@ -249 +249 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zhpi(ji,jj,jk)
                va(ji,jj,jk) = va(ji,jj,jk) + zhpj(ji,jj,jk)
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
                ! save the momentum trends for diagnostics
                utrd(ji,jj,jk,1) = zhpi(ji,jj,jk)
@@ -272 +272 @@
                ! add the new one to the general momentum trend
                ua(ji,jj,iku) = ua(ji,jj,iku) + zhpi(ji,jj,iku)
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
                ! save the momentum trends for diagnostics
                utrd(ji,jj,iku,1) = zhpi(ji,jj,iku)
@@ -286 +286 @@
                ! add the new one to the general momentum trend
                va(ji,jj,ikv) = va(ji,jj,ikv) + zhpj(ji,jj,ikv)
-#   if  defined key_trddyn
+#   if  defined key_trddyn || defined key_trd_vor
                ! save the momentum trends for diagnostics
                vtrd(ji,jj,ikv,1) = zhpj(ji,jj,ikv)
@@ -376 +376 @@
             ua(ji,jj,1) = ua(ji,jj,1) + zhpi(ji,jj,1)
             va(ji,jj,1) = va(ji,jj,1) + zhpj(ji,jj,1)
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
             ! save the momentum trends for diagnostics
             utrd(ji,jj,1,1) = zhpi(ji,jj,1)
@@ -399 +399 @@
                ua(ji,jj,jk) = ua(ji,jj,jk) + zhpi(ji,jj,jk)
                va(ji,jj,jk) = va(ji,jj,jk) + zhpj(ji,jj,jk)
-#   if defined key_trddyn
+#   if defined key_trddyn || defined key_trd_vor
                ! save the momentum trends for diagnostics
                utrd(ji,jj,jk,1) = zhpi(ji,jj,jk)
@@ -411 +411 @@
 
       IF(l_ctl) THEN         ! print sum trends (used for debugging)
-         WRITE(numout,*) ' hpg  - Ua: ', SUM(ua(2:nictl,2:njctl,1:jpkm1)*umask(2:nictl,2:njctl,1:jpkm1))
-         WRITE(numout,*) '      - Va: ', SUM(va(2:nictl,2:njctl,1:jpkm1)*vmask(2:nictl,2:njctl,1:jpkm1))
+         WRITE(numout,*) ' hpg  - Ua: ', SUM(ua(2:nictl,2:njctl,1:jpkm1)*umask(2:nictl,2:njctl,1:jpkm1)), &
+         &                      ' Va: ', SUM(va(2:nictl,2:njctl,1:jpkm1)*vmask(2:nictl,2:njctl,1:jpkm1))
          zuap = SUM( ua(2:nictl,2:njctl,1:jpkm1) * umask(2:nictl,2:njctl,1:jpkm1) )
          zvap = SUM( va(2:nictl,2:njctl,1:jpkm1) * vmask(2:nictl,2:njctl,1:jpkm1) )