Ignore:
Timestamp:
Jun 29, 2023, 3:55:54 PM (17 months ago)
Author:
yann meurdesoif
Message:

Replace #include (c preprocessor) by INCLUDE (fortran keyword)

in phylmd (except rrtm and ecrad) filtrez, dy3dmem and dyn3dcommon

Other directories will follow
YM

Location:
LMDZ6/trunk/libf/phylmd/dyn1d
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h

    r4292 r4593  
    1 #include "conf_gcm.F90"
     1      INCLUDE "conf_gcm.F90"
    22
    33!
    … …  
    2222!   --------------
    2323
    24 #include "compar1d.h"
    25 #include "flux_arp.h"
    26 #include "tsoilnudge.h"
    27 #include "fcg_gcssold.h"
    28 #include "fcg_racmo.h"
     24      INCLUDE "compar1d.h"
     25      INCLUDE "flux_arp.h"
     26      INCLUDE "tsoilnudge.h"
     27      INCLUDE "fcg_gcssold.h"
     28      INCLUDE "fcg_racmo.h"
    2929!
    3030!
    … …  
    681681!   -------------
    682682      include "dimensions.h"
    683 !!#include "control.h"
     683!!      INCLUDE "control.h"
    684684      include "netcdf.inc"
    685685
    … …  
    828828!   -------------
    829829      include "dimensions.h"
    830 !!#include "control.h"
     830!!      INCLUDE "control.h"
    831831      include "netcdf.inc"
    832832
    … …  
    13541354!---------------------------------------------------------------------- 
    13551355        implicit none
    1356 #include "YOMCST.h"
     1356        INCLUDE "YOMCST.h"
    13571357!        argument
    13581358        integer llm
    … …  
    14281428!---------------------------------------------------------------------- 
    14291429        implicit none
    1430 #include "YOMCST.h"
     1430        INCLUDE "YOMCST.h"
    14311431!        argument
    14321432        integer llm,nqtot
    … …  
    17491749       implicit none
    17501750 
    1751 #include "YOMCST.h"
    1752 #include "dimensions.h"
     1751       INCLUDE "YOMCST.h"
     1752       INCLUDE "dimensions.h"
    17531753
    17541754!-------------------------------------------------------------------------

  • LMDZ6/trunk/libf/phylmd/dyn1d/1D_decl_cases.h

    r4104 r4593  
    1 #include "netcdf.inc"
     1        INCLUDE "netcdf.inc"
    22
    33! Declarations specifiques au cas Toga

  • LMDZ6/trunk/libf/phylmd/dyn1d/1Dconv.h

    r2310 r4593  
    1313!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
    1414
    15 #include "YOMCST.h"
     15      INCLUDE "YOMCST.h"
    1616
    1717      INTEGER klev
    … …  
    461461      implicit none
    462462
    463 #include "dimensions.h"
    464 !cccc#include "dimphy.h"
     463      INCLUDE "dimensions.h"
     464!cccc      INCLUDE "dimphy.h"
    465465
    466466      integer k

  • LMDZ6/trunk/libf/phylmd/dyn1d/lmdz1d.F90

    r3541 r4593  
    33!
    44!#ifdef CPP_1D
    5 !#include "../dyn3d/mod_const_mpi.F90"
    6 !#include "../dyn3d_common/control_mod.F90"
    7 !#include "../dyn3d_common/infotrac.F90"
    8 !#include "../dyn3d_common/disvert.F90"
     5!include "../dyn3d/mod_const_mpi.F90"
     6!include "../dyn3d_common/control_mod.F90"
     7!include "../dyn3d_common/infotrac.F90"
     8!include "../dyn3d_common/disvert.F90"
    99
    1010
    … …  
    2626
    2727
    28 #include "1DUTILS.h"
    29 #include "1Dconv.h"
     28   INCLUDE "1DUTILS.h"
     29   INCLUDE "1Dconv.h"
    3030
    3131!#endif

  • LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_amma_read.F90

    r2373 r4593  
    5959      implicit none
    6060
    61 #include "netcdf.inc"
     61      INCLUDE "netcdf.inc"
    6262
    6363      INTEGER nid,rid,ierr
    … …  
    180180!program reading forcings of the AMMA case study
    181181      implicit none
    182 #include "netcdf.inc"
     182      INCLUDE "netcdf.inc"
    183183
    184184      integer ntime,nlevel
    … …  
    407407!---------------------------------------------------------------------------------------
    408408
    409 #include "compar1d.h"
     409        INCLUDE "compar1d.h"
    410410
    411411! inputs:

  • LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read.F90

    r2373 r4593  
    9090      implicit none
    9191
    92 #include "netcdf.inc"
     92      INCLUDE "netcdf.inc"
    9393
    9494      INTEGER nid,rid,ierr
    … …  
    267267!program reading forcing of the case study
    268268      implicit none
    269 #include "netcdf.inc"
     269      INCLUDE "netcdf.inc"
    270270
    271271      integer ntime,nlevel
    … …  
    994994!---------------------------------------------------------------------------------------
    995995
    996 #include "compar1d.h"
    997 #include "date_cas.h"
     996        INCLUDE "compar1d.h"
     997        INCLUDE "date_cas.h"
    998998
    999999! inputs:

  • LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read2.F90

    r4558 r4593  
    8181    implicit none
    8282
    83 #include "netcdf.inc"
     83    INCLUDE "netcdf.inc"
    8484
    8585    INTEGER nid,rid,ierr
    … …  
    192192    implicit none
    193193
    194 #include "netcdf.inc"
     194    INCLUDE "netcdf.inc"
    195195
    196196    INTEGER nid,rid,ierr
    … …  
    320320    implicit none
    321321
    322 #include "netcdf.inc"
    323 #include "date_cas.h"
     322    INCLUDE "netcdf.inc"
     323    INCLUDE "date_cas.h"
    324324
    325325    INTEGER nid,rid,ierr
    … …  
    543543  use netcdf, only: nf90_get_var
    544544  implicit none
    545 #include "netcdf.inc"
     545  INCLUDE "netcdf.inc"
    546546
    547547  integer ntime,nlevel
    … …  
    660660  use netcdf, only: nf90_get_var
    661661  implicit none
    662 #include "netcdf.inc"
     662  INCLUDE "netcdf.inc"
    663663
    664664  integer ntime,nlevel
    … …  
    831831  use netcdf, only: nf90_get_var
    832832  implicit none
    833 #include "netcdf.inc"
     833  INCLUDE "netcdf.inc"
    834834
    835835  integer ntime,nlevel,k,t
    … …  
    10611061  !---------------------------------------------------------------------------------------
    10621062
    1063 #include "compar1d.h"
    1064 #include "date_cas.h"
     1063  INCLUDE "compar1d.h"
     1064  INCLUDE "date_cas.h"
    10651065
    10661066  ! inputs:
    … …  
    12701270  !---------------------------------------------------------------------------------------
    12711271
    1272 #include "compar1d.h"
    1273 #include "date_cas.h"
     1272  INCLUDE "compar1d.h"
     1273  INCLUDE "date_cas.h"
    12741274
    12751275  ! inputs:

  • LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90

    r4297 r4593  
    9090    implicit none
    9191
    92 #include "netcdf.inc"
    93 #include "date_cas.h"
     92    INCLUDE "netcdf.inc"
     93    INCLUDE "date_cas.h"
    9494
    9595    INTEGER nid,rid,ierr
    … …  
    331331    use netcdf, only: nf90_get_var
    332332    implicit none
    333 #include "netcdf.inc"
    334 #include "compar1d.h"
     333    INCLUDE "netcdf.inc"
     334    INCLUDE "compar1d.h"
    335335
    336336    integer ntime,nlevel,k,t
    … …  
    671671    !---------------------------------------------------------------------------------------
    672672
    673 #include "compar1d.h"
    674 #include "date_cas.h"
     673    INCLUDE "compar1d.h"
     674    INCLUDE "date_cas.h"
    675675
    676676    ! inputs:
    … …  
    934934    implicit none
    935935
    936 #include "YOMCST.h"
    937 #include "dimensions.h"
     936    INCLUDE "YOMCST.h"
     937    INCLUDE "dimensions.h"
    938938
    939939    !-------------------------------------------------------------------------

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_1DUTILS_read_interp.h

    r4274 r4593  
    150150      implicit none
    151151
    152 #include "netcdf.inc"
     152      INCLUDE "netcdf.inc"
    153153
    154154      integer ntime,nlevel
    … …  
    495495
    496496         implicit none
    497 #include "netcdf.inc"
     497         INCLUDE "netcdf.inc"
    498498         integer nid,ttm,llm
    499499         real*8 time(ttm)
    … …  
    545545       implicit none
    546546
    547 #include "dimensions.h"
     547      INCLUDE "dimensions.h"
    548548
    549549!-------------------------------------------------------------------------
    … …  
    659659       implicit none
    660660
    661 #include "dimensions.h"
     661      INCLUDE "dimensions.h"
    662662
    663663!-------------------------------------------------------------------------
    … …  
    781781! Read RICO forcing data
    782782!-------------------------------------------------------------------------
    783 #include "dimensions.h"
     783      INCLUDE "dimensions.h"
    784784
    785785
    … …  
    10571057       implicit none
    10581058 
    1059 #include "dimensions.h"
     1059      INCLUDE "dimensions.h"
    10601060
    10611061!-------------------------------------------------------------------------
    … …  
    11791179       implicit none
    11801180 
    1181 #include "dimensions.h"
     1181       INCLUDE "dimensions.h"
    11821182
    11831183!-------------------------------------------------------------------------
    … …  
    13381338       implicit none
    13391339 
    1340 #include "dimensions.h"
     1340       INCLUDE "dimensions.h"
    13411341
    13421342!-------------------------------------------------------------------------
    … …  
    15611561!---------------------------------------------------------------------------------------
    15621562
    1563 #include "compar1d.h"
     1563        INCLUDE "compar1d.h"
    15641564
    15651565! inputs:
    … …  
    17031703!---------------------------------------------------------------------------------------
    17041704
    1705 #include "compar1d.h"
     1705        INCLUDE "compar1d.h"
    17061706
    17071707! inputs:
    … …  
    18161816!---------------------------------------------------------------------------------------
    18171817
    1818 #include "compar1d.h"
     1818        INCLUDE "compar1d.h"
    18191819
    18201820! inputs:
    … …  
    21732173      implicit none
    21742174
    2175 #include "netcdf.inc"
     2175      INCLUDE "netcdf.inc"
    21762176
    21772177      integer ntime,nlevel
    … …  
    23852385      implicit none
    23862386
    2387 #include "netcdf.inc"
    2388 #include "YOMCST.h"
     2387      INCLUDE "netcdf.inc"
     2388      INCLUDE "YOMCST.h"
    23892389
    23902390      integer ntime,nlevel
    … …  
    27192719      implicit none
    27202720
    2721 #include "netcdf.inc"
     2721      INCLUDE "netcdf.inc"
    27222722
    27232723      integer ntime,nlevel,nsol
    … …  
    29602960     
    29612961      parameter (ncm_1=49180)
    2962 #include "YOMCST.h"
     2962      INCLUDE "YOMCST.h"
    29632963
    29642964      real albsfc(ncm_1), albsfc_w(ncm_1)
    … …  
    30643064      SUBROUTINE read_rtmip(nlev_rtmip,play,plev,t,h2o,o3)
    30653065     
    3066 #include "YOMCST.h"
     3066      INCLUDE "YOMCST.h"
    30673067
    30683068      real t(nlev_rtmip), pt(nlev_rtmip),pb(nlev_rtmip),h2o(nlev_rtmip), o3(nlev_rtmip)

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_1D_decl_cases.h

    r3780 r4593  
    1 #include "netcdf.inc"
     1         INCLUDE "netcdf.inc"
    22
    33! Declarations specifiques au cas Toga

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.F90

    r4558 r4593  
    4747
    4848      implicit none
    49 #include "dimensions.h"
    50 #include "YOMCST.h"
    51 !!#include "control.h"
    52 #include "clesphys.h"
    53 #include "dimsoil.h"
    54 !#include "indicesol.h"
    55 
    56 #include "compar1d.h"
    57 #include "flux_arp.h"
    58 #include "date_cas.h"
    59 #include "tsoilnudge.h"
    60 #include "fcg_gcssold.h"
    61 !!!#include "fbforcing.h"
    62 #include "compbl.h"
     49      INCLUDE "dimensions.h"
     50      INCLUDE "YOMCST.h"
     51!!      INCLUDE "control.h"
     52      INCLUDE "clesphys.h"
     53      INCLUDE "dimsoil.h"
     54!      INCLUDE "indicesol.h"
     55
     56      INCLUDE "compar1d.h"
     57      INCLUDE "flux_arp.h"
     58      INCLUDE "date_cas.h"
     59      INCLUDE "tsoilnudge.h"
     60      INCLUDE "fcg_gcssold.h"
     61!!!      INCLUDE "fbforcing.h"
     62      INCLUDE "compbl.h"
    6363
    6464!=====================================================================
    … …  
    163163!=====================================================================
    164164!
    165 #include "old_1D_decl_cases.h"
     165      INCLUDE "old_1D_decl_cases.h"
    166166!
    167167!---------------------------------------------------------------------
    … …  
    721721!=====================================================================
    722722
    723 #include "old_1D_read_forc_cases.h"
     723      INCLUDE "old_1D_read_forc_cases.h"
    724724
    725725      if (forcing_GCM2SCM) then
    … …  
    10691069!---------------------------------------------------------------------
    10701070
    1071 #include "old_1D_interp_cases.h"
     1071      INCLUDE "old_1D_interp_cases.h"
    10721072
    10731073      if (forcing_GCM2SCM) then
    … …  
    12571257! au dessus de 700hpa, on relaxe vers les profils initiaux
    12581258      if (forcing_sandu .OR. forcing_astex) then
    1259 #include "1D_nudge_sandu_astex.h"
     1259      INCLUDE "1D_nudge_sandu_astex.h"
    12601260      else
    12611261        u(1:mxcalc)=u(1:mxcalc) + timestep*(                                &
    … …  
    13621362        END SUBROUTINE old_lmdz1d
    13631363
    1364 #include "old_1DUTILS_read_interp.h"
     1364        INCLUDE "old_1DUTILS_read_interp.h"

  • LMDZ6/trunk/libf/phylmd/dyn1d/replay1d.F90

    r4589 r4593  
    1111
    1212      implicit none
    13 #include "dimensions.h"
     13      INCLUDE "dimensions.h"
    1414
    1515real :: airefi

  • LMDZ6/trunk/libf/phylmd/dyn1d/scm.F90

    r4553 r4593  
    4343
    4444      implicit none
    45 #include "dimensions.h"
    46 #include "YOMCST.h"
    47 !!#include "control.h"
    48 #include "clesphys.h"
    49 #include "dimsoil.h"
    50 !#include "indicesol.h"
    51 
    52 #include "compar1d.h"
    53 #include "flux_arp.h"
    54 #include "date_cas.h"
    55 #include "tsoilnudge.h"
    56 #include "fcg_gcssold.h"
    57 #include "compbl.h"
     45      INCLUDE "dimensions.h"
     46      INCLUDE "YOMCST.h"
     47!!      INCLUDE "control.h"
     48      INCLUDE "clesphys.h"
     49      INCLUDE "dimsoil.h"
     50!      INCLUDE "indicesol.h"
     51
     52      INCLUDE "compar1d.h"
     53      INCLUDE "flux_arp.h"
     54      INCLUDE "date_cas.h"
     55      INCLUDE "tsoilnudge.h"
     56      INCLUDE "fcg_gcssold.h"
     57      INCLUDE "compbl.h"
    5858
    5959!=====================================================================
    … …  
    129129!=====================================================================
    130130!
    131 #include "1D_decl_cases.h"
     131      INCLUDE "1D_decl_cases.h"
    132132!
    133133!---------------------------------------------------------------------
    … …  
    489489!=====================================================================
    490490
    491 #include "1D_read_forc_cases.h"
     491      INCLUDE "1D_read_forc_cases.h"
    492492   print*,'A d_t_adv ',d_t_adv(1:20)*86400
    493493
    … …  
    807807!---------------------------------------------------------------------
    808808
    809 #include "1D_interp_cases.h"
     809      INCLUDE "1D_interp_cases.h"
    810810
    811811!---------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.