Changeset 8197 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.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/dynhpg.F90 (modified) (4 diffs)

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

@@ -379 +379 @@
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
-      INTEGER  ::   id_dia_vrt_hpg_int  = 11   ! TODO remove once flags set properly
-      INTEGER  ::   id_dia_vrt_hpg_mean = 12   ! TODO remove once flags set properly
+      CHARACTER(len=3) :: id_vrt_dia_hpg = "hpg" ! TODO remove once flags set properly
       INTEGER  ::   ji, jj, jk                 ! dummy loop indices
       REAL(wp) ::   zcoef0, zuap, zvap, znad   ! temporary scalars
@@ -416 +415 @@
             zvap = -zcoef0 * ( rhd   (ji,jj+1,1) + rhd   (ji,jj,1) + 2._wp * znad )   &
                &           * ( fsde3w(ji,jj+1,1) - fsde3w(ji,jj,1) ) / e2v(ji,jj)
-            ! combine gradient and corerction
+            ! combine gradient and correction
             zuhpg(ji,jj,1) = zhpi(ji,jj,1) + zuap
             zvhpg(ji,jj,1) = zhpj(ji,jj,1) + zvap
@@ -441 +440 @@
                zvap = -zcoef0 * ( rhd   (ji  ,jj+1,jk) + rhd   (ji,jj,jk) + 2._wp * znad )   &
                   &           * ( fsde3w(ji  ,jj+1,jk) - fsde3w(ji,jj,jk) ) / e2v(ji,jj)
-               ! combine gradient and corerction
+               ! combine gradient and correction
                zuhpg(ji,jj,jk) = zhpi(ji,jj,jk) + zuap
                zvhpg(ji,jj,jk) = zhpj(ji,jj,jk) + zvap
@@ -452 +451 @@
       !
       ! calculate dia_vor_int & dia_vor_mn if required
-      IF ( ( id_dia_vrt_hpg_int == 11 ) .or. ( id_dia_vrt_hpg_mean == 12 ) ) THEN
+      IF ( id_vrt_dia_hpg == "hpg" ) THEN
           ! TODO - remove kt only used for validation
-          CALL dyn_vrt_dia_3d(zuhpg, zvhpg, id_dia_vrt_hpg_int, id_dia_vrt_hpg_mean, kt)
+          CALL dyn_vrt_dia_3d(zuhpg, zvhpg, id_vrt_dia_hpg, kt)
       END IF
       !