Changeset 7845 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2017-03-30T11:39:38+02:00 (7 years ago)

Author:

glong

Message:

Split dyn_vrt_diag in divcur.F90 into two parts - and changed calls in dynhpg.F90, dynkeg.F90, dynldf_bilap.F90, dynvor.F90, dynzad.F90. Added calls to dyn_vrt_diag in dynspg_ts.F90. Also added call in dynzdf.F90 but this is more of a place holder as it is not currently correct.

File:

• branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (3 diffs)

branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -41 +41 @@
    USE timing          ! Timing    
    USE sbcapr          ! surface boundary condition: atmospheric pressure
+   USE divcur          ! for dyn_vrt_dia_2d
    USE dynadv, ONLY: ln_dynadv_vec
 #if defined key_agrif
@@ -144 +145 @@
       INTEGER  ::   ji, jj, jk, jn        ! dummy loop indices
       INTEGER  ::   ikbu, ikbv, noffset      ! local integers
+      INTEGER  ::   id_dia_vrt_spg_int  = 1  ! TODO remove once flags set properly
+      INTEGER  ::   id_dia_vrt_spg_mean = 1  ! TODO remove once flags set properly
       REAL(wp) ::   zraur, z1_2dt_b, z2dt_bf    ! local scalars
       REAL(wp) ::   zx1, zy1, zx2, zy2         !   -      -
@@ -450 +453 @@
          ENDIF 
       ENDIF
+      !
+                                                ! Calculate dia_vor_int &
+                                                ! dia_vor_mn if required
+      IF ( ( id_dia_vrt_spg_int == 1 ) .or. (id_dia_vrt_spg_mean == 1 ) ) THEN
+          CALL dyn_vrt_dia_2d(zu_frc, zv_frc, di_dia_vrt_spg_int, id_dia_vrt_spg_mean)
+      END IF
       !                                   !* Right-Hand-Side of the barotropic ssh equation
       !                                   ! -----------------------------------------------