Changeset 1861


Ignore:
Timestamp:
Sep 10, 2013, 11:55:26 AM (11 years ago)
Author:
lguez
Message:

Replaced #include by include. (Use as little C preprocessing as possible.)

Location:
LMDZ5/trunk/libf/phylmd
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/phylmd/cv30_routines.F

    r1744 r1861  
    3030C   ***                     IT MUST BE LESS THAN 0              ***
    3131
    32 #include "cv30param.h"
    33 #include "conema3.h"
     32      include "cv30param.h"
     33      include "conema3.h"
    3434
    3535      integer nd
    … …  
    108108      real cpx(len,nd)
    109109
    110 #include "cvthermo.h"
    111 #include "cv30param.h"
     110      include "cvthermo.h"
     111      include "cv30param.h"
    112112
    113113
    … …  
    176176C================================================================
    177177
    178 #include "cv30param.h"
     178      include "cv30param.h"
    179179
    180180c inputs:
    … …  
    359359!----------------------------------------------------------------
    360360
    361 #include "cvthermo.h"
    362 #include "cv30param.h"
     361      include "cvthermo.h"
     362      include "cv30param.h"
    363363
    364364c inputs:
    … …  
    646646!-------------------------------------------------------------------
    647647
    648 #include "cv30param.h"
     648      include "cv30param.h"
    649649
    650650c input:
    … …  
    748748      implicit none
    749749
    750 #include "cv30param.h"
     750      include "cv30param.h"
    751751      include 'iniprint.h'
    752752
    … …  
    873873C---------------------------------------------------------------------
    874874
    875 #include "cvthermo.h"
    876 #include "cv30param.h"
    877 #include "conema3.h"
     875      include "cvthermo.h"
     876      include "cv30param.h"
     877      include "conema3.h"
    878878
    879879c inputs:
    … …  
    12331233!===================================================================
    12341234
    1235 #include "cvthermo.h"
    1236 #include "cv30param.h"
     1235      include "cvthermo.h"
     1236      include "cv30param.h"
    12371237
    12381238c input:
    … …  
    14431443!---------------------------------------------------------------------
    14441444
    1445 #include "cvthermo.h"
    1446 #include "cv30param.h"
     1445      include "cvthermo.h"
     1446      include "cv30param.h"
    14471447
    14481448c inputs:
    … …  
    18361836
    18371837
    1838 #include "cvthermo.h"
    1839 #include "cv30param.h"
    1840 #include "cvflag.h"
     1838      include "cvthermo.h"
     1839      include "cv30param.h"
     1840      include "cvflag.h"
    18411841
    18421842c inputs:
    … …  
    22002200      implicit none
    22012201
    2202 #include "cvthermo.h"
    2203 #include "cv30param.h"
    2204 #include "cvflag.h"
    2205 #include "conema3.h"
     2202      include "cvthermo.h"
     2203      include "cv30param.h"
     2204      include "cvflag.h"
     2205      include "conema3.h"
    22062206
    22072207c inputs:
    … …  
    30533053        implicit none
    30543054
    3055 #include "cv30param.h"
     3055      include "cv30param.h"
    30563056
    30573057c inputs:
    … …  
    31833183      implicit none
    31843184
    3185 #include "cv30param.h"
     3185      include "cv30param.h"
    31863186
    31873187c inputs:

  • LMDZ5/trunk/libf/phylmd/cv3_buoy.F

    r1515 r1861  
    1414      implicit none
    1515
    16 #include "cvthermo.h"
    17 #include "cv3param.h"
     16      include "cvthermo.h"
     17      include "cv3param.h"
    1818
    1919c input:

  • LMDZ5/trunk/libf/phylmd/cv3_cine.F

    r1403 r1861  
    1818      implicit none
    1919c
    20 #include "YOMCST.h"
    21 #include "cvthermo.h"
    22 #include "cv3param.h"
     20      include "YOMCST.h"
     21      include "cvthermo.h"
     22      include "cv3param.h"
    2323c input:
    2424      integer ncum, nd, nloc

  • LMDZ5/trunk/libf/phylmd/cv3_routines.F

    r1849 r1861  
    3030C   ***                     IT MUST BE LESS THAN 0              ***
    3131
    32 #include "cv3param.h"
    33 #include "conema3.h"
     32      include "cv3param.h"
     33      include "conema3.h"
    3434
    3535      integer nd
    … …  
    167167      real cpx(len,nd)
    168168
    169 #include "cvthermo.h"
    170 #include "cv3param.h"
     169      include "cvthermo.h"
     170      include "cv3param.h"
    171171
    172172
    … …  
    242242C================================================================
    243243
    244 #include "cv3param.h"
    245 #include "cvthermo.h"
     244      include "cv3param.h"
     245      include "cvthermo.h"
    246246
    247247c inputs:
    … …  
    434434!----------------------------------------------------------------
    435435
    436 #include "cvthermo.h"
    437 #include "cv3param.h"
     436      include "cvthermo.h"
     437      include "cv3param.h"
    438438
    439439c inputs:
    … …  
    715715!-------------------------------------------------------------------
    716716
    717 #include "cv3param.h"
     717      include "cv3param.h"
    718718
    719719c input:
    … …  
    818818      implicit none
    819819
    820 #include "cv3param.h"
     820      include "cv3param.h"
    821821      include 'iniprint.h'
    822822
    … …  
    975975C---------------------------------------------------------------------
    976976
    977 #include "cvthermo.h"
    978 #include "cv3param.h"
    979 #include "conema3.h"
    980 #include "cvflag.h"
     977      include "cvthermo.h"
     978      include "cv3param.h"
     979      include "conema3.h"
     980      include "cvflag.h"
    981981
    982982c inputs:
    … …  
    14541454!===================================================================
    14551455
    1456 #include "cvthermo.h"
    1457 #include "cv3param.h"
     1456      include "cvthermo.h"
     1457      include "cv3param.h"
    14581458
    14591459c input:
    … …  
    16971697!---------------------------------------------------------------------
    16981698
    1699 #include "cvthermo.h"
    1700 #include "cv3param.h"
    1701 #include "cvflag.h"
     1699      include "cvthermo.h"
     1700      include "cv3param.h"
     1701      include "cvflag.h"
    17021702
    17031703c inputs:
    … …  
    21192119
    21202120
    2121 #include "cvthermo.h"
    2122 #include "cv3param.h"
    2123 #include "cvflag.h"
     2121      include "cvthermo.h"
     2122      include "cv3param.h"
     2123      include "cvflag.h"
    21242124
    21252125c inputs:
    … …  
    27192719      implicit none
    27202720
    2721 #include "cvthermo.h"
    2722 #include "cv3param.h"
    2723 #include "cvflag.h"
    2724 #include "conema3.h"
     2721      include "cvthermo.h"
     2722      include "cv3param.h"
     2723      include "cvflag.h"
     2724      include "conema3.h"
    27252725
    27262726c inputs:
    … …  
    39413941        implicit none
    39423942
    3943 #include "cv3param.h"
     3943      include "cv3param.h"
    39443944
    39453945c inputs:
    … …  
    40534053      implicit none
    40544054
    4055 #include "cv3param.h"
     4055      include "cv3param.h"
    40564056
    40574057c inputs:

  • LMDZ5/trunk/libf/phylmd/cv3_vertmix.F

    r879 r1861  
    1919C===============================================================
    2020
    21 #include "cvthermo.h"
    22 #include "YOETHF.h"
    23 #include "YOMCST.h"
    24 #include "FCTTRE.h"
     21      include "cvthermo.h"
     22      include "YOETHF.h"
     23      include "YOMCST.h"
     24      include "FCTTRE.h"
    2525c input :
    2626      integer nd,len

  • LMDZ5/trunk/libf/phylmd/cv3p1_closure.F

    r1574 r1861  
    2323      implicit none
    2424
    25 #include "cvthermo.h"
    26 #include "cv3param.h"
    27 #include "YOMCST2.h"
    28 #include "YOMCST.h"
    29 #include "conema3.h"
    30 #include "iniprint.h"
     25      include "cvthermo.h"
     26      include "cv3param.h"
     27      include "YOMCST2.h"
     28      include "YOMCST.h"
     29      include "conema3.h"
     30      include "iniprint.h"
    3131
    3232c input:

  • LMDZ5/trunk/libf/phylmd/cv3p_mixing.F

    r1742 r1861  
    1515      implicit none
    1616c
    17 #include "cvthermo.h"
    18 #include "cv3param.h"
    19 #include "YOMCST2.h"
     17      include "cvthermo.h"
     18      include "cv3param.h"
     19      include "YOMCST2.h"
    2020
    2121c inputs:

  • LMDZ5/trunk/libf/phylmd/cv_routines.F

    r1403 r1861  
    3636C   ***                   (DAMP MUST BE LESS THAN 1)                 ***
    3737
    38 #include "cvparam.h"
     38      include "cvparam.h"
    3939      integer nd
    4040      CHARACTER (LEN=20) :: modname='cv_routines'
    … …  
    9494      real cpx(len,nd)
    9595
    96 #include "cvthermo.h"
    97 #include "cvparam.h"
     96      include "cvthermo.h"
     97      include "cvparam.h"
    9898
    9999
    … …  
    140140C================================================================
    141141
    142 #include "cvparam.h"
     142      include "cvparam.h"
    143143
    144144c inputs:
    … …  
    261261      implicit none
    262262
    263 #include "cvthermo.h"
    264 #include "cvparam.h"
     263      include "cvthermo.h"
     264      include "cvparam.h"
    265265
    266266c inputs:
    … …  
    377377!-------------------------------------------------------------------
    378378 
    379 #include "cvparam.h"
     379      include "cvparam.h"
    380380
    381381c inputs:
    … …  
    409409      implicit none
    410410
    411 #include "cvparam.h"
     411      include "cvparam.h"
    412412
    413413c inputs:
    … …  
    507507C---------------------------------------------------------------------
    508508
    509 #include "cvthermo.h"
    510 #include "cvparam.h"
     509      include "cvthermo.h"
     510      include "cvparam.h"
    511511
    512512c inputs:
    … …  
    796796      real work(nloc)
    797797
    798 #include "cvthermo.h"
    799 #include "cvparam.h"
     798      include "cvthermo.h"
     799      include "cvparam.h"
    800800
    801801c-------------------------------------------------------------------
    … …  
    866866      implicit none
    867867
    868 #include "cvthermo.h"
    869 #include "cvparam.h"
     868      include "cvthermo.h"
     869      include "cvparam.h"
    870870
    871871c inputs:
    … …  
    11261126
    11271127
    1128 #include "cvthermo.h"
    1129 #include "cvparam.h"
     1128      include "cvthermo.h"
     1129      include "cvparam.h"
    11301130
    11311131c inputs:
    … …  
    13301330      implicit none
    13311331
    1332 #include "cvthermo.h"
    1333 #include "cvparam.h"
     1332      include "cvthermo.h"
     1333      include "cvparam.h"
    13341334
    13351335c inputs
    … …  
    17201720      implicit none
    17211721
    1722 #include "cvparam.h"
     1722      include "cvparam.h"
    17231723
    17241724c inputs:

  • LMDZ5/trunk/libf/phylmd/thermcellV0_main.F90

    r1738 r1861  
    4141!   -------------
    4242
    43 #include "dimensions.h"
    44 #include "YOMCST.h"
    45 #include "YOETHF.h"
    46 #include "FCTTRE.h"
    47 #include "iniprint.h"
     43      include "dimensions.h"
     44      include "YOMCST.h"
     45      include "YOETHF.h"
     46      include "FCTTRE.h"
     47      include "iniprint.h"
    4848
    4949!   arguments:
    … …  
    796796      if (prt_level.ge.1) print*,'thermcell_main sorties 3D'
    797797#ifdef wrgrads_thermcell
    798 #include "thermcell_out3d.h"
     798      include "thermcell_out3d.h"
    799799#endif
    800800
    … …  
    811811      subroutine testV0_ltherm(klon,klev,pplev,pplay,long,seuil,ztv,po,ztva,zqla,f_star,zw2,comment)
    812812      IMPLICIT NONE
    813 #include "iniprint.h"
     813      include "iniprint.h"
    814814
    815815      integer i, k, klon,klev
    … …  
    855855      IMPLICIT NONE
    856856
    857 #include "iniprint.h"
    858 #include "thermcell.h"
     857      include "iniprint.h"
     858      include "thermcell.h"
    859859      INTEGER ngrid,nlay
    860860      INTEGER ig,k       
    … …  
    935935      IMPLICIT NONE
    936936
    937 #include "YOMCST.h"
    938 #include "YOETHF.h"
    939 #include "FCTTRE.h"
    940 #include "iniprint.h"
    941 #include "thermcell.h"
     937      include "YOMCST.h"
     938      include "YOETHF.h"
     939      include "FCTTRE.h"
     940      include "iniprint.h"
     941      include "thermcell.h"
    942942
    943943      INTEGER itap
    … …  
    17321732!--------------------------------------------------------------------------
    17331733       IMPLICIT NONE
    1734 #include "YOMCST.h"       
    1735 #include "iniprint.h"
     1734      include "YOMCST.h"       
     1735      include "iniprint.h"
    17361736       INTEGER l,ig
    17371737
    … …  
    19441944!----------------------------------------------------------------------
    19451945      IMPLICIT NONE
    1946 #include "iniprint.h"
    1947 #include "thermcell.h"
     1946      include "iniprint.h"
     1947      include "thermcell.h"
    19481948
    19491949      INTEGER l,ig

  • LMDZ5/trunk/libf/phylmd/wake.F

    r1649 r1861  
    116116c-------------------------------------------------------------------------
    117117
    118 #include "dimensions.h"
    119 #include "YOMCST.h"
    120 #include "cvthermo.h"
    121 #include "iniprint.h"
     118      include "dimensions.h"
     119      include "YOMCST.h"
     120      include "cvthermo.h"
     121      include "iniprint.h"
    122122
    123123c Arguments en entree
    … …  
    19421942c-------------------------------------------------------------------------
    19431943
    1944 #include "dimensions.h"
    1945 cccc#include "dimphy.h"
    1946 #include "YOMCST.h"
    1947 #include "cvthermo.h"
    1948 #include "iniprint.h"
     1944      include "dimensions.h"
     1945cccc      include "dimphy.h"
     1946      include "YOMCST.h"
     1947      include "cvthermo.h"
     1948      include "iniprint.h"
    19491949
    19501950c Arguments en entree
Note: See TracChangeset for help on using the changeset viewer.