Changeset 15497

Timestamp:

2021-11-11T14:12:05+01:00 (2 years ago)

Author:

dford

Message:

Updates following review.

Location:

NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS

Files:

• diaobs.F90 (modified) (5 diffs)
• obs_group_def.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/diaobs.F90

@@ -170 +170 @@
       jenabled = 0
       DO jgroup = 1, nn_obsgroups
-         CALL obs_group_read ( sobsgroups(jgroup) )
+         CALL obs_group_read_namelist( sobsgroups(jgroup) )
          CALL obs_group_check( sobsgroups(jgroup), jgroup )
          IF (sobsgroups(jgroup)%lenabled) THEN
             jenabled = jenabled + 1
-            IF( sobsgroups(jgroup)%lvel  .AND.  .NOT.ln_grid_global ) THEN
-               CALL ctl_stop( 'Velocity data only works with ln_grid_global=.true.' )
-            ENDIF
          ENDIF
       END DO
@@ -187 +184 @@
       ENDIF
 
-
       !-----------------------------------------------------------------------
       ! Obs operator parameter checking and initialisations
@@ -202 +198 @@
       !
       DO jgroup = 1, nn_obsgroups
-         IF (sobsgroups(jgroup)%lenabled) THEN
-            IF (sobsgroups(jgroup)%lprof) THEN
+         IF ( sobsgroups(jgroup)%lenabled ) THEN
+            IF ( sobsgroups(jgroup)%lprof ) THEN
                !
                ! Read in profile or profile obs types
@@ -328 +324 @@
                      &              sobsgroups(jgroup)%rmdtcutoff )
                   IF( sobsgroups(jgroup)%laltbias ) THEN
-                     !CALL obs_rea_altbias( sobsgroups(jgroup)%ssurfdataqc, &
-                     !   &                  sobsgroups(jgroup)%n2dint,      &
-                     !   &                  sobsgroups(jgroup)%caltbiasfile )
                      CALL obs_app_bias( sobsgroups(jgroup)%ssurfdataqc,   &
                         &               sobsgroups(jgroup)%next_mdt,      & 
@@ -439 +432 @@
 
       DO jgroup = 1, nn_obsgroups
-         IF (sobsgroups(jgroup)%lenabled) THEN
-
-            IF (sobsgroups(jgroup)%lprof) THEN
+         IF ( sobsgroups(jgroup)%lenabled ) THEN
+
+            IF ( sobsgroups(jgroup)%lprof ) THEN
 
                zprofclim(:,:,:) = fbrmdi

NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_group_def.F90

@@ -2 +2 @@
    !!=====================================================================
    !!                       ***  MODULE obs_group_def  ***
-   !! Observation diagnostics: Routines specific to model variables
+   !! Observation diagnostics: Routines specific to observation groups
    !!=====================================================================
    !! History : 4.0  !  2021-06  (D Ford)  Original code
    !!----------------------------------------------------------------------
-   !!   obs_group_alloc   : allocate observation group types
-   !!   obs_group_dealloc : deallocate observation group types
-   !!   obs_group_check   : check observation group options
+   !!   obs_group_alloc         : allocate observation group types
+   !!   obs_group_dealloc       : deallocate observation group types
+   !!   obs_group_read_namelist : read observation group namelists
+   !!   obs_group_check         : check observation group options
    !!----------------------------------------------------------------------
 
@@ -19 +20 @@
    USE tradmp, ONLY : &   ! Damping to climatology
       & ln_tradmp
+   USE obs_grid, ONLY : & ! Use global distribution of observations
+      & ln_grid_global
 
    IMPLICIT NONE
@@ -26 +29 @@
 
    PUBLIC &
-      & obs_group,         &
-      & obs_group_alloc,   &
-      & obs_group_dealloc, &
-      & obs_group_read,    &
+      & obs_group,               &
+      & obs_group_alloc,         &
+      & obs_group_dealloc,       &
+      & obs_group_read_namelist, &
       & obs_group_check
 
@@ -165 +168 @@
 
 
-   SUBROUTINE obs_group_read( sdobsgroup )
-      !!----------------------------------------------------------------------
-      !!                     ***  ROUTINE obs_group_read  ***
+   SUBROUTINE obs_group_read_namelist( sdobsgroup )
+      !!----------------------------------------------------------------------
+      !!                     ***  ROUTINE obs_group_read_namelist  ***
       !!
       !! ** Purpose : - Read namelist for observation group types
@@ -388 +391 @@
       ENDIF
 
-   END SUBROUTINE obs_group_read
+   END SUBROUTINE obs_group_read_namelist
 
 
@@ -504 +507 @@
                   CALL ctl_stop( ' No altimeter bias file specified' )
                ENDIF
-            ENDIF   
+            ENDIF
+
+            IF( sdobsgroup%lvel .AND. (.NOT. ln_grid_global) ) THEN
+               CALL ctl_stop( ' Velocity data only works with ln_grid_global=.true.' )
+            ENDIF
 
          ENDIF