Changeset 11925 for NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src

Timestamp:

2019-11-18T15:49:54+01:00 (4 years ago)

Author:

smueller

Message:

Extension of the test for the existence of a regression-analysis configuration in the IOM context setup for multiple-linear-regression analysis (ticket #2175)

File:

• NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/DIA/diamlr.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/DIA/diamlr.F90

@@ -57 +57 @@
 
       TYPE(xios_fieldgroup)  ::   slxhdl_fldgrp
+      TYPE(xios_filegroup)   ::   slxhdl_filgrp
 
       IF(lwp) THEN
@@ -64 +65 @@
       END IF
 
-      ! Get handle to multiple-linear-regression analysis configuration; if no
+      ! Get handles to multiple-linear-regression analysis configuration (field
+      ! group 'diamrl_fields' and file group 'diamlr_files'); if no suitable
       ! configuration is found, disable diamlr
-      IF ( lk_diamlr .AND. xios_is_valid_fieldgroup( "diamlr_fields" ) .AND. xios_is_valid_field( "diamlr_time" ) ) THEN
+      IF ( lk_diamlr .AND. xios_is_valid_fieldgroup( "diamlr_fields" ) .AND. xios_is_valid_field( "diamlr_time" ) .AND.   &
+         & xios_is_valid_filegroup( "diamlr_files" ) ) THEN
          CALL xios_get_handle("diamlr_fields",  slxhdl_fldgrp)
+         CALL xios_get_handle("diamlr_files",   slxhdl_filgrp)
       ELSE
          IF (lwp) THEN
-            WRITE(numout, *) "diamlr: no configuration found (field group 'diamlr_fields' is missing);"
+            WRITE(numout, *) "diamlr: configuration not found or icomplete (field group 'diamlr_fields'"
+            WRITE(numout, *) "        and/or file group 'diamlr_files' and/or field 'diamlr_time' missing);"
             WRITE(numout, *) "        disabling output for multiple-linear-regression analysis."
          END IF