Changeset 11259 for branches/UKMO/dev_r5518_obs_oper_update_kd490/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2019-07-11T18:29:19+02:00 (5 years ago)

Author:

dford

Message:

Check variable names are as expected.

File:

• branches/UKMO/dev_r5518_obs_oper_update_kd490/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (12 diffs)

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

@@ -230 +230 @@
          & clproffiles, &        ! Profile filenames
          & clsurffiles           ! Surface filenames
+      CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvars  ! Expected variable names
 
       LOGICAL, DIMENSION(:), ALLOCATABLE :: llvar   ! Logical for profile variable read
@@ -730 +731 @@
                nextrprof(jtype) = 1
                ALLOCATE(llvar(nvarsprof(jtype)))
+               ALLOCATE(clvars(nvarsprof(jtype)))
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zglam )
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zgphi )
@@ -735 +737 @@
                llvar(1)       = ln_t3d
                llvar(2)       = ln_s3d
+               clvars(1)      = 'POTM'
+               clvars(2)      = 'PSAL'
                zglam(:,:,1)   = glamt(:,:)
                zglam(:,:,2)   = glamt(:,:)
@@ -745 +749 @@
                nextrprof(jtype) = 2
                ALLOCATE(llvar(nvarsprof(jtype)))
+               ALLOCATE(clvars(nvarsprof(jtype)))
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zglam )
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zgphi )
@@ -750 +755 @@
                llvar(1)       = ln_vel3d
                llvar(2)       = ln_vel3d
+               clvars(1)      = 'UVEL'
+               clvars(2)      = 'VVEL'
                zglam(:,:,1)   = glamu(:,:)
                zglam(:,:,2)   = glamv(:,:)
@@ -760 +767 @@
                nextrprof(jtype) = 0
                ALLOCATE(llvar(nvarsprof(jtype)))
+               ALLOCATE(clvars(nvarsprof(jtype)))
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zglam )
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zgphi )
@@ -767 +775 @@
                zgphi(:,:,1)   = gphit(:,:)
                zmask(:,:,:,1) = tmask(:,:,:)
+               IF ( TRIM(cobstypesprof(jtype)) == 'plchltot' )  THEN
+                  clvars(1) = 'PLCHLTOT'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'pchltot' )  THEN
+                  clvars(1) = 'PCHLTOT'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'pno3' )  THEN
+                  clvars(1) = 'PNO3'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'psi4' )  THEN
+                  clvars(1) = 'PSI4'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'ppo4' )  THEN
+                  clvars(1) = 'PPO4'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'pdic' )  THEN
+                  clvars(1) = 'PDIC'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'palk' )  THEN
+                  clvars(1) = 'PALK'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'pph' )  THEN
+                  clvars(1) = 'PPH'
+               ELSE IF ( TRIM(cobstypesprof(jtype)) == 'po2' )  THEN
+                  clvars(1) = 'PO2'
+               ENDIF
             ENDIF
 
@@ -774 +801 @@
                &               nvarsprof(jtype), nextrprof(jtype), nitend-nit000+2, &
                &               rn_dobsini, rn_dobsend, llvar, &
-               &               ln_ignmis, ln_s_at_t, .FALSE., &
+               &               ln_ignmis, ln_s_at_t, .FALSE., clvars, &
                &               kdailyavtypes = nn_profdavtypes )
 
@@ -788 +815 @@
                &               kdailyavtypes = nn_profdavtypes )
             
-            DEALLOCATE( llvar )
+            DEALLOCATE( llvar, clvars )
             CALL wrk_dealloc( jpi, jpj,      nvarsprof(jtype), zglam )
             CALL wrk_dealloc( jpi, jpj,      nvarsprof(jtype), zgphi )
@@ -808 +835 @@
          DO jtype = 1, nsurftypes
 
-            nvarssurf(jtype) = 1
-            nextrsurf(jtype) = 0
-            IF ( TRIM(cobstypessurf(jtype)) == 'sla' ) nextrsurf(jtype) = 2
+            IF ( TRIM(cobstypessurf(jtype)) == 'sla' )
+               nvarssurf(jtype) = 1
+               nextrsurf(jtype) = 2
+            ELSE
+               nvarssurf(jtype) = 1
+               nextrsurf(jtype) = 0
+            ENDIF
+            
+            ALLOCATE( clvars( nvarssurf(jtype) ) )
+
+            IF ( TRIM(cobstypessurf(jtype)) == 'sla' ) THEN
+               clvars(1) = 'SLA'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'sst' ) THEN
+               clvars(1) = 'SST'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'sic' ) THEN
+               clvars(1) = 'ICECONC'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'sss' ) THEN
+               clvars(1) = 'SSS'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchltot' ) THEN
+               clvars(1) = 'SLCHLTOT'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchldia' ) THEN
+               clvars(1) = 'SLCHLDIA'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchlnon' ) THEN
+               clvars(1) = 'SLCHLNON'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchldin' ) THEN
+               clvars(1) = 'SLCHLDIN'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchlmic' ) THEN
+               clvars(1) = 'SLCHLMIC'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchlnan' ) THEN
+               clvars(1) = 'SLCHLNAN'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slchlpic' ) THEN
+               clvars(1) = 'SLCHLPIC'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'schltot' ) THEN
+               clvars(1) = 'SCHLTOT'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slphytot' ) THEN
+               clvars(1) = 'SLPHYTOT'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slphydia' ) THEN
+               clvars(1) = 'SLPHYDIA'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'slphynon' ) THEN
+               clvars(1) = 'SLPHYNON'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'sspm' ) THEN
+               clvars(1) = 'SSPM'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'skd490' ) THEN
+               clvars(1) = 'SKD490'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'sfco2' ) THEN
+               clvars(1) = 'SFCO2'
+            ELSE IF ( TRIM(cobstypessurf(jtype)) == 'spco2' ) THEN
+               clvars(1) = 'SPCO2'
+            ENDIF
 
             !Read in surface obs types
@@ -816 +889 @@
                &               clsurffiles(jtype,1:ifilessurf(jtype)), &
                &               nvarssurf(jtype), nextrsurf(jtype), nitend-nit000+2, &
-               &               rn_dobsini, rn_dobsend, ln_ignmis, .FALSE., llnightav(jtype) )
+               &               rn_dobsini, rn_dobsend, ln_ignmis, .FALSE., llnightav(jtype), &
+               &               clvars )
 
             CALL obs_pre_surf( surfdata(jtype), surfdataqc(jtype), ln_nea, ln_bound_reject )
@@ -840 +914 @@
 
             ENDIF
+            
+            DEALLOCATE( clvars )
 
          END DO