Changeset 12345


Ignore:
Timestamp:
2020-01-28T15:26:14+01:00 (9 months 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:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadetide.F90

    r12184 r12345  
    1212   USE phycst         , ONLY :   rpi 
    1313   USE tide_mod 
     14#if defined key_iomput 
    1415   USE xios 
     16#endif 
    1517 
    1618   IMPLICIT NONE 
     
    4446      TYPE(tide_harmonic), DIMENSION(:), POINTER ::   stideconst 
    4547 
     48      lk_diadetide = .FALSE. 
     49#if defined key_iomput 
    4650      ! Enquire detiding activation state (test for presence of detiding-related 
    4751      ! weights field and output file group) 
    4852      IF ( xios_is_valid_field( "diadetide_weight" ).AND.xios_is_valid_filegroup( "diadetide_files" ).AND.ln_tide ) THEN 
    4953         lk_diadetide = .TRUE. 
    50       ELSE 
    51          lk_diadetide = .FALSE. 
    5254      END IF 
     55#endif 
    5356 
    5457      IF (lwp) THEN 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diamlr.F90

    r12184 r12345  
    1313   USE dom_oce        , ONLY :   adatrj 
    1414   USE timing         , ONLY :   timing_start, timing_stop 
     15#if defined key_iomput 
    1516   USE xios 
     17#endif 
    1618   USE tide_mod 
    1719 
     
    5759      !! 
    5860      !!---------------------------------------------------------------------- 
     61#if defined key_iomput 
    5962 
    6063      TYPE(xios_fieldgroup)                       ::   slxhdl_fldgrp 
     
    97100      ELSE 
    98101         IF (lwp) THEN 
    99             WRITE(numout, *) "diamlr: configuration not found or icomplete (field group 'diamlr_fields'" 
     102            WRITE(numout, *) "diamlr: configuration not found or incomplete (field group 'diamlr_fields'" 
    100103            WRITE(numout, *) "        and/or file group 'diamlr_files' and/or field 'diamlr_time' missing);" 
    101104            WRITE(numout, *) "        disabling output for multiple-linear-regression analysis." 
     
    385388 
    386389      END IF 
     390#else 
     391      IF( .FALSE. ) write(numout,*) 'dia_mlr_iom_init: should not see this'    ! useless statement to avoid compiler warnings 
     392#endif 
    387393 
    388394   END SUBROUTINE dia_mlr_iom_init 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90

    r12251 r12345  
    298298      !!---------------------------------------------------------------------- 
    299299 
     300#if defined key_iomput 
    300301      CALL xios_close_context_definition() 
    301302      CALL xios_update_calendar( 0 ) 
     303#else 
     304      IF( .FALSE. )   WRITE(numout,*) 'iom_init_closedef: should not see this'   ! useless statement to avoid compilation warnings 
     305#endif 
    302306 
    303307   END SUBROUTINE iom_init_closedef 
     
    24712475   END SUBROUTINE iom_context_finalize 
    24722476 
     2477   SUBROUTINE iom_update_file_name( cdid ) 
     2478      CHARACTER(LEN=*), INTENT(in) ::   cdid 
     2479      IF( .FALSE. )   WRITE(numout,*)  cdid   ! useless test to avoid compilation warnings 
     2480   END SUBROUTINE iom_update_file_name 
     2481 
    24732482#endif 
    24742483 
     
    24902499#else 
    24912500      IF( .FALSE. )   WRITE(numout,*) cdname, pmiss_val   ! useless test to avoid compilation warnings 
     2501      IF( .FALSE. )   pmiss_val = 0._wp                   ! useless assignment to avoid compilation warnings 
    24922502#endif 
    24932503   END SUBROUTINE iom_miss_val 
Note: See TracChangeset for help on using the changeset viewer.