Ignore:
Timestamp:
Oct 19, 2023, 4:02:57 PM (2 years ago)
Author:
idelkadi
Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:
LMDZ6/branches/LMDZ_ECRad
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/LMDZ_ECRad

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/abort_gcm.F

    r2100 r4727  
    1313#endif
    1414      USE parallel_lmdz
    15 #include "iniprint.h"
     15      INCLUDE "iniprint.h"
    1616 
    1717C
    … …  
    4747      else
    4848        write(lunout,*) 'Houston, we have a problem, ierr = ', ierr
    49 #ifdef CPP_MPI
     49
     50        if (using_mpi) THEN
    5051C$OMP CRITICAL (MPI_ABORT_GCM)
    51         call MPI_ABORT(COMM_LMDZ, 1, ierror_mpi)
     52          call MPI_ABORT(COMM_LMDZ, 1, ierror_mpi)
    5253C$OMP END CRITICAL (MPI_ABORT_GCM)
    53 #else
    54         stop 1
    55 #endif         
     54        else
     55         stop 1
     56        endif         
     57     
    5658      endif
    5759      END

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/bilan_dyn_loc.F

    r4482 r4727  
    141141      character*10 infile
    142142
    143       integer fileid
     143      integer, save :: fileid
    144144      integer thoriid, zvertiid
    145       save fileid
    146145
    147146      INTEGER,SAVE,ALLOCATABLE :: ndex3d(:)
    … …  
    838837c/////////////////////////////////////////////////////////////////////
    839838c=====================================================================
     839!$OMP MASTER
     840      call histsync(fileid)
     841!$OMP END MASTER
     842
    840843
    841844      return

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/conf_gcm.F90

    r4482 r4727  
    1919  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
    2020                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    21                           ngroup
     21                          ngroup, maxlatfilter
    2222  USE logic_mod, ONLY: fxyhypb, iflag_phys, ok_etat0, ok_gradsfile, &
    2323                       ok_guide, ok_limit, ok_strato, purmats, read_start, &
    … …  
    2525  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    2626                       alphax,alphay,taux,tauy
    27   USE temps_mod, ONLY: calend, year_len
     27  USE temps_mod, ONLY: calend, year_len, offline_time
    2828
    2929  IMPLICIT NONE
    … …  
    341341  CALL getin('dissip_zref',dissip_zref )
    342342
     343
     344  !maxlatfilter
     345  maxlatfilter = -1.0
     346  CALL getin('maxlatfilter',maxlatfilter)
     347  if (maxlatfilter > 90) &
     348       call abort_gcm("conf_gcm", 'maxlatfilter should be <=90', 1)
     349 
     350
    343351  ! ngroup
    344352  ngroup=3
    … …  
    620628
    621629     !Config  Key  = offline
    622      !Config  Desc = Nouvelle eau liquide
     630     !Config  Desc = ecriture des flux de masse
    623631     !Config  Def  = n
    624      !Config  Help = Permet de mettre en route la
    625      !Config         nouvelle parametrisation de l'eau liquide !
     632     !Config  Help = Permet de sortir les flux de masse sur la grille plev
    626633     offline = .FALSE.
    627634     CALL getin('offline',offline)
     635
     636     !Config Key  = offline_time
     637     !Config Desc =  Choix des frequences de stockage pour le offline
     638     !Config Def  = 8
     639     !Config Help = offline_time=12     ! stockage toutes les 2h=1jour/12
     640     !Config Help = offline_time=8      ! stockage toutes les 3h=1jour/8
     641     offline_time = 8
     642     CALL getin('offline_time',offline_time)
     643
    628644     IF (offline .AND. adjust) THEN
    629645        WRITE(lunout,*)  &
    … …  
    714730     write(lunout,*)' tauyy = ', tauyy
    715731     write(lunout,*)' offline = ', offline
     732     write(lunout,*)' offline_time = ', offline_time
    716733     write(lunout,*)' type_trac = ', type_trac
    717734     write(lunout,*)' ok_dynzon = ', ok_dynzon

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/convflu_loc.F

    r1907 r4727  
    1818      IMPLICIT NONE
    1919c
    20 #include "dimensions.h"
    21 #include "paramet.h"
     20      INCLUDE "dimensions.h"
     21      INCLUDE "paramet.h"
    2222      REAL       xflu,yflu,convfl,convpn,convps
    2323      INTEGER    l,ij,nbniv
    … …  
    3030c
    3131c
    32 #include "comgeom.h"
     32      INCLUDE "comgeom.h"
    3333c
    3434     

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/covcont_loc.F

    r1907 r4727  
    1717c=======================================================================
    1818
    19 #include "dimensions.h"
    20 #include "paramet.h"
    21 #include "comgeom.h"
     19      INCLUDE "dimensions.h"
     20      INCLUDE "paramet.h"
     21      INCLUDE "comgeom.h"
    2222
    2323      INTEGER klevel

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/covnat_loc.F

    r1907 r4727  
    2020c=======================================================================
    2121
    22 #include "dimensions.h"
    23 #include "paramet.h"
    24 #include "comgeom.h"
     22      INCLUDE "dimensions.h"
     23      INCLUDE "paramet.h"
     24      INCLUDE "comgeom.h"
    2525
    2626      INTEGER klevel

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/diverg_gam_loc.F

    r1907 r4727  
    2121c
    2222c   ---------------------------------------------------------------------
    23 #include "dimensions.h"
    24 #include "paramet.h"
    25 #include "comgeom.h"
     23      INCLUDE "dimensions.h"
     24      INCLUDE "paramet.h"
     25      INCLUDE "comgeom.h"
    2626c
    2727c    ..........          variables en arguments    ...................

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/diverg_p.F

    r1907 r4727  
    2020c
    2121c   ---------------------------------------------------------------------
    22 #include "dimensions.h"
    23 #include "paramet.h"
    24 #include "comgeom.h"
     22      INCLUDE "dimensions.h"
     23      INCLUDE "paramet.h"
     24      INCLUDE "comgeom.h"
    2525c
    2626c    ..........          variables en arguments    ...................

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/divergf_loc.F

    r1907 r4727  
    2121c
    2222c   ---------------------------------------------------------------------
    23 #include "dimensions.h"
    24 #include "paramet.h"
    25 #include "comgeom.h"
     23      INCLUDE "dimensions.h"
     24      INCLUDE "paramet.h"
     25      INCLUDE "comgeom.h"
    2626c
    2727c    ..........          variables en arguments    ...................

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/divgrad2_loc.F

    r1907 r4727  
    1616      IMPLICIT NONE
    1717c
    18 #include "dimensions.h"
    19 #include "paramet.h"
    20 #include "comgeom2.h"
    21 #include "comdissipn.h"
     18      INCLUDE "dimensions.h"
     19      INCLUDE "paramet.h"
     20      INCLUDE "comgeom2.h"
     21      INCLUDE "comdissipn.h"
    2222
    2323c    .......    variables en arguments   .......

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/dudv1_loc.F

    r1907 r4727  
    1717c-----------------------------------------------------------------------
    1818
    19 #include "dimensions.h"
    20 #include "paramet.h"
     19      INCLUDE "dimensions.h"
     20      INCLUDE "paramet.h"
    2121
    2222      REAL vorpot( ijb_v:ije_v,llm ) ,pbaru( ijb_u:ije_u,llm ) ,

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/dynetat0_loc.F90

    r4482 r4727  
    183183         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized with a simplified Rayleigh distillation law.', modname)
    184184         q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqParent)*tnat*(q(ijb_u:ije_u,:,iqParent)/30.e-3)**(alpha_ideal-1.)
     185         ! Camille 9 mars 2023: point de vigilence: initialisation incohérente
     186         ! avec celle de xt_ancien dans la physiq.
    185187      ELSE
    186188         CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to its parent isotope concentration.', modname)
    187          q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqIsoPha(iName,iPhase))
     189         ! Camille 9 mars 2023: attention!! seuls les tags qui correspondent à
     190         ! izone=izone_init (définie dans isotrac_mod) sont initialisés comme
     191         ! les parents. Sinon, c'est nul.
     192         ! j'ai fait ça en attendant, mais il faudrait initialiser proprement en
     193         ! remplacant 1 par izone_init dans la ligne qui suit.
     194         IF(tracers(iq)%iso_iZone == 1) THEN
     195          q(ijb_u:ije_u,:,iq) = q(ijb_u:ije_u,:,iqIsoPha(iName,iPhase))
     196         ELSE
     197           q(ijb_u:ije_u,:,iq) =  0.
     198         ENDIF
    188199      END IF
    189200    !--------------------------------------------------------------------------------------------------------------------------

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/filtreg_p.F

    r4482 r4727  
    5151c
    5252c
    53 #include "dimensions.h"
    54 #include "paramet.h"
    55 #include "coefils.h"
     53      INCLUDE "dimensions.h"
     54      INCLUDE "paramet.h"
     55      INCLUDE "coefils.h"
    5656c
    5757      INTEGER ibeg,iend,nlat,nbniv,ifiltre,iter

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/gcm.F90

    r4482 r4727  
    2828                       itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end, &
    2929                       dt,hour_ini,itaufin
    30 #ifdef CPP_XIOS
    3130  USE mod_xios_dyn3dmem, ONLY: xios_dyn3dmem_init
    32 #endif
    3331
    3432  IMPLICIT NONE
    … …  
    457455
    458456! setting up DYN3D/XIOS inerface
    459 #ifdef CPP_XIOS
    460    if (ok_dyn_xios) then
    461      CALL xios_dyn3dmem_init(xios_cal_type, anref, moisref, jourref,heureref, an,   &
     457  if (ok_dyn_xios) then
     458      CALL xios_dyn3dmem_init(xios_cal_type, anref, moisref, jourref,heureref, an,   &
    462459          mois, jour, heure, zdtvr)
    463460  endif
    464 #endif
    465461
    466462  ! #endif of #ifdef CPP_IOIPSL

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/gr_u_scal_loc.F

    r1907 r4727  
    3131c   ---------------
    3232
    33 #include "dimensions.h"
    34 #include "paramet.h"
    35 #include "comgeom.h"
     33      INCLUDE "dimensions.h"
     34      INCLUDE "paramet.h"
     35      INCLUDE "comgeom.h"
    3636
    3737c   Arguments:

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/gr_v_scal_loc.F

    r1907 r4727  
    3131c   ---------------
    3232
    33 #include "dimensions.h"
    34 #include "paramet.h"
    35 #include "comgeom.h"
     33      INCLUDE "dimensions.h"
     34      INCLUDE "paramet.h"
     35      INCLUDE "comgeom.h"
    3636
    3737c   Arguments:

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/grad_loc.F

    r1907 r4727  
    1313      IMPLICIT NONE
    1414c
    15 #include "dimensions.h"
    16 #include "paramet.h"
     15      INCLUDE "dimensions.h"
     16      INCLUDE "paramet.h"
    1717      INTEGER klevel
    1818      REAL  pg( ijb_u:ije_u,klevel )

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/grad_p.F

    r1907 r4727  
    1313      IMPLICIT NONE
    1414c
    15 #include "dimensions.h"
    16 #include "paramet.h"
     15      INCLUDE "dimensions.h"
     16      INCLUDE "paramet.h"
    1717      INTEGER klevel
    1818      REAL  pg( ip1jmp1,klevel )

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/gradiv2_loc.F

    r1907 r4727  
    2121      IMPLICIT NONE
    2222c
    23 #include "dimensions.h"
    24 #include "paramet.h"
    25 #include "comgeom.h"
    26 #include "comdissipn.h"
     23      INCLUDE "dimensions.h"
     24      INCLUDE "paramet.h"
     25      INCLUDE "comgeom.h"
     26      INCLUDE "comdissipn.h"
    2727c
    2828c     ........    variables en arguments      ........

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/laplacien_gam_loc.F

    r1907 r4727  
    1414      IMPLICIT NONE
    1515c
    16 #include "dimensions.h"
    17 #include "paramet.h"
    18 #include "comgeom.h"
     16      INCLUDE "dimensions.h"
     17      INCLUDE "paramet.h"
     18      INCLUDE "comgeom.h"
    1919
    2020c

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/laplacien_loc.F

    r1907 r4727  
    1313      IMPLICIT NONE
    1414c
    15 #include "dimensions.h"
    16 #include "paramet.h"
    17 #include "comgeom.h"
     15      INCLUDE "dimensions.h"
     16      INCLUDE "paramet.h"
     17      INCLUDE "comgeom.h"
    1818
    1919c

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/laplacien_rot_loc.F

    r1907 r4727  
    1414      IMPLICIT NONE
    1515c
    16 #include "dimensions.h"
    17 #include "paramet.h"
    18 #include "comgeom.h"
     16      INCLUDE "dimensions.h"
     17      INCLUDE "paramet.h"
     18      INCLUDE "comgeom.h"
    1919
    2020c

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/laplacien_rotgam_loc.F

    r1907 r4727  
    1212      IMPLICIT NONE
    1313c
    14 #include "dimensions.h"
    15 #include "paramet.h"
    16 #include "comgeom.h"
     14      INCLUDE "dimensions.h"
     15      INCLUDE "paramet.h"
     16      INCLUDE "comgeom.h"
    1717
    1818c

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/leapfrog_loc.F

    r4482 r4727  
    4242       USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
    4343     &                        day_ref,start_time,dt
    44 #ifdef CPP_XIOS
    45        USE xios, ONLY: xios_update_calendar
    46 #endif
     44       USE mod_xios_dyn3dmem, ONLY : dyn3d_ctx_handle
     45       USE lmdz_xios, ONLY: xios_update_calendar,
     46     &                      xios_set_current_context,
     47     &                      using_xios
    4748       
    4849      IMPLICIT NONE
    … …  
    15191520
    15201521#ifdef INCA
    1521          if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
     1522         IF (ANY(type_trac == ['inca','inco'])) THEN
     1523            CALL finalize_inca
     1524!     switching back to LMDZDYN context
     1525!$OMP MASTER
     1526            IF (ok_dyn_xios) THEN
     1527               CALL xios_set_current_context(dyn3d_ctx_handle)
     1528            ENDIF
     1529!$OMP END MASTER
     1530         ENDIF
    15221531#endif
    15231532#ifdef REPROBUS
    … …  
    15681577
    15691578#ifdef INCA
    1570               if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
     1579              IF (ANY(type_trac == ['inca','inco'])) THEN
     1580                 CALL finalize_inca
     1581!     switching back to LMDZDYN context
     1582!$OMP MASTER
     1583                 IF (ok_dyn_xios) THEN
     1584                    CALL xios_set_current_context(dyn3d_ctx_handle)
     1585                 ENDIF
     1586!$OMP END MASTER
     1587              ENDIF
    15711588#endif
    15721589#ifdef REPROBUS
    … …  
    16401657#endif
    16411658             
    1642 #ifdef CPP_XIOS
    16431659              IF (ok_dyn_xios) THEN
    16441660c$OMP MASTER
    … …  
    16491665     &                 ucov,teta,pk,phi,q,masse,ps,phis)
    16501666              ENDIF
    1651 #endif
    16521667             
    16531668          endif                 ! of if (leapf.or.(.not.leapf.and.(.not.forward)))
    … …  
    17351750
    17361751#ifdef INCA
    1737               if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
     1752                 IF (ANY(type_trac == ['inca','inco'])) THEN
     1753                    CALL finalize_inca
     1754!     switching back to LMDZDYN context
     1755!$OMP MASTER
     1756                    IF (ok_dyn_xios) THEN
     1757                       CALL xios_set_current_context(dyn3d_ctx_handle)
     1758                    ENDIF
     1759!$OMP END MASTER
     1760                 ENDIF
     1761
    17381762#endif
    17391763#ifdef REPROBUS
    … …  
    18011825#endif
    18021826
    1803 #ifdef CPP_XIOS
    18041827              IF (ok_dyn_xios) THEN
    18051828c$OMP MASTER
    … …  
    18101833     &                 ucov,teta,pk,phi,q,masse,ps,phis)
    18111834              ENDIF
    1812 #endif
    18131835             
    18141836           ENDIF                ! of IF(MOD(itau,iecri).EQ.0)
    … …  
    18421864
    18431865#ifdef INCA
    1844       if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
     1866      IF (ANY(type_trac == ['inca','inco'])) THEN
     1867         CALL finalize_inca
     1868!     switching back to LMDZDYN context
     1869!$OMP MASTER
     1870         IF (ok_dyn_xios) THEN
     1871            CALL xios_set_current_context(dyn3d_ctx_handle)
     1872         ENDIF
     1873!$OMP END MASTER
     1874      ENDIF
     1875
    18451876#endif
    18461877#ifdef REPROBUS

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/mod_const_mpi.F90

    r4146 r4727  
    1111
    1212  SUBROUTINE Init_const_mpi
     13    USE lmdz_mpi
     14
    1315#ifdef CPP_IOIPSL
    1416    USE IOIPSL, ONLY: getin
    … …  
    2123    USE mod_prism
    2224#endif
    23 #ifdef CPP_XIOS
    24     USE wxios, only: wxios_init
    25 #endif
     25    USE wxios, only: wxios_init, using_xios
    2626    IMPLICIT NONE
    27 #ifdef CPP_MPI
    28     INCLUDE 'mpif.h'
    29 #endif
    3027
    3128    INTEGER             :: ierr
    … …  
    4138!$OMP BARRIER
    4239
    43     IF (type_ocean=='couple') THEN
     40    IF (using_mpi) THEN
     41      IF (type_ocean=='couple') THEN
    4442#ifdef CPP_COUPLE
    4543!$OMP MASTER
    46 #ifdef CPP_XIOS
    47       CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
    48 #else
    49        CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
    50        CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
    51 #endif
     44        IF (using_xios) THEN
     45          CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
     46        ELSE
     47          CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
     48          CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
     49        ENDIF
    5250!$OMP END MASTER
    5351#endif
    54 #ifdef CPP_MPI
    55       MPI_REAL_LMDZ=MPI_REAL8
    56 #endif
    57     ELSE
    58       CALL init_mpi
     52        MPI_REAL_LMDZ=MPI_REAL8
     53      ELSE
     54        CALL init_mpi
     55      ENDIF
    5956    ENDIF
    60 
    6157  END SUBROUTINE Init_const_mpi
    6258 
    6359  SUBROUTINE Init_mpi
    64 #ifdef CPP_XIOS
    65     USE wxios, only: wxios_init
    66 #endif
     60    USE lmdz_mpi
     61    USE wxios, only: wxios_init, using_xios
     62
    6763  IMPLICIT NONE
    68 #ifdef CPP_MPI
    69      INCLUDE 'mpif.h'
    70 #endif
    7164    INTEGER             :: ierr
    7265    INTEGER             :: thread_required
    7366    INTEGER             :: thread_provided
    7467
    75 #ifdef CPP_MPI
    7668!$OMP MASTER
    7769      thread_required=MPI_THREAD_SERIALIZED
    … …  
    8779! Initialisation de XIOS
    8880!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    89 #ifdef CPP_XIOS
    90       WRITE(*,*)'IN Init_mpi call wxios_init'
    91       CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
    92 #endif
     81      IF (using_xios) THEN
     82        WRITE(*,*)'IN Init_mpi call wxios_init'
     83        CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
     84      ENDIF
    9385!$OMP END MASTER
    94 #else
    95 #ifdef CPP_XIOS
    96 !$OMP MASTER
    97       CALL wxios_init("LMDZ")
    98 !$OMP END MASTER
    99 #endif
    100 #endif
    10186
    102    END SUBROUTINE Init_mpi
     87END SUBROUTINE Init_mpi
    10388   
    10489END MODULE mod_const_mpi

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/mod_filtreg_p.F

    r4482 r4727  
    5555c
    5656c
    57 #include "dimensions.h"
    58 #include "paramet.h"
    59 #include "coefils.h"
     57      INCLUDE "dimensions.h"
     58      INCLUDE "paramet.h"
     59      INCLUDE "coefils.h"
    6060c
    6161      INTEGER,INTENT(IN) :: jjb,jje,ibeg,iend,nlat,nbniv,ifiltre,iter

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/mod_hallo.F90

    r4482 r4727  
    106106 
    107107  SUBROUTINE create_global_mpi_buffer
     108  USE lmdz_mpi
    108109  IMPLICIT NONE
    109 #ifdef CPP_MPI
    110   INCLUDE 'mpif.h'
    111 #endif 
    112110    POINTER (Pbuffer,MPI_Buffer(MaxBufferSize))
    113111    REAL :: MPI_Buffer
    114 #ifdef CPP_MPI
    115112    INTEGER(KIND=MPI_ADDRESS_KIND) :: BS
    116 #else
    117     INTEGER(KIND=8) :: BS
    118 #endif
    119113    INTEGER :: i,ierr
    120114
    … …  
    122116      Bs=8*MaxBufferSize
    123117!$OMP CRITICAL (MPI)
    124 #ifdef CPP_MPI
    125118      CALL MPI_ALLOC_MEM(BS,MPI_INFO_NULL,Pbuffer,ierr)
    126 #endif
    127119!$OMP END CRITICAL (MPI)
    128120      DO i=1,MaxBufferSize
    … …  
    11571149  subroutine Register_Hallo(Field,ij,ll,RUp,Rdown,SUp,SDown,a_request)
    11581150  USE dimensions_mod
     1151  USE lmdz_mpi
    11591152      implicit none
    11601153
    1161 #ifdef CPP_MPI
    1162     include 'mpif.h'
    1163 #endif   
    11641154      INTEGER :: ij,ll
    11651155      REAL, dimension(ij,ll) :: Field
    … …  
    12241214  subroutine Register_Hallo_u(Field,ll,RUp,Rdown,SUp,SDown,a_request)
    12251215  USE dimensions_mod
     1216  USE lmdz_mpi
    12261217      implicit none
    1227 #ifdef CPP_MPI
    1228     include 'mpif.h'
    1229 #endif   
    12301218      INTEGER :: ll
    12311219      REAL, dimension(ijb_u:ije_u,ll) :: Field
    … …  
    12891277  subroutine Register_Hallo_v(Field,ll,RUp,Rdown,SUp,SDown,a_request)
    12901278  USE dimensions_mod
     1279  USE lmdz_mpi
    12911280      implicit none
    1292 #ifdef CPP_MPI
    1293     include 'mpif.h'
    1294 #endif   
    12951281      INTEGER :: ll
    12961282      REAL, dimension(ijb_v:ije_v,ll) :: Field
    … …  
    13541340    subroutine SendRequest(a_Request)
    13551341    USE dimensions_mod
     1342    USE lmdz_mpi
    13561343      implicit none
    1357 
    1358 #ifdef CPP_MPI
    1359       include 'mpif.h'
    1360 #endif
    13611344
    13621345      type(request),target :: a_request
    … …  
    14101393!$OMP CRITICAL (MPI)
    14111394         
    1412 #ifdef CPP_MPI
    14131395         call MPI_ISEND(Buffer(req%Pos),SizeBuffer,MPI_REAL_LMDZ,rank,a_request%tag+1000*omp_rank,     &
    14141396                         COMM_LMDZ,Req%MSG_Request,ierr)
    1415 #endif
    14161397         IF (.NOT.using_mpi) THEN
    14171398           PRINT *,'Erreur, echange MPI en mode sequentiel !!!'
    … …  
    14531434!$OMP CRITICAL (MPI)
    14541435
    1455 #ifdef CPP_MPI
    14561436             call MPI_IRECV(Buffer(Req%Pos),SizeBuffer,MPI_REAL_LMDZ,rank,a_request%tag+1000*omp_rank,     &
    14571437                           COMM_LMDZ,Req%MSG_Request,ierr)
    1458 #endif             
     1438
    14591439             IF (.NOT.using_mpi) THEN
    14601440               PRINT *,'Erreur, echange MPI en mode sequentiel !!!'
    … …  
    14781458   subroutine WaitRequest(a_Request)
    14791459   USE dimensions_mod
     1460   USE lmdz_mpi
    14801461   implicit none
    1481    
    1482 #ifdef CPP_MPI
    1483       include 'mpif.h'   
    1484 #endif
    14851462     
    14861463      type(request),target :: a_request
    … …  
    14881465      type(Hallo),pointer :: PtrHallo
    14891466      integer, dimension(2*mpi_size) :: TabRequest
    1490 #ifdef CPP_MPI
    14911467      integer, dimension(MPI_STATUS_SIZE,2*mpi_size) :: TabStatus
    1492 #else
    1493       integer, dimension(1,2*mpi_size) :: TabStatus
    1494 #endif
    14951468      integer :: NbRequest
    14961469      integer :: i,rank,pos,ij,l,ierr
    … …  
    15211494!        PRINT *,"Process de rang",mpi_rank,"Task : ",omp_rank,"--->",NbRequest,"en attente"
    15221495!        PRINT *,"No des requetes :",TabRequest(1:NbRequest)
    1523 #ifdef CPP_MPI
    15241496        call MPI_WAITALL(NbRequest,TabRequest,TabStatus,ierr)
    1525 #endif
    15261497!        PRINT *,"Process de rang",mpi_rank,"Task : ",omp_rank,"--->",NbRequest,"complete"
    15271498!        PRINT *,"-------------------------------------------------------------------"
    … …  
    15711542     
    15721543   subroutine WaitSendRequest(a_Request)
     1544   USE lmdz_mpi
    15731545   USE dimensions_mod
    15741546   implicit none
    15751547   
    1576 #ifdef CPP_MPI
    1577       include 'mpif.h'   
    1578 #endif     
    15791548      type(request),target :: a_request
    15801549      type(request_SR),pointer :: Req
    15811550      type(Hallo),pointer :: PtrHallo
    15821551      integer, dimension(mpi_size) :: TabRequest
    1583 #ifdef CPP_MPI
    15841552      integer, dimension(MPI_STATUS_SIZE,mpi_size) :: TabStatus
    1585 #else
    1586       integer, dimension(1,mpi_size) :: TabStatus
    1587 #endif
    15881553      integer :: NbRequest
    15891554      integer :: i,rank,pos,ij,l,ierr
    … …  
    16061571!        PRINT *,"Process de rang",mpi_rank,"Task : ",omp_rank,"--->",NbRequest,"en attente"
    16071572!        PRINT *,"No des requetes :",TabRequest(1:NbRequest)
    1608 #ifdef CPP_MPI
    1609         call MPI_WAITALL(NbRequest,TabRequest,TabStatus,ierr)
    1610 #endif
     1573         call MPI_WAITALL(NbRequest,TabRequest,TabStatus,ierr)
    16111574!        PRINT *,"Process de rang",mpi_rank,"Task : ",omp_rank,"--->",NbRequest,"complete"
    16121575!        PRINT *,"-------------------------------------------------------------------"
    … …  
    16281591   subroutine WaitRecvRequest(a_Request)
    16291592   USE dimensions_mod
     1593   USE lmdz_mpi
    16301594   implicit none
    1631    
    1632 #ifdef CPP_MPI
    1633       include 'mpif.h'   
    1634 #endif
    1635      
    16361595      type(request),target :: a_request
    16371596      type(request_SR),pointer :: Req
    16381597      type(Hallo),pointer :: PtrHallo
    16391598      integer, dimension(mpi_size) :: TabRequest
    1640 #ifdef CPP_MPI
    16411599      integer, dimension(MPI_STATUS_SIZE,mpi_size) :: TabStatus
    1642 #else
    1643       integer, dimension(1,mpi_size) :: TabStatus
    1644 #endif
    16451600      integer :: NbRequest
    16461601      integer :: i,rank,pos,ij,l,ierr
    … …  
    16641619!        PRINT *,"Process de rang",mpi_rank,"Task : ",omp_rank,"--->",NbRequest,"en attente"
    16651620!        PRINT *,"No des requetes :",TabRequest(1:NbRequest)
    1666 #ifdef CPP_MPI
    1667         call MPI_WAITALL(NbRequest,TabRequest,TabStatus,ierr)
    1668 #endif
     1621         call MPI_WAITALL(NbRequest,TabRequest,TabStatus,ierr)
    16691622!        PRINT *,"Process de rang",mpi_rank,"Task : ",omp_rank,"--->",NbRequest,"complete"
    16701623!        PRINT *,"-------------------------------------------------------------------"

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/mod_xios_dyn3dmem.F90

    r4482 r4727  
    1212!
    1313!
    14 #ifdef CPP_XIOS
    1514
    1615MODULE mod_xios_dyn3dmem
    1716
    18      USE xios
     17     USE lmdz_xios
    1918     USE wxios, ONLY : g_comm
    2019     CHARACTER(len=100), SAVE :: dyn3d_ctx_name = "LMDZDYN"
    … …  
    259258   
    260259END MODULE mod_xios_dyn3dmem
    261 #endif
    262 
     260

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/nxgrad_gam_loc.F

    r1907 r4727  
    1313      IMPLICIT NONE
    1414c
    15 #include "dimensions.h"
    16 #include "paramet.h"
    17 #include "comgeom.h"
     15      INCLUDE "dimensions.h"
     16      INCLUDE "paramet.h"
     17      INCLUDE "comgeom.h"
    1818      INTEGER klevel
    1919      REAL rot( ijb_v:ije_v,klevel )

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/nxgrad_loc.F

    r1907 r4727  
    1212      IMPLICIT NONE
    1313c
    14 #include "dimensions.h"
    15 #include "paramet.h"
    16 #include "comgeom.h"
     14      INCLUDE "dimensions.h"
     15      INCLUDE "paramet.h"
     16      INCLUDE "comgeom.h"
    1717      INTEGER klevel
    1818      REAL rot( ijb_v:ije_v,klevel ),x( ijb_u:ije_u,klevel )

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/nxgraro2_loc.F

    r1907 r4727  
    2020      IMPLICIT NONE
    2121c
    22 #include "dimensions.h"
    23 #include "paramet.h"
    24 #include "comdissipn.h"
     22      INCLUDE "dimensions.h"
     23      INCLUDE "paramet.h"
     24      INCLUDE "comdissipn.h"
    2525c
    2626c    ......  variables en arguments  .......

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/parallel_lmdz.F90

    r4482 r4727  
    44  MODULE parallel_lmdz
    55  USE mod_const_mpi
     6  USE lmdz_mpi, ONLY : using_mpi
    67#ifdef CPP_IOIPSL
    78      use IOIPSL
    … …  
    1213    INTEGER,PARAMETER :: halo_max=3
    1314   
    14     LOGICAL,SAVE :: using_mpi ! .true. if using MPI
    1515    LOGICAL,SAVE :: using_omp ! .true. if using OpenMP
    1616    LOGICAL,SAVE :: is_master ! .true. if the core is both MPI & OpenMP master
    … …  
    8888    subroutine init_parallel
    8989    USE vampir
     90    USE lmdz_mpi
    9091    implicit none
    91 #ifdef CPP_MPI
    92       include 'mpif.h'
    93 #endif
    94 #include "dimensions.h"
    95 #include "paramet.h"
    96 #include "iniprint.h"
     92      INCLUDE "dimensions.h"
     93      INCLUDE "paramet.h"
     94      INCLUDE "iniprint.h"
    9795
    9896      integer :: ierr
    … …  
    111109#endif 
    112110
    113 #ifdef CPP_MPI
    114        using_mpi=.TRUE.
    115 #else
    116        using_mpi=.FALSE.
    117 #endif
    118      
    119 
    120111#ifdef CPP_OMP
    121112       using_OMP=.TRUE.
    … …  
    127118     
    128119      IF (using_mpi) THEN
    129 #ifdef CPP_MPI
    130120        call MPI_COMM_SIZE(COMM_LMDZ,mpi_size,ierr)
    131121        call MPI_COMM_RANK(COMM_LMDZ,mpi_rank,ierr)
    132 #endif
    133122      ELSE
    134123        mpi_size=1
    … …  
    161150         write(lunout,*)" ---> diminuez le nombre de CPU ou augmentez la taille en lattitude"
    162151         
    163 #ifdef CPP_MPI
    164152          IF (using_mpi) call MPI_ABORT(COMM_LMDZ,-1, ierr)
    165 #endif         
     153
    166154        endif
    167155       
    … …  
    395383   
    396384    subroutine Finalize_parallel
    397 #ifdef CPP_XIOS
     385    USE lmdz_mpi
    398386    ! ug Pour les sorties XIOS
    399         USE wxios
    400 #endif
     387        USE wxios
     388
    401389#ifdef CPP_COUPLE
    402390! Use of Oasis-MCT coupler
    … …  
    418406      include "dimensions.h"
    419407      include "paramet.h"
    420 #ifdef CPP_MPI
    421       include 'mpif.h'
    422 #endif     
    423408
    424409      integer :: ierr
    … …  
    430415
    431416      if (type_ocean == 'couple') then
    432 #ifdef CPP_XIOS
    433     !Fermeture propre de XIOS
    434       CALL wxios_close()
    435 #else
     417        IF (using_xios) THEN
     418          !Fermeture propre de XIOS
     419          CALL wxios_close()
     420        ELSE
    436421#ifdef CPP_COUPLE
    437          call prism_terminate_proto(ierr)
    438          IF (ierr .ne. PRISM_Ok) THEN
    439             call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
    440          endif
     422           call prism_terminate_proto(ierr)
     423           IF (ierr .ne. PRISM_Ok) THEN
     424              call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
     425           endif
    441426#endif
    442 #endif
     427        ENDIF
    443428      else
    444 #ifdef CPP_XIOS
    445     !Fermeture propre de XIOS
    446       CALL wxios_close()
    447 #endif
    448 #ifdef CPP_MPI
    449          IF (using_mpi) call MPI_FINALIZE(ierr)
    450 #endif
     429        IF (using_xios) THEN
     430          !Fermeture propre de XIOS
     431          CALL wxios_close()
     432        ENDIF
     433        IF (using_mpi) call MPI_FINALIZE(ierr)
    451434      end if
    452435     
    … …  
    456439    implicit none
    457440
    458 #include "dimensions.h"
    459 #include "paramet.h"
     441      INCLUDE "dimensions.h"
     442      INCLUDE "paramet.h"
    460443
    461444      integer, intent(in) :: ij,ll,row
    … …  
    479462    implicit none
    480463
    481 #include "dimensions.h"
    482 #include "paramet.h"
     464      INCLUDE "dimensions.h"
     465      INCLUDE "paramet.h"
    483466
    484467      integer, intent(in) :: ij,ll,row
    … …  
    502485   
    503486    SUBROUTINE barrier
     487    USE lmdz_mpi
    504488    IMPLICIT NONE
    505 #ifdef CPP_MPI
    506     INCLUDE 'mpif.h'
    507 #endif
    508489    INTEGER :: ierr
    509490   
    510491!$OMP CRITICAL (MPI)     
    511 #ifdef CPP_MPI
    512492      IF (using_mpi) CALL MPI_Barrier(COMM_LMDZ,ierr)
    513 #endif
    514493!$OMP END CRITICAL (MPI)
    515494   
    … …  
    518497     
    519498    subroutine exchange_hallo(Field,ij,ll,up,down)
     499    USE lmdz_mpi
    520500    USE Vampir
    521501    implicit none
    522 #include "dimensions.h"
    523 #include "paramet.h"   
    524 #ifdef CPP_MPI
    525     include 'mpif.h'
    526 #endif   
     502      INCLUDE "dimensions.h"
     503      INCLUDE "paramet.h"   
    527504      INTEGER :: ij,ll
    528505      REAL, dimension(ij,ll) :: Field
    … …  
    533510      LOGICAL :: RecvUp,RecvDown
    534511      INTEGER, DIMENSION(4) :: Request
    535 #ifdef CPP_MPI
    536512      INTEGER, DIMENSION(MPI_STATUS_SIZE,4) :: Status
    537 #else
    538       INTEGER, DIMENSION(1,4) :: Status
    539 #endif
     513
    540514      INTEGER :: NbRequest
    541515      REAL, dimension(:),allocatable :: Buffer_Send_up,Buffer_Send_down
    … …  
    582556          call PACK_Data(Field(ij_begin,1),ij,ll,down,Buffer_Send_up)
    583557!$OMP CRITICAL (MPI)
    584 #ifdef CPP_MPI
    585558          call MPI_ISEND(Buffer_send_up,Buffer_Size,MPI_REAL8,MPI_Rank-1,1,     &
    586559                          COMM_LMDZ,Request(NbRequest),ierr)
    587 #endif
    588560!$OMP END CRITICAL (MPI)
    589561        ENDIF
    … …  
    597569       
    598570!$OMP CRITICAL (MPI)
    599 #ifdef CPP_MPI
    600571          call MPI_ISEND(Buffer_send_down,Buffer_Size,MPI_REAL8,MPI_Rank+1,1,     &
    601572                          COMM_LMDZ,Request(NbRequest),ierr)
    602 #endif
    603573!$OMP END CRITICAL (MPI)
    604574        ENDIF
    … …  
    611581             
    612582!$OMP CRITICAL (MPI)
    613 #ifdef CPP_MPI
    614583          call MPI_IRECV(Buffer_recv_up,Buffer_size,MPI_REAL8,MPI_Rank-1,1,  &
    615584                          COMM_LMDZ,Request(NbRequest),ierr)
    616 #endif
    617585!$OMP END CRITICAL (MPI)
    618586     
    … …  
    626594       
    627595!$OMP CRITICAL (MPI)
    628 #ifdef CPP_MPI
    629596          call MPI_IRECV(Buffer_recv_down,Buffer_size,MPI_REAL8,MPI_Rank+1,1,     &
    630597                          COMM_LMDZ,Request(NbRequest),ierr)
    631 #endif
    632598!$OMP END CRITICAL (MPI)
    633599       
    634600        ENDIF
    635601 
    636 #ifdef CPP_MPI
    637602        if (NbRequest > 0) call MPI_WAITALL(NbRequest,Request,Status,ierr)
    638 #endif
    639603        IF (RecvUp)  call Unpack_Data(Field(ij_begin-up*iip1,1),ij,ll,up,Buffer_Recv_up)
    640604        IF (RecvDown) call Unpack_Data(Field(ij_end+1,1),ij,ll,down,Buffer_Recv_down) 
    … …  
    651615
    652616    subroutine Gather_Field(Field,ij,ll,rank)
     617    USE lmdz_mpi
    653618    implicit none
    654 #include "dimensions.h"
    655 #include "paramet.h"
    656 #include "iniprint.h"
    657 #ifdef CPP_MPI
    658     include 'mpif.h'
    659 #endif   
     619    INCLUDE "dimensions.h"
     620    INCLUDE "paramet.h"
     621    INCLUDE "iniprint.h"
    660622      INTEGER :: ij,ll,rank
    661623      REAL, dimension(ij,ll) :: Field
    … …  
    709671 
    710672!$OMP CRITICAL (MPI)
    711 #ifdef CPP_MPI
    712673        call MPI_GATHERV(Buffer_send,(min(ij_end,ij)-ij_begin+1)*ll,MPI_REAL8,   &
    713674                          Buffer_Recv,Recv_count,displ,MPI_REAL8,rank,COMM_LMDZ,ierr)
    714 #endif
    715675!$OMP END CRITICAL (MPI)
    716676     
    … …  
    735695
    736696    subroutine AllGather_Field(Field,ij,ll)
     697    USE lmdz_mpi
    737698    implicit none
    738 #include "dimensions.h"
    739 #include "paramet.h"   
    740 #ifdef CPP_MPI
    741     include 'mpif.h'
    742 #endif   
     699    INCLUDE "dimensions.h"
     700    INCLUDE "paramet.h"   
    743701      INTEGER :: ij,ll
    744702      REAL, dimension(ij,ll) :: Field
    … …  
    748706        call Gather_Field(Field,ij,ll,0)
    749707!$OMP CRITICAL (MPI)
    750 #ifdef CPP_MPI
    751708      call MPI_BCAST(Field,ij*ll,MPI_REAL8,0,COMM_LMDZ,ierr)
    752 #endif
    753709!$OMP END CRITICAL (MPI)
    754710      ENDIF
    … …  
    757713   
    758714   subroutine Broadcast_Field(Field,ij,ll,rank)
     715    USE lmdz_mpi
    759716    implicit none
    760 #include "dimensions.h"
    761 #include "paramet.h"   
    762 #ifdef CPP_MPI
    763     include 'mpif.h'
    764 #endif   
     717    INCLUDE "dimensions.h"
     718    INCLUDE "paramet.h"   
    765719      INTEGER :: ij,ll
    766720      REAL, dimension(ij,ll) :: Field
    … …  
    771725     
    772726!$OMP CRITICAL (MPI)
    773 #ifdef CPP_MPI
    774727      call MPI_BCAST(Field,ij*ll,MPI_REAL8,rank,COMM_LMDZ,ierr)
    775 #endif
    776728!$OMP END CRITICAL (MPI)
    777729     
    … …  
    781733   
    782734!  Subroutine verif_hallo(Field,ij,ll,up,down)
     735!    USE lmdz_mpi
    783736!    implicit none
    784 !#include "dimensions.h"
    785 !#include "paramet.h"   
    786 !    include 'mpif.h'
     737!      INCLUDE "dimensions.h"
     738!      INCLUDE "paramet.h"   
    787739!   
    788740!      INTEGER :: ij,ll

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/pression_loc.F

    r1987 r4727  
    1414      IMPLICIT NONE
    1515c
    16 #include "dimensions.h"
    17 #include "paramet.h"
     16      INCLUDE "dimensions.h"
     17      INCLUDE "paramet.h"
    1818c
    1919      INTEGER,INTENT(IN) :: ngrid ! not used

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/rotat_nfil_loc.F

    r1907 r4727  
    1313      IMPLICIT NONE
    1414c
    15 #include "dimensions.h"
    16 #include "paramet.h"
    17 #include "comgeom.h"
     15      INCLUDE "dimensions.h"
     16      INCLUDE "paramet.h"
     17      INCLUDE "comgeom.h"
    1818c
    1919c   .....  variables en arguments  ......

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/rotat_p.F

    r1907 r4727  
    1313      IMPLICIT NONE
    1414c
    15 #include "dimensions.h"
    16 #include "paramet.h"
    17 #include "comgeom.h"
     15      INCLUDE "dimensions.h"
     16      INCLUDE "paramet.h"
     17      INCLUDE "comgeom.h"
    1818c
    1919c   .....  variables en arguments  ......

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/rotatf_loc.F

    r1907 r4727  
    1414      IMPLICIT NONE
    1515c
    16 #include "dimensions.h"
    17 #include "paramet.h"
    18 #include "comgeom.h"
     16      INCLUDE "dimensions.h"
     17      INCLUDE "paramet.h"
     18      INCLUDE "comgeom.h"
    1919c
    2020c   .....  variables en arguments  ......

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/temps_mod.F90

    r3579 r4727  
    1919  REAL      start_time
    2020  CHARACTER (len=10) :: calend ! calendar type
     21  INTEGER   offline_time ! offline frequency storage
    2122
    2223  ! Additionnal Mars stuff:

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/times.F90

    r4482 r4727  
    2727    USE parallel_lmdz
    2828    implicit none
    29 #include "dimensions.h"
    30 #include "paramet.h"
     29    INCLUDE "dimensions.h"
     30    INCLUDE "paramet.h"
    3131   
    3232    max_size=jjm+1
    … …  
    137137  subroutine allgather_timer
    138138    USE parallel_lmdz
    139     implicit none
    140 #ifdef CPP_MPI   
    141     include 'mpif.h'
    142 #endif
     139    USE lmdz_mpi
     140    implicit none
     141
    143142    integer :: ierr
    144143    integer :: data_size
    … …  
    155154   
    156155      tmp_table(:,:)=timer_table(:,:,mpi_rank)
    157 #ifdef CPP_MPI
    158156      call mpi_allgather(tmp_table(1,1),data_size,MPI_REAL_LMDZ,timer_table(1,1,0),data_size,MPI_REAL_LMDZ,COMM_LMDZ,ierr)
    159 #endif
    160157      tmp_table(:,:)=timer_table_sqr(:,:,mpi_rank)
    161 #ifdef CPP_MPI
    162158      call mpi_allgather(tmp_table(1,1),data_size,MPI_REAL_LMDZ,timer_table_sqr(1,1,0),data_size,MPI_REAL_LMDZ,COMM_LMDZ,ierr)
    163 #endif   
    164159      deallocate(tmp_table)
    165160   
    … …  
    172167  subroutine allgather_timer_average
    173168    USE parallel_lmdz
    174     implicit none
    175 #ifdef CPP_MPI
    176     include 'mpif.h'
    177 #endif
     169    USE lmdz_mpi
     170    implicit none
    178171    integer :: ierr
    179172    integer :: data_size
    … …  
    192185
    193186      tmp_table(:,:)=timer_average(:,:,mpi_rank)
    194 #ifdef CPP_MPI
    195187      call mpi_allgather(tmp_table(1,1),data_size,MPI_REAL_LMDZ,timer_average(1,1,0),data_size,MPI_REAL_LMDZ,COMM_LMDZ,ierr)
    196 #endif
    197188      tmp_table(:,:)=timer_delta(:,:,mpi_rank)
    198 #ifdef CPP_MPI
    199189      call mpi_allgather(tmp_table(1,1),data_size,MPI_REAL_LMDZ,timer_delta(1,1,0),data_size,MPI_REAL_LMDZ,COMM_LMDZ,ierr)
    200 #endif
    201190      tmp_iter(:,:)=timer_iteration(:,:,mpi_rank)
    202 #ifdef CPP_MPI
    203191      call mpi_allgather(tmp_iter(1,1),data_size,MPI_INTEGER,timer_iteration(1,1,0),data_size,MPI_INTEGER,COMM_LMDZ,ierr)
    204 #endif   
    205192      deallocate(tmp_table)
    206193   

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/top_bound_loc.F

    r2600 r4727  
    5454
    5555
    56 #include "comdissipn.h"
    57 #include "iniprint.h"
     56      INCLUDE "comdissipn.h"
     57      INCLUDE "iniprint.h"
    5858
    5959c   Arguments:

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/vlsplt_loc.F

    r4482 r4727  
    12071207c      SUBROUTINE minmaxq(zq,qmin,qmax,comment)
    12081208c
    1209 c#include "dimensions.h"
    1210 c#include "paramet.h"
     1209c      INCLUDE "dimensions.h"
     1210c      INCLUDE "paramet.h"
    12111211
    12121212c      CHARACTER*(*) comment

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/wrgrads.F

    r4482 r4727  
    1212c    titlevar   Titre
    1313
    14 #include "gradsdef.h"
     14      INCLUDE "gradsdef.h"
    1515
    1616c   arguments

  • LMDZ6/branches/LMDZ_ECRad/libf/dyn3dmem/writedyn_xios.F90

    r4146 r4727  
    55     &                           masse,ps,phis)
    66
    7 #ifdef CPP_XIOS
    8       USE xios
     7      USE lmdz_xios
    98      USE parallel_lmdz
    109      USE misc_mod
    … …  
    180179      CALL writefield_dyn_u('PS', ps(ijb:ije))
    181180
    182 #endif
    183 
    184181      END
Note: See TracChangeset for help on using the changeset viewer.