Ignore:
Timestamp:
Jul 22, 2016, 8:44:47 AM (9 years ago)
Author:
Ehouarn Millour
Message:

Cleanup in the dynamics: get rid of comconst.h, make it a module comconst_mod.
EM

Location:
LMDZ5/trunk/libf/dyn3dpar
Files:
36 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/dyn3dpar/addfi_p.F

    r1987 r2597  
    4848#include "dimensions.h"
    4949#include "paramet.h"
    50 #include "comconst.h"
    5150#include "comgeom.h"
    5251#include "serre.h"
  • LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F

    r1907 r2597  
    66      USE parallel_lmdz
    77      USE write_field_p
     8      USE comconst_mod, ONLY: daysec
    89      IMPLICIT NONE
    910c=======================================================================
     
    2829#include "dimensions.h"
    2930#include "paramet.h"
    30 #include "comconst.h"
    3131#include "comvert.h"
    3232#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/advect_p.F

    r1907 r2597  
    55      USE parallel_lmdz
    66      USE write_field_p
     7      USE comconst_mod, ONLY: daysec
    78      IMPLICIT NONE
    89c=======================================================================
     
    2728#include "dimensions.h"
    2829#include "paramet.h"
    29 #include "comconst.h"
    3030#include "comvert.h"
    3131#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90

    r2239 r2597  
    1919  USE infotrac, ONLY: nqtot, iadv
    2020  USE control_mod, ONLY: iapp_tracvl, day_step, planet_type
     21  USE comconst_mod, ONLY: dtvr
    2122  IMPLICIT NONE
    2223  !
    2324  include "dimensions.h"
    2425  include "paramet.h"
    25   include "comconst.h"
    2626  include "comvert.h"
    2727  include "comdissip.h"
  • LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F

    r1907 r2597  
    1717      use misc_mod
    1818      use write_field_p
     19      USE comconst_mod, ONLY: cpp, pi
    1920      IMPLICIT NONE
    2021
    2122#include "dimensions.h"
    2223#include "paramet.h"
    23 #include "comconst.h"
    2424#include "comvert.h"
    2525#include "comgeom2.h"
  • LMDZ5/trunk/libf/dyn3dpar/caladvtrac_p.F

    r1907 r2597  
    1010      USE infotrac, ONLY : nqtot
    1111      USE control_mod, ONLY : iapp_tracvl,planet_type
     12      USE comconst_mod, ONLY: dtvr
    1213c
    1314      IMPLICIT NONE
     
    2526#include "dimensions.h"
    2627#include "paramet.h"
    27 #include "comconst.h"
    2828
    2929c   Arguments:
  • LMDZ5/trunk/libf/dyn3dpar/caldyn_p.F

    r1987 r2597  
    3131#include "dimensions.h"
    3232#include "paramet.h"
    33 #include "comconst.h"
    3433#include "comvert.h"
    3534#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90

    r2442 r2597  
    1616  USE infotrac, ONLY : type_trac
    1717  use assert_m, only: assert
     18  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
     19                          iflag_top_bound, mode_top_bound, tau_top_bound, &
     20                          ngroup
    1821
    1922  IMPLICIT NONE
     
    3841  include "comdissnew.h"
    3942  include "temps.h"
    40   include "comconst.h"
    4143  include "iniprint.h"
    4244
  • LMDZ5/trunk/libf/dyn3dpar/dissip_p.F

    r1987 r2597  
    66      USE parallel_lmdz
    77      USE write_field_p
     8      USE comconst_mod, ONLY: dtdiss
    89      IMPLICIT NONE
    910
     
    2930#include "dimensions.h"
    3031#include "paramet.h"
    31 #include "comconst.h"
    3232#include "comgeom.h"
    3333#include "comdissnew.h"
  • LMDZ5/trunk/libf/dyn3dpar/dynetat0.F

    r1930 r2597  
    99
    1010      use control_mod, only : planet_type
     11      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa,
     12     &                        lllm, omeg, rad
    1113
    1214      IMPLICIT NONE
     
    3032#include "paramet.h"
    3133#include "temps.h"
    32 #include "comconst.h"
    3334#include "comvert.h"
    3435#include "comgeom2.h"
  • LMDZ5/trunk/libf/dyn3dpar/dynredem.F

    r1930 r2597  
    99      USE infotrac
    1010      use netcdf95, only: NF95_PUT_VAR
     11      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
    1112 
    1213      IMPLICIT NONE
     
    1819#include "dimensions.h"
    1920#include "paramet.h"
    20 #include "comconst.h"
    2121#include "comvert.h"
    2222#include "comgeom2.h"
  • LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F

    r1907 r2597  
    1010      USE infotrac
    1111      use netcdf95, only: NF95_PUT_VAR
     12      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
    1213 
    1314      IMPLICIT NONE
     
    1920#include "dimensions.h"
    2021#include "paramet.h"
    21 #include "comconst.h"
    2222#include "comvert.h"
    2323#include "comgeom2.h"
  • LMDZ5/trunk/libf/dyn3dpar/exner_hyb_p_m.F90

    r2021 r2597  
    3333    !
    3434    USE parallel_lmdz
     35    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
    3536    !
    3637    include "dimensions.h"
    3738    include "paramet.h"
    38     include "comconst.h"
    3939    include "comgeom.h"
    4040    include "comvert.h"
  • LMDZ5/trunk/libf/dyn3dpar/exner_milieu_p_m.F90

    r2026 r2597  
    3030    !
    3131    USE parallel_lmdz
     32    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
    3233    !
    3334    include "dimensions.h"
    3435    include "paramet.h"
    35     include "comconst.h"
    3636    include "comgeom.h"
    3737    include "comvert.h"
  • LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F

    r1907 r2597  
    2121#include "dimensions.h"
    2222#include "paramet.h"
    23 #include "comconst.h"
    2423#include "comvert.h"
    2524#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/friction_p.F

    r1907 r2597  
    1212      USE ioipsl_getincom
    1313#endif
     14      USE comconst_mod, ONLY: pi
    1415      IMPLICIT NONE
    1516
     
    2930#include "paramet.h"
    3031#include "comgeom2.h"
    31 #include "comconst.h"
    3232#include "iniprint.h"
    3333#include "academic.h"
  • LMDZ5/trunk/libf/dyn3dpar/gcm.F

    r2418 r2597  
    3232      USE iniphysiq_mod, ONLY: iniphysiq
    3333#endif
     34      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
     35
    3436      IMPLICIT NONE
    3537
     
    6567#include "dimensions.h"
    6668#include "paramet.h"
    67 #include "comconst.h"
    6869#include "comdissnew.h"
    6970#include "comvert.h"
  • LMDZ5/trunk/libf/dyn3dpar/groupe_p.F

    r2442 r2597  
    11      subroutine groupe_p(pext,pbaru,pbarv,pbarum,pbarvm,wm)
    22      USE parallel_lmdz
     3      USE comconst_mod, ONLY: ngroup
    34      implicit none
    45
     
    1617#include "dimensions.h"
    1718#include "paramet.h"
    18 #include "comconst.h"
    1919#include "comgeom2.h"
    2020#include "comvert.h"
  • LMDZ5/trunk/libf/dyn3dpar/groupeun_p.F

    r2442 r2597  
    22      USE parallel_lmdz
    33      USE Write_Field_p
     4      USE comconst_mod, ONLY: ngroup
    45      IMPLICIT NONE
    56
    67#include "dimensions.h"
    78#include "paramet.h"
    8 #include "comconst.h"
    99#include "comgeom2.h"
    1010
     
    136136
    137137      USE parallel_lmdz
     138      USE comconst_mod, ONLY: ngroup
    138139      IMPLICIT NONE
    139140
    140141#include "dimensions.h"
    141142#include "paramet.h"
    142 #include "comconst.h"
    143143#include "comgeom2.h"
    144144
  • LMDZ5/trunk/libf/dyn3dpar/guide_p_mod.F90

    r2134 r2597  
    341341    USE parallel_lmdz
    342342    USE control_mod
     343    USE comconst_mod, ONLY: daysec, dtvr, cpp, kappa
    343344   
    344345    IMPLICIT NONE
     
    346347    INCLUDE "dimensions.h"
    347348    INCLUDE "paramet.h"
    348     INCLUDE "comconst.h"
    349349    INCLUDE "comvert.h"
    350350
     
    619619  SUBROUTINE guide_zonave(typ,hsize,vsize,field)
    620620
     621    USE comconst_mod, ONLY: pi
     622   
    621623    IMPLICIT NONE
    622624
     
    624626    INCLUDE "paramet.h"
    625627    INCLUDE "comgeom.h"
    626     INCLUDE "comconst.h"
    627628   
    628629    ! input/output variables
     
    707708  USE mod_hallo
    708709  USE Bands
     710  USE comconst_mod, ONLY: cpp, kappa
    709711  IMPLICIT NONE
    710712
     
    713715  include "comvert.h"
    714716  include "comgeom2.h"
    715   include "comconst.h"
    716717
    717718  REAL, DIMENSION (iip1,jjp1),     INTENT(IN) :: psi ! Psol gcm
     
    10991100! Calcul des constantes de rappel alpha (=1/tau)
    11001101
     1102    use comconst_mod, only: pi
     1103   
    11011104    implicit none
    11021105
    11031106    include "dimensions.h"
    11041107    include "paramet.h"
    1105     include "comconst.h"
    11061108    include "comgeom2.h"
    11071109    include "serre.h"
     
    18131815  SUBROUTINE guide_out(varname,hsize,vsize,field,factt)
    18141816    USE parallel_lmdz
     1817    USE comconst_mod, ONLY: pi
    18151818    IMPLICIT NONE
    18161819
     
    18191822    INCLUDE "netcdf.inc"
    18201823    INCLUDE "comgeom2.h"
    1821     INCLUDE "comconst.h"
    18221824    INCLUDE "comvert.h"
    18231825   
  • LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90

    r2087 r2597  
    1616  use exner_hyb_m, only: exner_hyb
    1717  use exner_milieu_m, only: exner_milieu
     18  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
    1819
    1920  !   Author:    Frederic Hourdin      original: 15/01/93
     
    2930  include "paramet.h"
    3031  include "comvert.h"
    31   include "comconst.h"
    3232  include "comgeom.h"
    3333  include "academic.h"
  • LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F

    r1907 r2597  
    1212       use misc_mod
    1313       USE infotrac
     14       USE comconst_mod, ONLY: pi
    1415
    1516      implicit none
     
    4344#include "dimensions.h"
    4445#include "paramet.h"
    45 #include "comconst.h"
    4646#include "comvert.h"
    4747#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F

    r1907 r2597  
    1313       use Write_field
    1414       use misc_mod
     15       USE comconst_mod, ONLY: pi
    1516       
    1617      implicit none
     
    4546#include "dimensions.h"
    4647#include "paramet.h"
    47 #include "comconst.h"
    4848#include "comvert.h"
    4949#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/inithist_p.F

    r1907 r2597  
    1313       use misc_mod
    1414       USE infotrac
     15       USE comconst_mod, ONLY: pi
    1516
    1617      implicit none
     
    4546#include "dimensions.h"
    4647#include "paramet.h"
    47 #include "comconst.h"
    4848#include "comvert.h"
    4949#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/integrd_p.F

    r2110 r2597  
    77      USE parallel_lmdz
    88      USE control_mod, only : planet_type
     9      USE comconst_mod, ONLY: pi
    910      IMPLICIT NONE
    1011
     
    2728#include "dimensions.h"
    2829#include "paramet.h"
    29 #include "comconst.h"
    3030#include "comgeom.h"
    3131#include "comvert.h"
  • LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

    r2375 r2597  
    2828     &                       periodav, ok_dyn_ave, output_grads_dyn,
    2929     &                       iapp_tracvl
     30       USE comconst_mod, ONLY: cpp, dtvr, ihf, dtphys, pi, jmp1
    3031      IMPLICIT NONE
    3132
     
    6364#include "dimensions.h"
    6465#include "paramet.h"
    65 #include "comconst.h"
    6666#include "comdissnew.h"
    6767#include "comvert.h"
  • LMDZ5/trunk/libf/dyn3dpar/massbar_p.F

    r1907 r2597  
    1818#include "dimensions.h"
    1919#include "paramet.h"
    20 #include "comconst.h"
    2120#include "comgeom.h"
    2221c
  • LMDZ5/trunk/libf/dyn3dpar/massbarxy_p.F

    r1907 r2597  
    1717#include "dimensions.h"
    1818#include "paramet.h"
    19 #include "comconst.h"
    2019#include "comgeom.h"
    2120c
  • LMDZ5/trunk/libf/dyn3dpar/massdair_p.F

    r1907 r2597  
    1818#include "dimensions.h"
    1919#include "paramet.h"
    20 #include "comconst.h"
    2120#include "comgeom.h"
    2221c
  • LMDZ5/trunk/libf/dyn3dpar/sw_case_williamson91_6.F

    r1907 r2597  
    2626c
    2727c=======================================================================
     28      USE comconst_mod, ONLY: cpp, omeg, rad
    2829      IMPLICIT NONE
    2930c-----------------------------------------------------------------------
     
    3435#include "paramet.h"
    3536#include "comvert.h"
    36 #include "comconst.h"
    3737#include "comgeom.h"
    3838#include "iniprint.h"
  • LMDZ5/trunk/libf/dyn3dpar/top_bound_p.F

    r1907 r2597  
    44      SUBROUTINE top_bound_p(vcov,ucov,teta,masse,dt)
    55      USE parallel_lmdz
     6      USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
     7     &                        tau_top_bound
    68      IMPLICIT NONE
    79c
    810#include "dimensions.h"
    911#include "paramet.h"
    10 #include "comconst.h"
    1112#include "comvert.h"
    1213#include "comgeom2.h"
     
    4041! NB: top_bound sponge is only called from leapfrog if ok_strato=.true.
    4142
    42 ! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst.h)
     43! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst_mod)
    4344!    iflag_top_bound=0 for no sponge
    4445!    iflag_top_bound=1 for sponge over 4 topmost layers
  • LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F

    r1907 r2597  
    2727#include "logic.h"
    2828#include "comvert.h"
    29 #include "comconst.h"
    3029
    3130c
     
    210209#include "logic.h"
    211210#include "comvert.h"
    212 #include "comconst.h"
    213211c
    214212c
     
    539537c   --------------------------------------------------------------------
    540538      USE parallel_lmdz
     539      USE comconst_mod, ONLY: pi
    541540      IMPLICIT NONE
    542541c
     
    545544#include "logic.h"
    546545#include "comvert.h"
    547 #include "comconst.h"
    548546#include "comgeom.h"
    549547c
     
    934932#include "logic.h"
    935933#include "comvert.h"
    936 #include "comconst.h"
    937934c
    938935c
  • LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F

    r1907 r2597  
    2727      USE VAMPIR
    2828      USE infotrac, ONLY : nqtot
     29      USE comconst_mod, ONLY: cpp
    2930      IMPLICIT NONE
    3031
     
    3435#include "logic.h"
    3536#include "comvert.h"
    36 #include "comconst.h"
    3737
    3838c
  • LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F

    r1907 r2597  
    2525      USE mod_hallo
    2626      USE VAMPIR
     27      USE comconst_mod, ONLY: cpp
    2728      IMPLICIT NONE
    2829
     
    3233#include "logic.h"
    3334#include "comvert.h"
    34 #include "comconst.h"
    3535
    3636c
     
    238238#include "logic.h"
    239239#include "comvert.h"
    240 #include "comconst.h"
    241240c
    242241c
     
    584583c   --------------------------------------------------------------------
    585584      USE parallel_lmdz
     585      USE comconst_mod, ONLY: pi
    586586      IMPLICIT NONE
    587587c
     
    590590#include "logic.h"
    591591#include "comvert.h"
    592 #include "comconst.h"
    593592#include "comgeom.h"
    594593c
  • LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F

    r1907 r2597  
    1212      USE misc_mod
    1313      USE infotrac
     14      USE comconst_mod, ONLY: cpp
    1415      implicit none
    1516
     
    4243#include "dimensions.h"
    4344#include "paramet.h"
    44 #include "comconst.h"
    4545#include "comvert.h"
    4646#include "comgeom.h"
  • LMDZ5/trunk/libf/dyn3dpar/writehist_p.F

    r1907 r2597  
    4343#include "dimensions.h"
    4444#include "paramet.h"
    45 #include "comconst.h"
    4645#include "comvert.h"
    4746#include "comgeom.h"
Note: See TracChangeset for help on using the changeset viewer.