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

Timestamp:

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

Author:

dford

Message:

Updates following review.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/diaobs.F90 (modified) (5 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