Changeset 5963 for branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2015-12-01T16:06:40+01:00 (8 years ago)

Author:

timgraham

Message:

Merged branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP into branch

File:

• branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (6 diffs)

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -118 +118 @@
    !!----------------------------------------------------------------------
 
+   !! * Substitutions 
+#  include "domzgr_substitute.h90"
 CONTAINS
 
@@ -207 +209 @@
       ! Read namelist parameters
       !-----------------------------------------------------------------------
-
+      
+      !Initalise all values in namelist arrays
       enactfiles(:) = ''
       coriofiles(:) = ''
@@ -232 +235 @@
       ln_velfb_av(:) = .FALSE.
       ln_ignmis = .FALSE.
-      
+
       CALL ini_date( dobsini )
       CALL fin_date( dobsend )
@@ -991 +994 @@
       !!        !  07-04  (G. Smith) Generalized surface operators
       !!        !  08-10  (M. Valdivieso) obs operator for velocity profiles
+      !!        !  14-08  (J. While) observation operator for profiles in 
+      !!                             generalised vertical coordinates
       !!----------------------------------------------------------------------
       !! * Modules used
@@ -996 +1001 @@
          & rdt,           &                       
          & gdept_1d,       &             
+#if defined key_vvl 
+         & gdept_n,       &
+#else 
+         & gdept_1d,      &
+#endif                                        
          & tmask, umask, vmask                            
       USE phycst, ONLY : &              ! Physical constants
@@ -1053 +1063 @@
       IF ( ln_t3d .OR. ln_s3d ) THEN
          DO jprofset = 1, nprofsets
-            IF ( ld_enact(jprofset) ) THEN
-               CALL obs_pro_opt( prodatqc(jprofset),                     &
-                  &              kstp, jpi, jpj, jpk, nit000, idaystp,   &
-                  &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   &
-                  &              gdept_1d, tmask, n1dint, n2dint,        &
-                  &              kdailyavtypes = endailyavtypes )
+            IF( ln_zco .OR. ln_zps ) THEN 
+               IF ( ld_enact(jprofset) ) THEN 
+                  CALL obs_pro_opt( prodatqc(jprofset),                     & 
+                     &              kstp, jpi, jpj, jpk, nit000, idaystp,   & 
+                     &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   & 
+                     &              gdept_1d, tmask, n1dint, n2dint,        & 
+                     &              kdailyavtypes = endailyavtypes ) 
+               ELSE 
+                  CALL obs_pro_opt( prodatqc(jprofset),                     & 
+                     &              kstp, jpi, jpj, jpk, nit000, idaystp,   & 
+                     &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   & 
+                     &              gdept_1d, tmask, n1dint, n2dint               ) 
+               ENDIF 
             ELSE
-               CALL obs_pro_opt( prodatqc(jprofset),                     &
-                  &              kstp, jpi, jpj, jpk, nit000, idaystp,   &
-                  &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   &
-                  &              gdept_1d, tmask, n1dint, n2dint              )
+               IF ( ld_enact(jprofset) ) THEN 
+                  CALL obs_pro_sco_opt( prodatqc(jprofset),                 & 
+                     &              kstp, jpi, jpj, jpk, nit000, idaystp,   & 
+                     &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   & 
+                     &              fsdept(:,:,:), tmask, n1dint, n2dint,   & 
+                     &              kdailyavtypes = endailyavtypes ) 
+               ELSE 
+                  CALL obs_pro_sco_opt( prodatqc(jprofset),                 & 
+                     &              kstp, jpi, jpj, jpk, nit000, idaystp,   & 
+                     &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   & 
+                     &              fsdept(:,:,:), tmask, n1dint, n2dint ) 
+               ENDIF 
             ENDIF
          END DO