Changeset 11455 for branches/UKMO/dev_r5518_obs_oper_update_addclim/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

Timestamp:

2019-08-19T17:36:23+02:00 (5 years ago)

Author:

mattmartin

Message:

Commit version which compiles and runs. Not fully tested that it is producing the correct answer yet though.

File:

• branches/UKMO/dev_r5518_obs_oper_update_addclim/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) (21 diffs)

branches/UKMO/dev_r5518_obs_oper_update_addclim/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

@@ -190 +190 @@
       REAL(KIND=wp), DIMENSION(1) :: zmsk
       REAL(KIND=wp), DIMENSION(:,:,:), ALLOCATABLE :: interp_corner
-
+      REAL(KIND=wp), DIMENSION(:,:,:), ALLOCATABLE :: interp_corner_clim
+      
       LOGICAL :: ld_dailyav
-      LOGICAL :: ld_clim
 
       !------------------------------------------------------------------------
@@ -200 +200 @@
       inrc = kt - kit000 + 2
       ipro = prodatqc%npstp(inrc)
-
-      ! Check if climatology is available and set flag
-      IF ( SUM( pclim(:,:,:) ) == 0. ) THEN
-         ld_clim = .FALSE.
-      ELSE
-         ld_clim = .TRUE.      
-      ENDIF
 
       ! Daily average types
@@ -273 +266 @@
          & )
 
-      IF ( ld_clim ) ALLOCATE( zclim(2,2,kpk,ipro) )
+      IF ( prodatqc%lclim ) ALLOCATE( zclim(2,2,kpk,ipro) )
 
       DO jobs = prodatqc%nprofup + 1, prodatqc%nprofup + ipro
@@ -299 +292 @@
       CALL obs_int_comm_3d( 2, 2, ipro, kpi, kpj, kpk, igrdi, igrdj, pgdepw, zgdepw ) 
 
-      IF ( ld_clim ) THEN
+      IF ( prodatqc%lclim ) THEN
          CALL obs_int_comm_3d( 2, 2, ipro, kpi, kpj, kpk, igrdi, igrdj, pclim, zclim )            
       ENDIF 
@@ -366 +359 @@
                   inum_obs = iend - ista + 1 
                   ALLOCATE(interp_corner(2,2,inum_obs),iv_indic(inum_obs)) 
-                  IF ( ld_clim ) ALLOCATE( interp_corner_clim(2,2,inum_obs) )
+                  IF ( prodatqc%lclim ) ALLOCATE( interp_corner_clim(2,2,inum_obs) )
                   
                   DO iin=1,2 
@@ -377 +370 @@
                               &     zmask(iin,ijn,:,iobs)) 
 
-                           IF ( ld_clim ) THEN
+                           IF ( prodatqc%lclim ) THEN
                               CALL obs_int_z1d_spl( kpk, & 
                                  &     zclim(iin,ijn,:,iobs), & 
@@ -398 +391 @@
                            &    zmask(iin,ijn,:,iobs)) 
 
-                        IF ( ld_clim ) THEN
+                        IF ( prodatqc%lclim ) THEN
                            CALL obs_int_z1d(kpk, iv_indic, k1dint, inum_obs, & 
                               &    prodatqc%var(kvar)%vdep(ista:iend), & 
@@ -422 +415 @@
                ALLOCATE( interp_corner(2,2,inum_obs),      &
                   &      iv_indic(inum_obs) ) 
-               IF ( ld_clim ) ALLOCATE( interp_corner_clim(2,2,inum_obs) )                  
+               IF ( prodatqc%lclim ) ALLOCATE( interp_corner_clim(2,2,inum_obs) )                  
                DO iin=1,2  
                   DO ijn=1,2 
@@ -432 +425 @@
                            &    zmask(iin,ijn,:,iobs)) 
 
-                        IF ( ld_clim ) THEN
+                        IF ( prodatqc%lclim ) THEN
                            CALL obs_int_z1d_spl( kpk, & 
                               &    zclim(iin,ijn,:,iobs),& 
@@ -453 +446 @@
                          &          zmask(iin,ijn,:,iobs) )      
 
