Changeset 9202 for branches/UKMO/dev_r5518_obs_oper_update_bgc3d/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2018-01-09T19:12:50+01:00 (6 years ago)

Author:

dford

Message:

Modify obs_rea_prof to loop over an arbitrary number of variables.

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

@@ -223 +223 @@
          & clsurffiles           ! Surface filenames
 
-      LOGICAL :: llvar1          ! Logical for profile variable 1
-      LOGICAL :: llvar2          ! Logical for profile variable 1
+      LOGICAL, DIMENSION(:), ALLOCATABLE :: llvar   ! Logical for profile variable read
       LOGICAL :: ltype_fp_indegs ! Local version of ln_*_fp_indegs
       LOGICAL :: ltype_night     ! Local version of ln_sstnight (false for other variables)
@@ -699 +698 @@
                nvarsprof(jtype) = 2
                nextrprof(jtype) = 1
-               llvar1 = ln_t3d
-               llvar2 = ln_s3d
+               ALLOCATE(llvar(nvarsprof(jtype)))
+               llvar(1) = ln_t3d
+               llvar(2) = ln_s3d
                zglam1 = glamt
                zgphi1 = gphit
@@ -710 +710 @@
                nvarsprof(jtype) = 2
                nextrprof(jtype) = 2
-               llvar1 = ln_vel3d
-               llvar2 = ln_vel3d
+               ALLOCATE(llvar(nvarsprof(jtype)))
+               llvar(1) = ln_vel3d
+               llvar(2) = ln_vel3d
                zglam1 = glamu
                zgphi1 = gphiu
@@ -721 +722 @@
                nvarsprof(jtype) = 1
                nextrprof(jtype) = 0
-               llvar1 = .TRUE.
-               llvar2 = .FALSE.
+               ALLOCATE(llvar(nvarsprof(jtype)))
+               llvar(1) = .TRUE.
                zglam1 = glamt
                zgphi1 = gphit
@@ -735 +736 @@
                &               clproffiles(jtype,1:ifilesprof(jtype)), &
                &               nvarsprof(jtype), nextrprof(jtype), nitend-nit000+2, &
-               &               rn_dobsini, rn_dobsend, llvar1, llvar2, &
+               &               rn_dobsini, rn_dobsend, llvar, &
                &               ln_ignmis, ln_s_at_t, .FALSE., &
                &               kdailyavtypes = nn_profdavtypes )
@@ -744 +745 @@
 
             CALL obs_pre_prof( profdata(jtype), profdataqc(jtype), &
-               &               llvar1, llvar2, &
+               &               llvar(1), llvar(2), &
                &               jpi, jpj, jpk, &
                &               zmask1, zglam1, zgphi1, zmask2, zglam2, zgphi2,  &
                &               ln_nea, ln_bound_reject, &
                &               kdailyavtypes = nn_profdavtypes )
+            
+            ! Is allocating and deallocating repeatedly in a loop good practice?
+            DEALLOCATE(llvar)
 
          END DO