Changeset 11455 for branches/UKMO/dev_r5518_obs_oper_update_addclim/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.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/diaobs.F90 (modified) (12 diffs)

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

@@ -50 +50 @@
    LOGICAL :: ln_diaobs            !: Logical switch for the obs operator
    LOGICAL :: ln_sstnight          !: Logical switch for night mean SST obs
-   LOGICAL :: ln_output_clim       !: Logical switch for interpolating and outputting T/S climatology
    LOGICAL :: ln_default_fp_indegs !: T=> Default obs footprint size specified in degrees, F=> in metres
    LOGICAL :: ln_sla_fp_indegs     !: T=>     SLA obs footprint size specified in degrees, F=> in metres
@@ -56 +55 @@
    LOGICAL :: ln_sss_fp_indegs     !: T=>     SSS obs footprint size specified in degrees, F=> in metres
    LOGICAL :: ln_sic_fp_indegs     !: T=> sea-ice obs footprint size specified in degrees, F=> in metres
+   LOGICAL :: ln_output_clim       !: Logical switch for interpolating and writing T/S climatology
 
    REAL(wp) :: rn_default_avglamscl !: Default E/W diameter of observation footprint
@@ -235 +235 @@
       LOGICAL :: ltype_fp_indegs ! Local version of ln_*_fp_indegs
       LOGICAL :: ltype_night     ! Local version of ln_sstnight (false for other variables)
+      LOGICAL :: ltype_clim      ! Local version of ln_output_clim
 
       REAL(wp), POINTER, DIMENSION(:,:,:) :: &
@@ -728 +729 @@
 
          DO jtype = 1, nproftypes
-
+            
+            ltype_clim = .FALSE. 
+            
             IF ( TRIM(cobstypesprof(jtype)) == 'prof' ) THEN
                nvarsprof(jtype) = 2
                nextrprof(jtype) = 1
+               IF ( ln_output_clim ) ltype_clim = .TRUE.              
                ALLOCATE(llvar(nvarsprof(jtype)))
                CALL wrk_alloc( jpi, jpj,      nvarsprof(jtype), zglam )
@@ -777 +781 @@
                &               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., ltype_clim, &
                &               kdailyavtypes = nn_profdavtypes )
 
@@ -813 +817 @@
             nvarssurf(jtype) = 1
             nextrsurf(jtype) = 0
+            ltype_clim = .FALSE.
             IF ( TRIM(cobstypessurf(jtype)) == 'sla' ) nextrsurf(jtype) = 2
+            IF ( ln_output_clim .AND. &
+               & ( ( TRIM(cobstypessurf(jtype)) == 'sst' ) .OR. &
+               &   ( TRIM(cobstypessurf(jtype)) == 'sss' ) ) ) &
+               & ltype_clim = .TRUE.
 
             !Read in surface obs types
@@ -819 +828 @@
                &               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), ltype_clim )
 
             CALL obs_pre_surf( surfdata(jtype), surfdataqc(jtype), ln_nea, ln_bound_reject )
@@ -928 +938 @@
          & jp_spm
 #endif
+      USE tradmp, ONLY: &
+         & tclim, &
+         & sclim
 
       IMPLICIT NONE
@@ -956 +969 @@
          & pco2_3d                 ! 3D pCO2 from FABM
 #endif
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::  zts_dta 
       
       IF(lwp) THEN
@@ -966 +978 @@
 
       idaystp = NINT( rday / rdt )
-
-      ! Get the climatological T & S fields on this time step
-      IF ( ln_output_clim ) CALL dta_tsd( kstp, zts_dta )
 
       !-----------------------------------------------------------------------
@@ -998 +1007 @@
                zprofvar(:,:,:,1) = tsn(:,:,:,jp_tem)
                zprofvar(:,:,:,2) = tsn(:,:,:,jp_sal)
-               IF ( ln_output_clim ) THEN               
-                  zprofclim(:,:,:,1) = zts_dta(:,:,:,jp_tem)
-                  zprofclim(:,:,:,2) = zts_dta(:,:,:,jp_sal)
+               IF ( ln_output_clim ) THEN          
+                  zprofclim(:,:,:,1) = tclim(:,:,:)
+                  zprofclim(:,:,:,2) = sclim(:,:,:)
                ENDIF
                
@@ -1219 +1228 @@
             CASE('sst')
                zsurfvar(:,:) = tsn(:,:,1,jp_tem)
-               IF ( ln_output_clim ) zsurfclim(:,:) = zts_dta(:,:,1,jp_tem)
+               IF ( ln_output_clim ) zsurfclim(:,:) = tclim(:,:,1)
             CASE('sla')
                zsurfvar(:,:)  = sshn(:,:)
             CASE('sss')
                zsurfvar(:,:) = tsn(:,:,1,jp_sal)
-               IF ( ln_output_clim ) zsurfclim(:,:) = zts_dta(:,:,1,jp_sal)               
+               IF ( ln_output_clim ) zsurfclim(:,:) = sclim(:,:,1)              
             CASE('sic')
                IF ( kstp == 0 ) THEN