Changeset 8197 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

Timestamp:

2017-06-21T11:39:54+02:00 (7 years ago)

Author:

glong

Message:

Changed id's to be chars e.g. hpg to more easily identify output (and updated field_def.xml accordingly). Also rearranged scaling factors in dyn_vrt_dia subroutines in divcur.F90

File:

• branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (2 diffs)

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

@@ -60 +60 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step inedx
       !
-      INTEGER  ::   id_dia_vrt_zad_int  = 61  ! TODO remove once flags set properly
-      INTEGER  ::   id_dia_vrt_zad_mean = 62  ! TODO remove once flags set properly
+      CHARACTER(len=3) :: id_vrt_dia_zad = "zad" ! TODO remove once flags set properly
       INTEGER  ::   ji, jj, jk                ! dummy loop indices
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwuw , zwvw
@@ -145 +144 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF ( ( id_dia_vrt_zad_int == 61 ) .or. ( id_dia_vrt_zad_mean == 62 ) ) THEN
+      IF ( id_vrt_dia_zad == "zad" ) THEN
           ! TODO - remove kt only used for validation
-          CALL dyn_vrt_dia_3d(zua, zva, id_dia_vrt_zad_int, id_dia_vrt_zad_mean, kt)
+          CALL dyn_vrt_dia_3d(zua, zva, id_vrt_dia_zad, kt)
       END IF
       !