Changeset 11456 for branches/UKMO

Timestamp:

2019-08-19T18:27:52+02:00 (5 years ago)

Author:

mattmartin

Message:

First wrking version which produces correct seeming results.

Location:

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

Files:

• obs_oper.F90 (modified) (1 diff)
• obs_read_prof.F90 (modified) (1 diff)
• obs_read_surf.F90 (modified) (1 diff)

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

@@ -840 +840 @@
             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
 

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

@@ -698 +698 @@
                                  &                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
                            itypvar( profdata%ntyp(iprof) + 1, jvar ) = &

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

@@ -463 +463 @@
                   IF ( TRIM(surfdata%cvars(1)) == 'SLA' ) surfdata%rext(iobs,:) = fbrmdi
                ENDIF
-
+               
+               ! Initialise climatology if set
+               IF ( surfdata%lclim ) surfdata%rclm(iobs,1) = fbrmdi
+               
                ! STD (obs error standard deviation) read from file and passed through obs operator
                IF ( iadd_std(jj) /= -1 ) THEN