-                     IF ( ld_clim ) THEN
+                     IF ( prodatqc%lclim ) THEN
                         CALL obs_int_z1d(kpk, iv_indic, k1dint, inum_obs,     & 
                             &          prodatqc%var(kvar)%vdep(ista:iend),     & 
@@ -504 +497 @@
                   &              prodatqc%var(kvar)%vmod(iend:iend) ) 
 
-               IF ( ld_clim ) THEN
+               IF ( prodatqc%lclim ) THEN
                   CALL obs_int_h2d( 1, 1, zweig, interp_corner_clim(:,:,ikn), & 
                      &              prodatqc%var(kvar)%vclm(iend:iend) )
@@ -516 +509 @@
  
             DEALLOCATE(interp_corner,iv_indic) 
-            IF ( ld_clim ) DEALLOCATE( interp_corner_clim )         
+            IF ( prodatqc%lclim ) DEALLOCATE( interp_corner_clim )         
              
          ENDIF
@@ -534 +527 @@
          & )
 
-      IF ( ld_clim ) DEALLOCATE( zclim )
+      IF ( prodatqc%lclim ) DEALLOCATE( zclim )
       
       ! At the end of the day also get interpolated means
@@ -650 +643 @@
          & zmeanday    ! to compute model sst in region of 24h daylight (pole)
          
-      LOGICAL :: ld_clim ! T => climatological data is available
       !------------------------------------------------------------------------
       ! Local initialization 
@@ -657 +649 @@
       inrc = kt - kit000 + 2
       isurf = surfdataqc%nsstp(inrc)
-      
-      ! Check if climatological information is available
-      IF ( SUM(pclim(:,:)) == 0._wp ) THEN
-        ld_clim = .FALSE.
-      ELSE
-        ld_clim = .TRUE.      
-      ENDIF
 
       ! Work out the maximum footprint size for the 
@@ -750 +735 @@
          & )
 
-      IF ( ld_clim ) ALLOCATE( zclim(imaxifp,imaxjfp,isurf) )
+      IF ( surfdataqc%lclim ) ALLOCATE( zclim(imaxifp,imaxjfp,isurf) )
 
       DO jobs = surfdataqc%nsurfup + 1, surfdataqc%nsurfup + isurf
@@ -793 +778 @@
          &                  igrdip1, igrdjp1, gphif, zgphif )
 
-      IF ( ld_clim ) THEN 
+      IF ( surfdataqc%lclim ) THEN 
          CALL obs_int_comm_2d( imaxifp, imaxjfp, isurf, kpi, kpj, &
             &                  igrdi, igrdj, pclim, zclim )
@@ -853 +838 @@
             CALL obs_int_h2d( 1, 1, zweig, zsurftmp(:,:,iobs), zext )
 
-            IF ( ld_clim ) THEN  
+            IF ( surfdataqc%lclim ) THEN  
                CALL obs_int_h2d( 1, 1, zweig, zclim(:,:,iobs), zclm )
+               IF (lwp) THEN
+                  WRITE(numout,*)'zclim: ', iobs, zclim(:,:,iobs), zclm
+               ENDIF
             ENDIF
 
@@ -871 +859 @@
                &              zweig, zsurftmp(:,:,iobs),  zext )
 
-            IF ( ld_clim ) THEN  
+            IF ( surfdataqc%lclim ) THEN  
                CALL obs_avg_h2d( 1, 1, imaxifp, imaxjfp, &
                   &              zweig, zsurftmp(:,:,iobs),  zclm )
@@ -886 +874 @@
          ENDIF
          
-         IF ( ld_clim ) surfdataqc%rclm(jobs,1) = zclm(1)
+         IF ( surfdataqc%lclim ) surfdataqc%rclm(jobs,1) = zclm(1)
          
          IF ( zext(1) == obfillflt ) THEN
@@ -911 +899 @@
          & )
 
-      IF ( ld_clim ) DEALLOCATE( zclim )
+      IF ( surfdataqc%lclim ) DEALLOCATE( zclim )
 
       ! At the end of the day also deallocate night-time mean array