Changeset 793 for LMDZ4/trunk


Ignore:
Timestamp:
Jun 22, 2007, 2:49:51 PM (18 years ago)
Author:
Laurent Fairhead
Message:

Modifications suite a la transformation des fichiers include pour
qu'ils soient compatibles a la fois au format fixe et au format libre
Un bon nombre de fichiers *.inc du coup disparaissent
LF

Location:
LMDZ4/trunk/libf/phylmd
Files:
4 deleted
36 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/trunk/libf/phylmd/FCTTRE.h

    r524 r793  
    22! $Header$
    33!
    4 C     ------------------------------------------------------------------
    5 C     This COMDECK includes the Thermodynamical functions for the cy39
    6 C       ECMWF Physics package.
    7 C       Consistent with YOMCST Basic physics constants, assuming the
    8 C       partial pressure of water vapour is given by a first order
    9 C       Taylor expansion of Qs(T) w.r.t. to Temperature, using constants
    10 C       in YOETHF
    11 C     ------------------------------------------------------------------
     4!
     5!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     6!                 veillez  n'utiliser que des ! pour les commentaires
     7!                 et  bien positionner les & des lignes de continuation
     8!                 (les placer en colonne 6 et en colonne 73)
     9!
     10!     ------------------------------------------------------------------
     11!     This COMDECK includes the Thermodynamical functions for the cy39
     12!       ECMWF Physics package.
     13!       Consistent with YOMCST Basic physics constants, assuming the
     14!       partial pressure of water vapour is given by a first order
     15!       Taylor expansion of Qs(T) w.r.t. to Temperature, using constants
     16!       in YOETHF
     17!     ------------------------------------------------------------------
    1218      REAL PTARG, PDELARG, P5ARG, PQSARG, PCOARG
    1319      REAL FOEEW, FOEDE, qsats, qsatl, dqsats, dqsatl
    1420      LOGICAL thermcep
    1521      PARAMETER (thermcep=.TRUE.)
    16 C
    17       FOEEW ( PTARG,PDELARG ) = EXP (
    18      S          (R3LES*(1.-PDELARG)+R3IES*PDELARG) * (PTARG-RTT)
    19      S / (PTARG-(R4LES*(1.-PDELARG)+R4IES*PDELARG)) )
    20 C
    21       FOEDE ( PTARG,PDELARG,P5ARG,PQSARG,PCOARG ) = PQSARG*PCOARG*P5ARG
    22      S / (PTARG-(R4LES*(1.-PDELARG)+R4IES*PDELARG))**2
    23 c
    24       qsats(ptarg) = 100.0 * 0.622 * 10.0
    25      .           ** (2.07023 - 0.00320991 * ptarg
    26      .           - 2484.896 / ptarg + 3.56654 * LOG10(ptarg))
    27       qsatl(ptarg) = 100.0 * 0.622 * 10.0
    28      .           ** (23.8319 - 2948.964 / ptarg
    29      .           - 5.028 * LOG10(ptarg)
    30      .           - 29810.16 * EXP( - 0.0699382 * ptarg)
    31      .           + 25.21935 * EXP( - 2999.924 / ptarg))
    32 c
    33       dqsats(ptarg,pqsarg) = RLVTT/RCPD*pqsarg * (3.56654/ptarg
    34      .                     +2484.896*LOG(10.)/ptarg**2
    35      .                     -0.00320991*LOG(10.))
    36       dqsatl(ptarg,pqsarg) = RLVTT/RCPD*pqsarg*LOG(10.)*
    37      .                (2948.964/ptarg**2-5.028/LOG(10.)/ptarg
    38      .                +25.21935*2999.924/ptarg**2*EXP(-2999.924/ptarg)
    39      .                +29810.16*0.0699382*EXP(-0.0699382*ptarg))
     22!
     23      FOEEW ( PTARG,PDELARG ) = EXP (                                   &
     24     &          (R3LES*(1.-PDELARG)+R3IES*PDELARG) * (PTARG-RTT)        &
     25     & / (PTARG-(R4LES*(1.-PDELARG)+R4IES*PDELARG)) )
     26!
     27      FOEDE ( PTARG,PDELARG,P5ARG,PQSARG,PCOARG ) = PQSARG*PCOARG*P5ARG &
     28     & / (PTARG-(R4LES*(1.-PDELARG)+R4IES*PDELARG))**2
     29!
     30      qsats(ptarg) = 100.0 * 0.622 * 10.0                               &
     31     &           ** (2.07023 - 0.00320991 * ptarg                       &
     32     &           - 2484.896 / ptarg + 3.56654 * LOG10(ptarg))
     33      qsatl(ptarg) = 100.0 * 0.622 * 10.0                               &
     34     &           ** (23.8319 - 2948.964 / ptarg                         &
     35     &           - 5.028 * LOG10(ptarg)                                 &
     36     &           - 29810.16 * EXP( - 0.0699382 * ptarg)                 &
     37     &           + 25.21935 * EXP( - 2999.924 / ptarg))
     38!
     39      dqsats(ptarg,pqsarg) = RLVTT/RCPD*pqsarg * (3.56654/ptarg         &
     40     &                     +2484.896*LOG(10.)/ptarg**2                  &
     41     &                     -0.00320991*LOG(10.))
     42      dqsatl(ptarg,pqsarg) = RLVTT/RCPD*pqsarg*LOG(10.)*                &
     43     &                (2948.964/ptarg**2-5.028/LOG(10.)/ptarg           &
     44     &                +25.21935*2999.924/ptarg**2*EXP(-2999.924/ptarg)  &
     45     &                +29810.16*0.0699382*EXP(-0.0699382*ptarg))

  • LMDZ4/trunk/libf/phylmd/YOETHF.h

    r776 r793  
    22! $Header$
    33!
    4 C*    COMMON *YOETHF* DERIVED CONSTANTS SPECIFIC TO ECMWF THERMODYNAMICS
    5 C
    6 C     *R__ES*   *CONSTANTS USED FOR COMPUTATION OF SATURATION
    7 C                MIXING RATIO OVER LIQUID WATER(*R_LES*) OR
    8 C                ICE(*R_IES*).
    9 C     *RVTMP2*  *RVTMP2=RCPV/RCPD-1.
    10 C     *RHOH2O*  *DENSITY OF LIQUID WATER.   (RATM/100.)
    11 C
     4!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     5!                 veillez  n'utiliser que des ! pour les commentaires
     6!                 et  bien positionner les & des lignes de continuation
     7!                 (les placer en colonne 6 et en colonne 73)
     8!
     9!*    COMMON *YOETHF* DERIVED CONSTANTS SPECIFIC TO ECMWF THERMODYNAMICS
     10!
     11!     *R__ES*   *CONSTANTS USED FOR COMPUTATION OF SATURATION
     12!                MIXING RATIO OVER LIQUID WATER(*R_LES*) OR
     13!                ICE(*R_IES*).
     14!     *RVTMP2*  *RVTMP2=RCPV/RCPD-1.
     15!     *RHOH2O*  *DENSITY OF LIQUID WATER.   (RATM/100.)
     16!
    1217      REAL R2ES, R3LES, R3IES, R4LES, R4IES, R5LES, R5IES
    1318      REAL RVTMP2, RHOH2O
    14       COMMON /YOETHF/R2ES, R3LES, R3IES, R4LES, R4IES, R5LES, R5IES,
    15      .               RVTMP2, RHOH2O
     19      COMMON /YOETHF/R2ES, R3LES, R3IES, R4LES, R4IES, R5LES, R5IES,    &
     20     &               RVTMP2, RHOH2O
    1621!$OMP THREADPRIVATE(/YOETHF/)

  • LMDZ4/trunk/libf/phylmd/YOMCST.h

    r776 r793  
    11!
    22! $Header$
     3!
     4!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     5!                 veillez à n'utiliser que des ! pour les commentaires
     6!                 et à bien positionner les & des lignes de continuation
     7!                 (les placer en colonne 6 et en colonne 73)
     8!
    39!
    410! A1.0 Fundamental constants
    … …  
    2430      REAL RALPD,RBETD,RGAMD
    2531!
    26 !    S      ,RSIGMA,RI0
    27       COMMON/YOMCST/RPI   ,RCLUM ,RHPLA ,RKBOL ,RNAVO
    28      S      ,RDAY  ,REA   ,REPSM ,RSIYEA,RSIDAY,ROMEGA
    29      S      ,R_ecc, R_peri, R_incl
    30      S      ,RA    ,RG    ,R1SA
    31      S      ,RSIGMA
    32      S      ,R     ,RMD   ,RMO3  ,RMV   ,RD    ,RV    ,RCPD
    33      S      ,RCPV  ,RCVD  ,RCVV  ,RKAPPA,RETV
    34      S      ,RCW   ,RCS
    35      S      ,RLVTT ,RLSTT ,RLMLT ,RTT   ,RATM
    36      S      ,RESTT ,RALPW ,RBETW ,RGAMW ,RALPS ,RBETS ,RGAMS
    37      S      ,RALPD ,RBETD ,RGAMD
     32      COMMON/YOMCST/RPI   ,RCLUM ,RHPLA ,RKBOL ,RNAVO                   &
     33     &      ,RDAY  ,REA   ,REPSM ,RSIYEA,RSIDAY,ROMEGA                  &
     34     &      ,R_ecc, R_peri, R_incl                                      &
     35     &      ,RA    ,RG    ,R1SA                                         &
     36     &      ,RSIGMA                                                     &
     37     &      ,R     ,RMD   ,RMO3  ,RMV   ,RD    ,RV    ,RCPD             &
     38     &      ,RCPV  ,RCVD  ,RCVV  ,RKAPPA,RETV                           &
     39     &      ,RCW   ,RCS                                                 &
     40     &      ,RLVTT ,RLSTT ,RLMLT ,RTT   ,RATM                           &
     41     &      ,RESTT ,RALPW ,RBETW ,RGAMW ,RALPS ,RBETS ,RGAMS            &
     42     &      ,RALPD ,RBETD ,RGAMD
    3843!    ------------------------------------------------------------------
    3944!$OMP THREADPRIVATE(/YOMCST/)

  • LMDZ4/trunk/libf/phylmd/atm2geo.F

    r776 r793  
    77      USE mod_phys_lmdz_para
    88      IMPLICIT NONE
    9       include 'dimensions90.h'
     9      include 'dimensions.h'
    1010cc
    1111cc Change wind local atmospheric coordinates to

  • LMDZ4/trunk/libf/phylmd/calbeta.F90

    r782 r793  
    1414! Calculer quelques parametres pour appliquer la couche limite
    1515! ------------------------------------------------------------
    16   INCLUDE "indicesol.inc"
     16  INCLUDE "indicesol.h"
    1717 
    1818! Variables d'entrees

  • LMDZ4/trunk/libf/phylmd/calcul_fluxs_mod.F90

    r782 r793  
    4949!
    5050
    51     INCLUDE "YOETHF.inc"
    52     INCLUDE "FCTTRE.inc"
    53     INCLUDE "indicesol.inc"
    54     INCLUDE "YOMCST.inc"
     51    INCLUDE "YOETHF.h"
     52    INCLUDE "FCTTRE.h"
     53    INCLUDE "indicesol.h"
     54    INCLUDE "YOMCST.h"
    5555
    5656! Parametres d'entree

  • LMDZ4/trunk/libf/phylmd/clcdrag.F90

    r524 r793  
    1616! klon----input-I- dimension de la grille physique (= nb_pts_latitude X nb_pts_longitude)
    1717! knon----input-I- nombre de points pour un type de surface
    18 ! nsrf----input-I- indice pour le type de surface; voir indicesol.inc
     18! nsrf----input-I- indice pour le type de surface; voir indicesol.h
    1919! zxli----input-L- calcul des cdrags selon Laurent Li
    2020! u-------input-R- vent zonal au 1er niveau du modele
    … …  
    3838! ================================================================= c
    3939!
    40 #include "YOMCST.inc"
    41 #include "YOETHF.inc"
    42 #include "indicesol.inc"
     40      INCLUDE "YOMCST.h"
     41      INCLUDE "YOETHF.h"
     42      INCLUDE "indicesol.h"
    4343!
    4444! Quelques constantes et options:

  • LMDZ4/trunk/libf/phylmd/clesphys.h

    r766 r793  
    22! $Header$
    33!
    4 c..include cles_phys.h
    5 c
     4!
     5!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     6!                 veillez à n'utiliser que des ! pour les commentaires
     7!                 et à bien positionner les & des lignes de continuation
     8!                 (les placer en colonne 6 et en colonne 73)
     9!
     10!..include cles_phys.h
     11!
    612       LOGICAL cycle_diurne,soil_model,new_oliq,ok_orodr,ok_orolf
    713       LOGICAL ok_limitvrai
    … …  
    1117       REAL*8 CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
    1218
    13 cOM ---> correction du bilan d'eau global
    14 cOM Correction sur precip KE
     19!OM ---> correction du bilan d'eau global
     20!OM Correction sur precip KE
    1521       REAL cvl_corr
    16 cOM Fonte calotte dans bilan eau
     22!OM Fonte calotte dans bilan eau
    1723       LOGICAL ok_lic_melt
    1824
    19 cIM simulateur ISCCP
     25!IM simulateur ISCCP
    2026       INTEGER top_height, overlap
    21 cIM seuils cdrm, cdrh
     27!IM seuils cdrm, cdrh
    2228       REAL cdmmax, cdhmax
    23 cIM param. stabilite s/ terres et en dehors
     29!IM param. stabilite s/ terres et en dehors
    2430       REAL ksta, ksta_ter
    25 cIM ok_kzmin : clef calcul Kzmin dans la CL de surface cf FH
     31!IM ok_kzmin : clef calcul Kzmin dans la CL de surface cf FH
    2632       LOGICAL ok_kzmin
    27 cIM lev_histhf  : niveau sorties 6h
    28 cIM lev_histday : niveau sorties journalieres
    29 cIM lev_histmth : niveau sorties mensuelles
     33!IM lev_histhf  : niveau sorties 6h
     34!IM lev_histday : niveau sorties journalieres
     35!IM lev_histmth : niveau sorties mensuelles
    3036       INTEGER lev_histhf, lev_histday, lev_histmth
    3137       CHARACTER*4 type_run
    … …  
    3844       LOGICAL ok_slab_sicOBS
    3945
    40        COMMON/clesphys/cycle_diurne, soil_model, new_oliq,
    41      S     ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad, iflag_con
    42      S     , co2_ppm, solaire, RCO2, RCH4, RN2O, RCFC11, RCFC12
    43      S     , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
    44      S     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter
    45      S     , ok_kzmin, lev_histhf, lev_histday, lev_histmth
    46      S     , type_run, ok_isccp, ok_regdyn
    47      S     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins
    48      S     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day
    49      S     , ecrit_mth, ecrit_tra, ecrit_reg
    50      S     , freqin_isccp, freqout_isccp, ip_ebil_phy
    51      S     , ok_slab_sicOBS, ok_lic_melt, cvl_corr
     46       COMMON/clesphys/cycle_diurne, soil_model, new_oliq,              &
     47     &     ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad, iflag_con       &
     48     &     , co2_ppm, solaire, RCO2, RCH4, RN2O, RCFC11, RCFC12         &
     49     &     , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
     50     &     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter        &
     51     &     , ok_kzmin, lev_histhf, lev_histday, lev_histmth             &
     52     &     , type_run, ok_isccp, ok_regdyn                              &
     53     &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
     54     &     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day               &
     55     &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
     56     &     , freqin_isccp, freqout_isccp, ip_ebil_phy                   &
     57     &     , ok_slab_sicOBS, ok_lic_melt, cvl_corr
    5258     
    53 c$OMP THREADPRIVATE(/clesphys/)
     59!$OMP THREADPRIVATE(/clesphys/)
    5460 

  • LMDZ4/trunk/libf/phylmd/climb_hq_mod.F90

    r782 r793  
    2828       petAcoef, peqAcoef, petBcoef, peqBcoef)
    2929
    30     INCLUDE "YOMCST.inc"
     30    INCLUDE "YOMCST.h"
    3131! This routine calculates recursivly the coefficients C and D
    3232! for the quantity X=[Q,H] in equation X(k) = C(k) + D(k)*X(k-1), where k is
    … …  
    183183! where X is H or Q, and k the vertical level k=1,klev
    184184!
    185     INCLUDE "YOMCST.inc"
     185    INCLUDE "YOMCST.h"
    186186! Input arguments
    187187!****************************************************************************************
    … …  
    255255! C and D are known from before and k is index of the vertical layer.
    256256!   
    257     INCLUDE "YOMCST.inc"
     257    INCLUDE "YOMCST.h"
    258258! Input arguments
    259259!****************************************************************************************

  • LMDZ4/trunk/libf/phylmd/climb_wind_mod.F90

    r782 r793  
    7575!
    7676!
    77     INCLUDE "YOMCST.inc"
     77    INCLUDE "YOMCST.h"
    7878! Input arguments
    7979!****************************************************************************************
    … …  
    211211       flux_u, flux_v)
    212212
    213     INCLUDE "YOMCST.inc"
     213    INCLUDE "YOMCST.h"
    214214
    215215! Input arguments
    … …  
    277277!
    278278!****************************************************************************************
    279     INCLUDE "YOMCST.inc"
     279    INCLUDE "YOMCST.h"
    280280
    281281! Input arguments

  • LMDZ4/trunk/libf/phylmd/clvent.F90

    r782 r793  
    4848  REAL, INTENT(OUT) :: flux_v(klon,klev)
    4949!c======================================================================
    50 #include "YOMCST.inc"
     50   include "YOMCST.h"
    5151!c======================================================================
    5252  INTEGER i, k

  • LMDZ4/trunk/libf/phylmd/coef_diff_turb_mod.F90

    r782 r793  
    5858! Include
    5959!****************************************************************************************
    60     INCLUDE "clesphys.inc"
    61     INCLUDE "indicesol.inc"
     60    INCLUDE "clesphys.h"
     61    INCLUDE "indicesol.h"
    6262    INCLUDE "iniprint.h"
    6363    INCLUDE "compbl.h"
    64     INCLUDE "YOETHF.inc"
    65     INCLUDE "YOMCST.inc"
     64    INCLUDE "YOETHF.h"
     65    INCLUDE "YOMCST.h"
    6666
    6767!****************************************************************************************
    … …  
    256256! pcfh-----output-R- coefficients a calculer (chaleur et humidite)
    257257!======================================================================
    258     INCLUDE "YOETHF.inc"
    259     INCLUDE "FCTTRE.inc"
     258    INCLUDE "YOETHF.h"
     259    INCLUDE "FCTTRE.h"
    260260    INCLUDE "iniprint.h"
    261     INCLUDE "indicesol.inc"
     261    INCLUDE "indicesol.h"
    262262    INCLUDE "compbl.h"
    263     INCLUDE "YOMCST.inc"
     263    INCLUDE "YOMCST.h"
    264264!
    265265! Arguments:
    … …  
    612612    REAL zdthmin(knon), zdthdp
    613613
    614     INCLUDE "indicesol.inc"
    615     INCLUDE "YOMCST.inc"
     614    INCLUDE "indicesol.h"
     615    INCLUDE "YOMCST.h"
    616616!
    617617! Initialiser les sorties

  • LMDZ4/trunk/libf/phylmd/coefcdrag.F90

    r524 r793  
    2121! klon----input-I- dimension de la grille physique (= nb_pts_latitude X nb_pts_longitude)
    2222! knon----input-I- nombre de points pour un type de surface
    23 ! nsrf----input-I- indice pour le type de surface; voir indicesol.inc
     23! nsrf----input-I- indice pour le type de surface; voir indicesol.h
    2424! zxli----input-L- TRUE si calcul des cdrags selon Laurent Li
    2525! speed---input-R- module du vent au 1er niveau du modele
    … …  
    5050!-------------------------------------------------------------------------
    5151!
    52 #include "YOMCST.inc"
    53 #include "YOETHF.inc"
    54 #include "indicesol.inc"
     52      include "YOMCST.h"
     53      include "YOETHF.h"
     54      include "indicesol.h"
    5555! Quelques constantes :
    5656      REAL, parameter :: RKAR=0.40, CB=5.0, CC=5.0, CD=5.0

  • LMDZ4/trunk/libf/phylmd/conf_phys.F90

    r766 r793  
    1616   implicit none
    1717
    18 #include "conema3.h"
    19 #include "fisrtilp.inc"
    20 #include "nuage.h"
    21 #include "YOMCST.inc"
     18 include "conema3.h"
     19 include "fisrtilp.h"
     20 include "nuage.h"
     21   include "YOMCST.h"
    2222!IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
    23 include "clesphys.inc"
     23include "clesphys.h"
    2424include "compbl.h"
    25 include "control.inc"
     25include "control.h"
    2626!
    2727! Configuration de la "physique" de LMDZ a l'aide de la fonction

  • LMDZ4/trunk/libf/phylmd/cpl_mod.F90

    r782 r793  
    9797  SUBROUTINE cpl_init(dtime, rlon, rlat)
    9898
    99     INCLUDE "dimensions90.h"
    100     INCLUDE "indicesol.inc"
    101     INCLUDE "control.inc"
    102     INCLUDE "temps.inc"
     99    INCLUDE "dimensions.h"
     100    INCLUDE "indicesol.h"
     101    INCLUDE "control.h"
     102    INCLUDE "temps.h"
    103103    INCLUDE "iniprint.h"
    104104
    … …  
    275275! 4 fields : read_sst, read_sic, read_sit and read_alb_sic.
    276276
    277     INCLUDE "indicesol.inc"
    278     INCLUDE "temps.inc"
     277    INCLUDE "indicesol.h"
     278    INCLUDE "temps.h"
    279279    INCLUDE "iniprint.h"
    280     INCLUDE "YOMCST.inc"
    281     INCLUDE "dimensions90.h"
     280    INCLUDE "YOMCST.h"
     281    INCLUDE "dimensions.h"
    282282
    283283! Input arguments
    … …  
    403403! tsurf_new(1:knon), pctsrf(1:klon).
    404404!
    405     INCLUDE "indicesol.inc"
     405    INCLUDE "indicesol.h"
    406406
    407407! Input arguments
    … …  
    448448! tsurf_new(1:knon), alb_new(1:knon), pctsrf(1:klon).
    449449!
    450     INCLUDE "indicesol.inc"
     450    INCLUDE "indicesol.h"
    451451
    452452! Input arguments
    … …  
    485485! (it is done in cpl_send_seaice_fields).
    486486!
    487     INCLUDE "indicesol.inc"
    488     INCLUDE "dimensions90.h"
     487    INCLUDE "indicesol.h"
     488    INCLUDE "dimensions.h"
    489489
    490490! Input arguments
    … …  
    654654! the coupler.
    655655!
    656     INCLUDE "indicesol.inc"
    657     INCLUDE "dimensions90.h"
     656    INCLUDE "indicesol.h"
     657    INCLUDE "dimensions.h"
    658658
    659659! Input arguments
    … …  
    817817! (it is done in cpl_send_seaice_fields).
    818818!
    819     INCLUDE "dimensions90.h"
     819    INCLUDE "dimensions.h"
    820820
    821821! Input arguments
    … …  
    869869! will be done in cpl_send_seaice_fields.
    870870!
    871     INCLUDE "dimensions90.h"
     871    INCLUDE "dimensions.h"
    872872   
    873873! Input varibales
    … …  
    917917! Some includes
    918918!*************************************************************************************
    919     INCLUDE "indicesol.inc"
    920     INCLUDE "temps.inc"
    921     INCLUDE "dimensions90.h"
     919    INCLUDE "indicesol.h"
     920    INCLUDE "temps.h"
     921    INCLUDE "dimensions.h"
    922922   
    923923! Input arguments
    … …  
    11551155!   champ_out    champ sur la grille 2D
    11561156!
    1157     INCLUDE "dimensions90.h"
     1157    INCLUDE "dimensions.h"
    11581158
    11591159! Input
    … …  
    11961196!   champ_out    champ sur la grille 2D
    11971197!
    1198     INCLUDE "dimensions90.h"
     1198    INCLUDE "dimensions.h"
    11991199   
    12001200! Input arguments

  • LMDZ4/trunk/libf/phylmd/fisrtilp.h

    r766 r793  
    11!
    22! $Header$
     3!
     4!
     5!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     6!                 veillez  n'utiliser que des ! pour les commentaires
     7!                 et  bien positionner les & des lignes de continuation
     8!                 (les placer en colonne 6 et en colonne 73)
    39!
    410      REAL cld_lc_lsc,cld_lc_con
    … …  
    915      INTEGER iflag_pdf
    1016
    11       common/comfisrtilp/
    12      s     cld_lc_lsc     ! 2.6e-4
    13      s     ,cld_lc_con    ! 2.6e-4
    14      s     ,cld_tau_lsc   ! 3600.
    15      s     ,cld_tau_con   ! 3600.
    16      s     ,ffallv_lsc    ! 1.
    17      s     ,ffallv_con    ! 1.
    18      s     ,coef_eva      ! 2.e-5
    19      s     ,reevap_ice    ! F
    20      s     ,iflag_pdf     ! 0
     17      common/comfisrtilp/                                               &
     18     &     cld_lc_lsc                                                   &
     19     &     ,cld_lc_con                                                  &
     20     &     ,cld_tau_lsc                                                 &
     21     &     ,cld_tau_con                                                 &
     22     &     ,ffallv_lsc                                                  &
     23     &     ,ffallv_con                                                  &
     24     &     ,coef_eva                                                    &
     25     &     ,reevap_ice                                                  &
     26     &     ,iflag_pdf       
    2127
    2228!$OMP THREADPRIVATE(/comfisrtilp/)

  • LMDZ4/trunk/libf/phylmd/fonte_neige_mod.F90

    r782 r793  
    4444! restart file. The other variables are initialized to zero.
    4545!
    46     INCLUDE "indicesol.inc"
     46    INCLUDE "indicesol.h"
    4747!****************************************************************************************
    4848! Input argument
    … …  
    139139!   evap
    140140!
    141   INCLUDE "indicesol.inc"
    142   INCLUDE "dimensions90.h"
    143   INCLUDE "YOETHF.inc"
    144   INCLUDE "YOMCST.inc"
    145   INCLUDE "FCTTRE.inc"
    146   INCLUDE "clesphys.inc"
     141  INCLUDE "indicesol.h"
     142  INCLUDE "dimensions.h"
     143  INCLUDE "YOETHF.h"
     144  INCLUDE "YOMCST.h"
     145  INCLUDE "FCTTRE.h"
     146  INCLUDE "clesphys.h"
    147147
    148148! Input variables
    … …  
    313313! This routine is called from physiq.F before histwrite.
    314314
    315     INCLUDE "indicesol.inc"
     315    INCLUDE "indicesol.h"
    316316!****************************************************************************************
    317317    REAL, DIMENSION(klon,nbsrf), INTENT(IN) :: pctsrf

  • LMDZ4/trunk/libf/phylmd/indicesol.h

    r766 r793  
    11!
    22! $Header$
     3!
     4!
     5!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     6!                 veillez à n'utiliser que des ! pour les commentaires
     7!                 et à bien positionner les & des lignes de continuation
     8!                 (les placer en colonne 6 et en colonne 73)
     9!
    310!
    411      INTEGER nbsrf

  • LMDZ4/trunk/libf/phylmd/interfoce_lim.F90

    r782 r793  
    1212  IMPLICIT NONE
    1313 
    14   INCLUDE "indicesol.inc"
     14  INCLUDE "indicesol.h"
    1515  INCLUDE "netcdf.inc"
    1616

  • LMDZ4/trunk/libf/phylmd/iophy.F90

    r776 r793  
    2020  use ioipsl
    2121  implicit none
    22   include 'dimensions90.h'   
     22  include 'dimensions.h'   
    2323    real,dimension(iim),intent(in) :: lon
    2424    real,dimension(jjm+1),intent(in) :: lat
    … …  
    6969  use write_field
    7070  implicit none
    71   include 'dimensions90.h'
     71  include 'dimensions.h'
    7272   
    7373    character*(*), intent(IN) :: name
    … …  
    9595  USE ioipsl
    9696  implicit none
    97   include 'dimensions90.h'
     97  include 'dimensions.h'
    9898   
    9999    integer,intent(in) :: nid
    … …  
    117117  use ioipsl
    118118  implicit none
    119   include 'dimensions90.h'
     119  include 'dimensions.h'
    120120   
    121121    integer,intent(in) :: nid
    … …  
    137137!  USE dimphy_old
    138138!  implicit none
    139 !  include 'dimensions90.h'
     139!  include 'dimensions.h'
    140140! 
    141141!    real,dimension(klon_mpi,nlev),intent(in) :: field_phy

  • LMDZ4/trunk/libf/phylmd/oasis.F90

    r782 r793  
    5757!     LF 09/2003
    5858!
    59     INCLUDE "dimensions90.h"
     59    INCLUDE "dimensions.h"
    6060
    6161! Local variables
    … …  
    216216!======================================================================
    217217!
    218     INCLUDE "dimensions90.h"
     218    INCLUDE "dimensions.h"
    219219! Input arguments
    220220!************************************************************************************
    … …  
    277277!
    278278!
    279     INCLUDE "dimensions90.h"
     279    INCLUDE "dimensions.h"
    280280! Input arguments
    281281!************************************************************************************

  • LMDZ4/trunk/libf/phylmd/ocean_cpl_mod.F90

    r782 r793  
    8383! surface is done and finally it sends some fields to the coupler.
    8484!
    85     INCLUDE "indicesol.inc"
    86     INCLUDE "YOMCST.inc"
     85    INCLUDE "indicesol.h"
     86    INCLUDE "YOMCST.h"
    8787!   
    8888! Input arguments 
    … …  
    233233! some fields to the coupler.
    234234!   
    235     INCLUDE "indicesol.inc"
    236     INCLUDE "YOMCST.inc"
     235    INCLUDE "indicesol.h"
     236    INCLUDE "YOMCST.h"
    237237
    238238! Input arguments

  • LMDZ4/trunk/libf/phylmd/ocean_forced_mod.F90

    r781 r793  
    6262! surface.
    6363!
    64     INCLUDE "indicesol.inc"
    65     INCLUDE "YOMCST.inc"
     64    INCLUDE "indicesol.h"
     65    INCLUDE "YOMCST.h"
    6666
    6767! Input arguments
    … …  
    182182! surface.
    183183!   
    184     INCLUDE "indicesol.inc"
     184    INCLUDE "indicesol.h"
    185185    INCLUDE "dimsoil.h"
    186     INCLUDE "YOMCST.inc"
    187     INCLUDE "clesphys.inc"
     186    INCLUDE "YOMCST.h"
     187    INCLUDE "clesphys.h"
    188188
    189189! Input arguments

  • LMDZ4/trunk/libf/phylmd/ocean_slab_mod.F90

    r781 r793  
    4141  SUBROUTINE ocean_slab_init(dtime, tslab_rst, seaice_rst, pctsrf_rst)
    4242
    43     INCLUDE "indicesol.inc"
     43    INCLUDE "indicesol.h"
    4444    INCLUDE "iniprint.h"
    4545
    … …  
    144144       dflux_s, dflux_l, pctsrf_oce)
    145145
    146     INCLUDE "indicesol.inc"
     146    INCLUDE "indicesol.h"
    147147    INCLUDE "iniprint.h"
    148148
    … …  
    226226       tsurf_new, alb_new, dflux_s, dflux_l, pctsrf_sic)
    227227
    228     INCLUDE "indicesol.inc"
     228    INCLUDE "indicesol.h"
    229229    INCLUDE "dimsoil.h"
    230     INCLUDE "YOMCST.inc"
     230    INCLUDE "YOMCST.h"
    231231    INCLUDE "iniprint.h"
    232     INCLUDE "clesphys.inc"
     232    INCLUDE "clesphys.h"
    233233
    234234! Input arguments 
    … …  
    438438!   pctsrf_slab  "pourcentages" (valeurs entre 0. et 1.) surfaces issus du slab
    439439
    440     INCLUDE "indicesol.inc"
    441     INCLUDE "YOMCST.inc"
     440    INCLUDE "indicesol.h"
     441    INCLUDE "YOMCST.h"
    442442    INCLUDE "iniprint.h"
    443     INCLUDE "clesphys.inc"
     443    INCLUDE "clesphys.h"
    444444
    445445! Input arguments

  • LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

    r781 r793  
    5858! for the index of the different surfaces and tests the choice of type of ocean.
    5959
    60     INCLUDE "indicesol.inc"
     60    INCLUDE "indicesol.h"
    6161    INCLUDE "dimsoil.h"
    6262    INCLUDE "iniprint.h"
    … …  
    259259! pblT-----output-R- T au nveau HCL
    260260!
    261     INCLUDE "indicesol.inc"
     261    INCLUDE "indicesol.h"
    262262    INCLUDE "dimsoil.h"
    263     INCLUDE "YOMCST.inc"
     263    INCLUDE "YOMCST.h"
    264264    INCLUDE "iniprint.h"
    265     INCLUDE "FCTTRE.inc"
    266     INCLUDE "clesphys.inc"
     265    INCLUDE "FCTTRE.h"
     266    INCLUDE "clesphys.h"
    267267    INCLUDE "compbl.h"
    268     INCLUDE "dimensions90.h"
    269     INCLUDE "YOETHF.inc"
    270     INCLUDE "temps.inc"
    271     INCLUDE "control.inc"
     268    INCLUDE "dimensions.h"
     269    INCLUDE "YOETHF.h"
     270    INCLUDE "temps.h"
     271    INCLUDE "control.h"
    272272
    273273! Input variables
    … …  
    12381238       evap_rst, rugos_rst, agesno_rst, ftsoil_rst)
    12391239
    1240     INCLUDE "indicesol.inc"
     1240    INCLUDE "indicesol.h"
    12411241    INCLUDE "dimsoil.h"
    12421242

  • LMDZ4/trunk/libf/phylmd/phytrac.F

    r782 r793  
    814814c si radio=true mais pour l'instant radiornpb propre au cas rnpb
    815815      if(rnpb) then
    816         print *, 'decroissance radiactive activee'
     816c       print *, 'decroissance radiactive activee'
    817817        call radiornpb (tr_seri,pdtphys,tautr,d_tr_dec)
    818818C

  • LMDZ4/trunk/libf/phylmd/screenc.F90

    r524 r793  
    2222! klon----input-I- dimension de la grille physique (= nb_pts_latitude X nb_pts_longitude)
    2323! knon----input-I- nombre de points pour un type de surface
    24 ! nsrf----input-I- indice pour le type de surface; voir indicesol.inc
     24! nsrf----input-I- indice pour le type de surface; voir indicesol.h
    2525! zxli----input-L- TRUE si calcul des cdrags selon Laurent Li
    2626! speed---input-R- module du vent au 1er niveau du modele
    … …  
    5353      REAL, dimension(klon), intent(out) :: pref, delu, delte, delq
    5454!-----------------------------------------------------------------------
    55 #include "YOMCST.inc"
     55      include "YOMCST.h"
    5656!
    5757! Variables locales 

  • LMDZ4/trunk/libf/phylmd/screenp.F90

    r524 r793  
    2222! klon----input-I- dimension de la grille physique (= nb_pts_latitude X nb_pts_longitude)
    2323! knon----input-I- nombre de points pour un type de surface
    24 ! nsrf----input-I- indice pour le type de surface; voir indicesol.inc
     24! nsrf----input-I- indice pour le type de surface; voir indicesol.h
    2525! speed---input-R- module du vent au 1er niveau du modele
    2626! tair----input-R- temperature de l'air au 1er niveau du modele

  • LMDZ4/trunk/libf/phylmd/stdlevvar.F90

    r644 r793  
    2323! klon----input-I- dimension de la grille physique (= nb_pts_latitude X nb_pts_longitude)
    2424! knon----input-I- nombre de points pour un type de surface
    25 ! nsrf----input-I- indice pour le type de surface; voir indicesol.inc
     25! nsrf----input-I- indice pour le type de surface; voir indicesol.h
    2626! zxli----input-L- TRUE si calcul des cdrags selon Laurent Li
    2727! u1------input-R- vent zonal au 1er niveau du modele
    … …  
    5353      REAL, dimension(klon), intent(out) :: u_10m, t_10m, q_10m
    5454!-------------------------------------------------------------------------
    55 #include "YOMCST.inc"
     55      include "YOMCST.h"
    5656!IM PLUS
    57 #include "YOETHF.inc"
     57      include "YOETHF.h"
    5858!
    5959! Quelques constantes et options:

  • LMDZ4/trunk/libf/phylmd/surf_land_bucket_mod.F90

    r781 r793  
    2929! Bucket calculations for surface.
    3030!
    31     INCLUDE "clesphys.inc"
    32     INCLUDE "indicesol.inc"
     31    INCLUDE "clesphys.h"
     32    INCLUDE "indicesol.h"
    3333    INCLUDE "dimsoil.h"
    34     INCLUDE "YOMCST.inc"
     34    INCLUDE "YOMCST.h"
    3535
    3636! Input variables 

  • LMDZ4/trunk/libf/phylmd/surf_land_mod.F90

    r781 r793  
    2828       tsurf_new, alb_new, dflux_s, dflux_l, pctsrf_ter)
    2929
    30     INCLUDE "indicesol.inc"
     30    INCLUDE "indicesol.h"
    3131    INCLUDE "dimsoil.h"
    3232

  • LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

    r781 r793  
    9090!
    9191    INCLUDE "indicesol.h"
    92     INCLUDE "temps.inc"
    93     INCLUDE "YOMCST.inc"
     92    INCLUDE "temps.h"
     93    INCLUDE "YOMCST.h"
    9494    INCLUDE "iniprint.h"
    95     INCLUDE "dimensions90.h"
     95    INCLUDE "dimensions.h"
    9696 
    9797!
    … …  
    426426  SUBROUTINE Init_orchidee_index(knon,orch_comm,knindex,offset,ktindex)
    427427   
    428     INCLUDE "dimensions90.h"
     428    INCLUDE "dimensions.h"
    429429
    430430#ifdef CPP_PARA
    … …  
    525525   
    526526    INCLUDE "indicesol.h"
    527     INCLUDE "dimensions90.h"
     527    INCLUDE "dimensions.h"
    528528#ifdef CPP_PARA
    529529    INCLUDE 'mpif.h'

  • LMDZ4/trunk/libf/phylmd/surf_landice_mod.F90

    r781 r793  
    2424       tsurf_new, alb_new, dflux_s, dflux_l, pctsrf_lic)
    2525
    26     INCLUDE "indicesol.inc"
     26    INCLUDE "indicesol.h"
    2727    INCLUDE "dimsoil.h"
    28     INCLUDE "YOMCST.inc"
    29     INCLUDE "clesphys.inc"
     28    INCLUDE "YOMCST.h"
     29    INCLUDE "clesphys.h"
    3030
    3131! Input variables

  • LMDZ4/trunk/libf/phylmd/surf_ocean_mod.F90

    r781 r793  
    3232! done in here because they are identical for the different modes of ocean.
    3333!
    34     INCLUDE "indicesol.inc"
    35     INCLUDE "YOMCST.inc"
     34    INCLUDE "indicesol.h"
     35    INCLUDE "YOMCST.h"
    3636
    3737! Input variables

  • LMDZ4/trunk/libf/phylmd/surf_seaice_mod.F90

    r781 r793  
    3131! in here because it is the same calculation for the different modes of ocean.
    3232!
    33     INCLUDE "indicesol.inc"
     33    INCLUDE "indicesol.h"
    3434    INCLUDE "dimsoil.h"
    3535

  • LMDZ4/trunk/libf/phylmd/write_field_phy.F90

    r776 r793  
    1313   
    1414    IMPLICIT NONE
    15     include 'dimensions90.h'
    16     include 'paramet90.h'
     15    include 'dimensions.h'
     16    include 'paramet.h'
    1717
    1818    character(len=*)   :: name
Note: See TracChangeset for help on using the changeset viewer.