Changeset 12345

Timestamp:

2020-01-28T15:26:14+01:00 (4 years ago)

Author:

acc

Message:

Branch dev_r12072_MERGE_OPTION2_2019. Fixed ticket #2372. Changes to enable compilation without key_iomput

Location:

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE

Files:

• DIA/diadetide.F90 (modified) (2 diffs)
• DIA/diamlr.F90 (modified) (4 diffs)
• IOM/iom.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadetide.F90

@@ -12 +12 @@
    USE phycst         , ONLY :   rpi
    USE tide_mod
+#if defined key_iomput
    USE xios
+#endif
 
    IMPLICIT NONE
@@ -44 +46 @@
       TYPE(tide_harmonic), DIMENSION(:), POINTER ::   stideconst
 
+      lk_diadetide = .FALSE.
+#if defined key_iomput
       ! Enquire detiding activation state (test for presence of detiding-related
       ! weights field and output file group)
       IF ( xios_is_valid_field( "diadetide_weight" ).AND.xios_is_valid_filegroup( "diadetide_files" ).AND.ln_tide ) THEN
          lk_diadetide = .TRUE.
-      ELSE
-         lk_diadetide = .FALSE.
       END IF
+#endif
 
       IF (lwp) THEN

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diamlr.F90

@@ -13 +13 @@
    USE dom_oce        , ONLY :   adatrj
    USE timing         , ONLY :   timing_start, timing_stop
+#if defined key_iomput
    USE xios
+#endif
    USE tide_mod
 
@@ -57 +59 @@
       !!
       !!----------------------------------------------------------------------
+#if defined key_iomput
 
       TYPE(xios_fieldgroup)                       ::   slxhdl_fldgrp
@@ -97 +100 @@
       ELSE
          IF (lwp) THEN
-            WRITE(numout, *) "diamlr: configuration not found or icomplete (field group 'diamlr_fields'"
+            WRITE(numout, *) "diamlr: configuration not found or incomplete (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."
@@ -385 +388 @@
 
       END IF
+#else
+      IF( .FALSE. ) write(numout,*) 'dia_mlr_iom_init: should not see this'    ! useless statement to avoid compiler warnings
+#endif
 
    END SUBROUTINE dia_mlr_iom_init

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90

@@ -298 +298 @@
       !!----------------------------------------------------------------------
 
+#if defined key_iomput
       CALL xios_close_context_definition()
       CALL xios_update_calendar( 0 )
+#else
+      IF( .FALSE. )   WRITE(numout,*) 'iom_init_closedef: should not see this'   ! useless statement to avoid compilation warnings
+#endif
 
    END SUBROUTINE iom_init_closedef
@@ -2471 +2475 @@
    END SUBROUTINE iom_context_finalize
 
+   SUBROUTINE iom_update_file_name( cdid )
+      CHARACTER(LEN=*), INTENT(in) ::   cdid
+      IF( .FALSE. )   WRITE(numout,*)  cdid   ! useless test to avoid compilation warnings
+   END SUBROUTINE iom_update_file_name
+
 #endif
 
@@ -2490 +2499 @@
 #else
       IF( .FALSE. )   WRITE(numout,*) cdname, pmiss_val   ! useless test to avoid compilation warnings
+      IF( .FALSE. )   pmiss_val = 0._wp                   ! useless assignment to avoid compilation warnings
 #endif
    END SUBROUTINE iom_miss_val