Changeset 11460

Timestamp:

2019-08-20T11:41:01+02:00 (5 years ago)

Author:

mattmartin

Message:

Minor changes.

Location:

branches/UKMO/dev_r5518_obs_oper_update_addclim/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• diaobs.F90 (modified) (4 diffs)
• obs_oper.F90 (modified) (2 diffs)
• obs_readmdt.F90 (modified) (2 diffs)
• obs_write.F90 (modified) (2 diffs)

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

@@ -33 +33 @@
    USE mpp_map                  ! MPP mapping
    USE lib_mpp                  ! For ctl_warn/stop
-   USE dtatsd                   ! For climatological temperature & salinity
-   USE tradmp                   ! ""
+   USE tradmp                   ! For climatological temperature & salinity
 
    IMPLICIT NONE
@@ -420 +419 @@
          WRITE(numout,*) '             Daily average types                             nn_profdavtypes = ', nn_profdavtypes
          WRITE(numout,*) '             Logical switch for night-time SST obs               ln_sstnight = ', ln_sstnight
-         WRITE(numout,*) '             Logical switch for writing climat. at ob locs    ln_output_clim = ', ln_output_clim
+         WRITE(numout,*) '             Logical switch for writing climat. at obs points ln_output_clim = ', ln_output_clim
       ENDIF
       !-----------------------------------------------------------------------
@@ -938 +937 @@
          & jp_spm
 #endif
-      USE tradmp, ONLY: &
-         & tclim, &
-         & sclim
 
       IMPLICIT NONE
@@ -1230 +1226 @@
                IF ( ln_output_clim ) zsurfclim(:,:) = tclim(:,:,1)
             CASE('sla')
-               zsurfvar(:,:)  = sshn(:,:)
+               zsurfvar(:,:) = sshn(:,:)
             CASE('sss')
                zsurfvar(:,:) = tsn(:,:,1,jp_sal)

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

@@ -413 +413 @@
                iend = prodatqc%npvend(jobs,kvar) 
                inum_obs = iend - ista + 1 
-               ALLOCATE( interp_corner(2,2,inum_obs),      &
-                  &      iv_indic(inum_obs) ) 
+               ALLOCATE(interp_corner(2,2,inum_obs), iv_indic(inum_obs)) 
                IF ( prodatqc%lclim ) ALLOCATE( interp_corner_clim(2,2,inum_obs) )                  
                DO iin=1,2  
@@ -858 +857 @@
             IF ( surfdataqc%lclim ) THEN  
                CALL obs_avg_h2d( 1, 1, imaxifp, imaxjfp, &
-                  &              zweig, zsurftmp(:,:,iobs),  zclm )
+                  &              zweig, zclim(:,:,iobs),  zclm )
             ENDIF
 

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

@@ -37 +37 @@
    REAL(wp), PUBLIC :: rn_mdtcorr   = 1.61_wp  ! User specified MDT correction
    REAL(wp), PUBLIC :: rn_mdtcutoff = 65.0_wp  ! MDT cutoff for computed correction
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::  mdt_fld    !: Mean Dynamic Topography on the model grid
    
    !!----------------------------------------------------------------------
@@ -93 +92 @@
       CALL iom_get ( nummdt, jpdom_data, 'sossheig', z_mdt(:,:), 1 )
       CALL iom_close(nummdt)                 ! Close the file
-      
-      ! Set the MDT gridded field to be the one read in directly with no adjustments
-      ALLOCATE( mdt_fld(jpi,jpj) )
-      mdt_fld(:,:) = z_mdt(:,:)
-      
+           
       ! Read in the fill value
       zinfill = 0.0

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

@@ -100 +100 @@
 
 
-      ! Set up number of additional variables to be ouput:
-      ! Hx, CLIM, ...
       iadd_clm = 0 
       IF ( profdata%lclim ) iadd_clm = 1
@@ -137 +135 @@
          fbdata%cobunit(1)    = 'Degrees centigrade'
          fbdata%cobunit(2)    = 'PSU'
-         
          fbdata%cextname(1)   = 'TEMP'
          fbdata%cextlong(1)   = 'Insitu temperature'
          fbdata%cextunit(1)   = 'Degrees centigrade'
-         
          fbdata%caddlong(1,1) = 'Model interpolated potential temperature'
          fbdata%caddlong(1,2) = 'Model interpolated practical salinity'