Ignore:
Timestamp:
Oct 23, 2024, 5:34:46 PM (6 weeks ago)
Author:
abarral
Message:

Remove CPP_IOIPSL cpp keys uses

Location:
LMDZ6/trunk/libf/phylmd
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90

    r5084 r5267  
    828828       !       ENDIF
    829829
    830 #ifdef CPP_IOIPSL
    831830  IF (.NOT. using_xios) THEN
    832831    IF (.NOT.ok_all_xml) THEN
     
    836835           ll=0
    837836            DO k=1, nlevSTD
    838                bb2=clevSTD(k) 
     837               bb2=clevSTD(k)
    839838               IF (bb2.EQ."850".OR.bb2.EQ."700".OR. &
    840839                    bb2.EQ."500".OR.bb2.EQ."200".OR. &
     
    856855    ENDIF
    857856  ENDIF !.NOT.using_xios
    858 #endif
     857
    859858
    860859  IF (using_xios) THEN
     
    14701469       ENDIF
    14711470!!!!!!!!!!!! Sorties niveaux de pression NMC !!!!!!!!!!!!!!!!!!!!
    1472 #ifdef CPP_IOIPSL
    1473 
    14741471  IF (.NOT. using_xios) THEN
    1475     IF (.NOT.ok_all_xml) THEN 
     1472    IF (.NOT.ok_all_xml) THEN
    14761473         ! ATTENTION, LES ANCIENS HISTWRITE ONT ETES CONSERVES EN ATTENDANT MIEUX:
    14771474         ! Champs interpolles sur des niveaux de pression
     
    15411538    ENDIF
    15421539  ENDIF
    1543 #endif
     1540
    15441541
    15451542IF (using_xios) THEN
  • LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h

    r5084 r5267  
    88      SUBROUTINE conf_unicol
    99!
    10 #ifdef CPP_IOIPSL
    1110      use IOIPSL
    12 #else
    13 ! if not using IOIPSL, we still need to use (a local version of) getin
    14       use ioipsl_getincom
    15 #endif
     11
    1612      USE print_control_mod, ONLY: lunout
    1713      IMPLICIT NONE
  • LMDZ6/trunk/libf/phylmd/iophy.F90

    r4848 r5267  
    4343  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid_type, unstructured
    4444  USE print_control_mod, ONLY: prt_level,lunout
    45 #ifdef CPP_IOIPSL
    4645    USE ioipsl, ONLY: flio_dom_set
    47 #endif
     46
    4847  use wxios, ONLY: wxios_domain_param, wxios_domain_param_unstructured, wxios_context_init, using_xios
    4948    IMPLICIT NONE
  • LMDZ6/trunk/libf/phylmd/moy_undefSTD.F90

    r5084 r5267  
    55  USE netcdf
    66  USE dimphy
    7 #ifdef CPP_IOIPSL
    87  USE phys_state_var_mod
    9 #endif
    108  USE wxios, ONLY: missing_val_xios => missing_val, using_xios
    119 
  • LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

    r5252 r5267  
    14931493       !       ENDIF
    14941494
    1495 #ifdef CPP_IOIPSL
    14961495       IF (.NOT. using_xios) THEN
    14971496         IF (.NOT.ok_all_xml) THEN
     
    15011500              ll=0
    15021501              DO k=1, nlevSTD
    1503                 bb2=clevSTD(k) 
     1502                bb2=clevSTD(k)
    15041503                  IF (bb2.EQ."850".OR.bb2.EQ."700".OR. &
    15051504                       bb2.EQ."500".OR.bb2.EQ."200".OR. &
     
    15211520         ENDIF
    15221521       ENDIF
    1523 #endif
     1522
    15241523
    15251524       IF (using_xios) THEN
     
    26202619       ENDIF !ok_4xCO2atm
    26212620!!!!!!!!!!!! Sorties niveaux de pression NMC !!!!!!!!!!!!!!!!!!!!
    2622 #ifdef CPP_IOIPSL
    26232621       IF (.NOT. using_xios) THEN
    2624          IF (.NOT.ok_all_xml) THEN 
     2622         IF (.NOT.ok_all_xml) THEN
    26252623           ! ATTENTION, LES ANCIENS HISTWRITE ONT ETES CONSERVES EN ATTENDANT MIEUX:
    26262624           ! Champs interpolles sur des niveaux de pression
     
    26902688         ENDIF
    26912689       ENDIF !.NOT. using_xios
    2692 #endif
     2690
    26932691
    26942692       IF (using_xios) THEN
  • LMDZ6/trunk/libf/phylmd/physiq_mod.F90

    r5265 r5267  
    17301730          ENDIF
    17311731
    1732 #ifdef CPP_IOIPSL
    1733 
    17341732       !$OMP MASTER
    17351733       ! FH : if ok_sync=.true. , the time axis is written at each time step
     
    17621760#endif
    17631761
    1764 #endif
    17651762       ecrit_reg = ecrit_reg * un_jour
    17661763       ecrit_tra = ecrit_tra * un_jour
     
    56825679    !   Ecriture des sorties
    56835680    !=============================================================
    5684 #ifdef CPP_IOIPSL
    56855681
    56865682    ! Recupere des varibles calcule dans differents modules
     
    57425738#endif
    57435739
    5744 #endif
    57455740    ! Petit appelle de sorties pour accompagner le travail sur phyex
    57465741    if ( iflag_physiq == 1 ) then
  • LMDZ6/trunk/libf/phylmd/plevel.F90

    r5084 r5267  
    99  USE netcdf
    1010  USE dimphy
    11 #ifdef CPP_IOIPSL
    12   USE phys_state_var_mod, ONLY: missing_val_nf90
    13 #endif
     11  USE phys_state_var_mod, ONLY: missing_val_nf90
    1412  USE wxios, ONLY: missing_val_xios => missing_val, using_xios
    1513  IMPLICIT NONE
  • LMDZ6/trunk/libf/phylmd/plevel_new.F90

    r5084 r5267  
    1010  USE netcdf
    1111  USE dimphy
    12 #ifdef CPP_IOIPSL
    1312  USE phys_state_var_mod, ONLY: missing_val_nf90
    14 #endif
    1513  USE wxios, ONLY: missing_val_xios=>missing_val, using_xios
    1614
  • LMDZ6/trunk/libf/phylmd/undefSTD.F90

    r5084 r5267  
    55  USE netcdf
    66  USE dimphy
    7 #ifdef CPP_IOIPSL
    87  USE phys_state_var_mod
    9 #endif
    108  USE wxios, ONLY: missing_val_xios => missing_val, using_xios
    119
Note: See TracChangeset for help on using the changeset viewer.