Changeset 9305

Timestamp:

2018-02-05T14:52:16+01:00 (7 years ago)

Author:

dford

Message:

Change variable name in accordance with NEMO conventions.

File:

• branches/UKMO/dev_r5518_obs_oper_update_bgc3d/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (6 diffs)

branches/UKMO/dev_r5518_obs_oper_update_bgc3d/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -222 +222 @@
       REAL(dp) :: rn_dobsend     ! Obs window end date   YYYYMMDD.HHMMSS
 
-      REAL(wp) :: rtype_avglamscl ! Local version of rn_*_avglamscl
-      REAL(wp) :: rtype_avgphiscl ! Local version of rn_*_avgphiscl
+      REAL(wp) :: ztype_avglamscl ! Local version of rn_*_avglamscl
+      REAL(wp) :: ztype_avgphiscl ! Local version of rn_*_avgphiscl
 
       CHARACTER(len=128), DIMENSION(:,:), ALLOCATABLE :: &
@@ -621 +621 @@
                   n2dint_type  = nn_2dint_sla
                ENDIF
-               rtype_avglamscl = rn_sla_avglamscl
-               rtype_avgphiscl = rn_sla_avgphiscl
+               ztype_avglamscl = rn_sla_avglamscl
+               ztype_avgphiscl = rn_sla_avgphiscl
                ltype_fp_indegs = ln_sla_fp_indegs
                ltype_night     = .FALSE.
@@ -631 +631 @@
                   n2dint_type  = nn_2dint_sst
                ENDIF
-               rtype_avglamscl = rn_sst_avglamscl
-               rtype_avgphiscl = rn_sst_avgphiscl
+               ztype_avglamscl = rn_sst_avglamscl
+               ztype_avgphiscl = rn_sst_avgphiscl
                ltype_fp_indegs = ln_sst_fp_indegs
                ltype_night     = ln_sstnight
@@ -641 +641 @@
                   n2dint_type  = nn_2dint_sic
                ENDIF
-               rtype_avglamscl = rn_sic_avglamscl
-               rtype_avgphiscl = rn_sic_avgphiscl
+               ztype_avglamscl = rn_sic_avglamscl
+               ztype_avgphiscl = rn_sic_avgphiscl
                ltype_fp_indegs = ln_sic_fp_indegs
                ltype_night     = .FALSE.
@@ -651 +651 @@
                   n2dint_type  = nn_2dint_sss
                ENDIF
-               rtype_avglamscl = rn_sss_avglamscl
-               rtype_avgphiscl = rn_sss_avgphiscl
+               ztype_avglamscl = rn_sss_avglamscl
+               ztype_avgphiscl = rn_sss_avgphiscl
                ltype_fp_indegs = ln_sss_fp_indegs
                ltype_night     = .FALSE.
             ELSE
                n2dint_type     = nn_2dint_default
-               rtype_avglamscl = rn_default_avglamscl
-               rtype_avgphiscl = rn_default_avgphiscl
+               ztype_avglamscl = rn_default_avglamscl
+               ztype_avgphiscl = rn_default_avgphiscl
                ltype_fp_indegs = ln_default_fp_indegs
                ltype_night     = .FALSE.
@@ -665 +665 @@
             CALL obs_setinterpopts( nsurftypes, jtype, TRIM(cobstypessurf(jtype)), &
                &                    nn_2dint_default, n2dint_type,                 &
-               &                    rtype_avglamscl, rtype_avgphiscl,              &
+               &                    ztype_avglamscl, ztype_avgphiscl,              &
                &                    ltype_fp_indegs, ltype_night,                  &
                &                    n2dintsurf, ravglamscl, ravgphiscl,            &