Changeset 12344


Ignore:
Timestamp:
2020-01-28T15:17:27+01:00 (9 months ago)
Author:
acc
Message:

Branch dev_r11943_MERGE_2019. Fixed ticket #2373. Changes to enable compilation without key_iomput

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE
Files:
3 edited

Legend:

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

    r12205 r12344  
    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_r11943_MERGE_2019/src/OCE/DIA/diamlr.F90

    r12340 r12344  
    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 
     
    5961      !! 
    6062      !!---------------------------------------------------------------------- 
     63#if defined key_iomput 
    6164 
    6265      TYPE(xios_fieldgroup)                       ::   slxhdl_fldgrp 
     
    387390 
    388391      END IF 
     392#else 
     393      IF( .FALSE. ) write(numout,*) 'dia_mlr_iom_init: should not see this'    ! useless statement to avoid compiler warnings 
     394#endif 
    389395 
    390396   END SUBROUTINE dia_mlr_iom_init 
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/iom.F90

    r12340 r12344  
    299299      !!---------------------------------------------------------------------- 
    300300 
     301#if defined key_iomput 
    301302      CALL xios_close_context_definition() 
    302303      CALL xios_update_calendar( 0 ) 
     304#else 
     305      IF( .FALSE. )   WRITE(numout,*) 'iom_init_closedef: should not see this'   ! useless statement to avoid compilation warnings 
     306#endif 
    303307 
    304308   END SUBROUTINE iom_init_closedef 
     
    24592463   END SUBROUTINE iom_context_finalize 
    24602464 
     2465   SUBROUTINE iom_update_file_name( cdid ) 
     2466      CHARACTER(LEN=*), INTENT(in) ::   cdid 
     2467      IF( .FALSE. )   WRITE(numout,*)  cdid   ! useless test to avoid compilation warnings 
     2468   END SUBROUTINE iom_update_file_name 
     2469 
    24612470#endif 
    24622471 
     
    24782487#else 
    24792488      IF( .FALSE. )   WRITE(numout,*) cdname, pmiss_val   ! useless test to avoid compilation warnings 
     2489      IF( .FALSE. )   pmiss_val = 0._wp                   ! useless assignment to avoid compilation warnings 
    24802490#endif 
    24812491   END SUBROUTINE iom_miss_val 
Note: See TracChangeset for help on using the changeset viewer.