Changeset 15764 for branches/UKMO/r6232_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90

Timestamp:

2022-03-21T13:12:29+01:00 (2 years ago)

Author:

jcastill

Message:

Update with the latest changes in branches/UKMO/dev_r5518_obs_oper_update@15400

File:

• branches/UKMO/r6232_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) (8 diffs)

branches/UKMO/r6232_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90

@@ -46 +46 @@
       &                     kvars, kextr, kstp, ddobsini, ddobsend, &
       &                     ldvar, ldignmis, ldsatt, &
-      &                     ldmod, kdailyavtypes )
+      &                     ldmod, ldclim, cdvars, kdailyavtypes )
       !!---------------------------------------------------------------------
       !!
@@ -78 +78 @@
       LOGICAL, INTENT(IN) :: ldsatt     ! Compute salinity at all temperature points
       LOGICAL, INTENT(IN) :: ldmod      ! Initialize model from input data
+      LOGICAL, INTENT(IN) :: ldclim     ! Set flag to show climatology will be output
       REAL(dp), INTENT(IN) :: ddobsini  ! Obs. ini time in YYYYMMDD.HHMMSS
       REAL(dp), INTENT(IN) :: ddobsend  ! Obs. end time in YYYYMMDD.HHMMSS
+      CHARACTER(len=8), DIMENSION(kvars), INTENT(IN) :: cdvars
       INTEGER, DIMENSION(imaxavtypes), OPTIONAL :: &
          & kdailyavtypes                ! Types of daily average observations
@@ -86 +88 @@
       CHARACTER(LEN=15), PARAMETER :: cpname='obs_rea_prof'
       CHARACTER(len=8) :: clrefdate
-      CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvars
+      CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvarsin
       INTEGER :: jvar
       INTEGER :: ji
@@ -220 +222 @@
             ENDIF
 
-            IF ( jj == 1 ) THEN
-               ALLOCATE( clvars( inpfiles(jj)%nvar ) )
-               DO ji = 1, inpfiles(jj)%nvar
-                 clvars(ji) = inpfiles(jj)%cname(ji)
-               END DO
+            IF ( jj == 1 ) THEN 
+               ALLOCATE( clvarsin( inpfiles(jj)%nvar ) ) 
+               DO ji = 1, inpfiles(jj)%nvar 
+                 clvarsin(ji) = inpfiles(jj)%cname(ji) 
+                 IF ( clvarsin(ji) /= cdvars(ji) ) THEN 
+                    CALL ctl_stop( 'Feedback file variables do not match', & 
+                        &           ' expected variable names for this type' ) 
+                 ENDIF 
+               END DO 
             ELSE
-               DO ji = 1, inpfiles(jj)%nvar
-                  IF ( inpfiles(jj)%cname(ji) /= clvars(ji) ) THEN
-                     CALL ctl_stop( 'Feedback file variables not consistent', &
-                        &           ' with previous files for this type' )
-                  ENDIF
-               END DO
+               DO ji = 1, inpfiles(jj)%nvar 
+                  IF ( inpfiles(jj)%cname(ji) /= clvarsin(ji) ) THEN 
+                     CALL ctl_stop( 'Feedback file variables not consistent', & 
+                        &           ' with previous files for this type' ) 
+                  ENDIF 
+               END DO 
             ENDIF
 
@@ -500 +506 @@
       ENDIF
       CALL obs_prof_alloc( profdata, kvars, kextr, iprof, iv3dt, &
-         &                 kstp, jpi, jpj, jpk )
+         &                 kstp, jpi, jpj, jpk, ldclim )
 
       ! * Read obs/positions, QC, all variable and assign to profdata
@@ -506 +512 @@
       profdata%nprof     = 0
       profdata%nvprot(:) = 0
-      profdata%cvars(:)  = clvars(:)
+      profdata%cvars(:)  = clvarsin(:)
       iprof = 0
 
@@ -696 +702 @@
                               profdata%var(jvar)%vmod(ivart(jvar)) = &
                                  &                inpfiles(jj)%padd(ij,ji,1,jvar)
+                           ENDIF
+                           IF ( profdata%lclim ) THEN 
+                              profdata%var(jvar)%vclm(ivart(jvar)) = fbrmdi 
                            ENDIF
                            ! Count number of profile var1 data as function of type
@@ -805 +814 @@
       ! Deallocate temporary data
       !-----------------------------------------------------------------------
-      DEALLOCATE( ifileidx, iprofidx, zdat, clvars )
+      DEALLOCATE( ifileidx, iprofidx, zdat, clvarsin )
 
       !-----------------------------------------------------------------------