Ignore:
Timestamp:
Jul 22, 2016, 8:44:47 AM (8 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/dyn3d_common
Files:
39 edited
1 moved

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/dyn3d_common/adaptdt.F

    r1952 r2597  
    55     c                   masse)
    66
    7       USE control_mod
     7!      USE control_mod
     8      USE comconst_mod, ONLY: dtvr
    89      IMPLICIT NONE
    910
    … …  
    1112c#include "paramr2.h"
    1213#include "paramet.h"
    13 #include "comconst.h"
    1414#include "comdissip.h"
    1515#include "comvert.h"

  • LMDZ5/trunk/libf/dyn3d_common/advn.F

    r1945 r2597  
    2121#include "logic.h"
    2222#include "comvert.h"
    23 #include "comconst.h"
    2423#include "comgeom.h"
    2524#include "iniprint.h"
    … …  
    488487#include "logic.h"
    489488#include "comvert.h"
    490 #include "comconst.h"
    491489#include "iniprint.h"
    492490c

  • LMDZ5/trunk/libf/dyn3d_common/advx.F

    r1952 r2597  
    2525#include "dimensions.h"
    2626#include "paramet.h"
    27 #include "comconst.h"
    2827#include "comvert.h"
    2928

  • LMDZ5/trunk/libf/dyn3d_common/advxp.F

    r1945 r2597  
    1515#include "dimensions.h"
    1616#include "paramet.h"
    17 #include "comconst.h"
    1817#include "comvert.h"
    1918

  • LMDZ5/trunk/libf/dyn3d_common/advy.F

    r1945 r2597  
    2828#include "dimensions.h"
    2929#include "paramet.h"
    30 #include "comconst.h"
    3130#include "comvert.h"
    3231#include "comgeom2.h"

  • LMDZ5/trunk/libf/dyn3d_common/advyp.F

    r1945 r2597  
    3030#include "dimensions.h"
    3131#include "paramet.h"
    32 #include "comconst.h"
    3332#include "comvert.h"
    3433#include "comgeom.h"

  • LMDZ5/trunk/libf/dyn3d_common/advz.F

    r1952 r2597  
    2323#include "dimensions.h"
    2424#include "paramet.h"
    25 #include "comconst.h"
    2625#include "comvert.h"
    2726

  • LMDZ5/trunk/libf/dyn3d_common/advzp.F

    r1945 r2597  
    3333#include "dimensions.h"
    3434#include "paramet.h"
    35 #include "comconst.h"
    3635#include "comvert.h"
    3736#include "comgeom.h"

  • LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90

    r2336 r2597  
    1010  include "dimensions.h"
    1111  include "paramet.h"
    12   include "comconst.h"
    1312  include "comvert.h"
    1413  include "comgeom.h"

  • LMDZ5/trunk/libf/dyn3d_common/comconst_mod.F90

    r2595 r2597  
    22! $Id$
    33!
    4 !-----------------------------------------------------------------------
    5 ! INCLUDE comconst.h
    64
    7       COMMON/comconsti/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl,          &
    8      &                 iflag_top_bound,mode_top_bound,ngroup
    9       COMMON/comconstr/dtvr,daysec,                                     &
    10      & pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg              &
    11      &                   ,dissip_factz,dissip_deltaz,dissip_zref        &
    12      &                   ,tau_top_bound,                                &
    13      & daylen,year_day,molmass, ihf
     5MODULE comconst_mod
    146
     7IMPLICIT NONE 
    158
    169      INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl
    … …  
    3225! top_bound sponge:
    3326      INTEGER iflag_top_bound ! sponge type
    34       INTEGER ngroup
     27      INTEGER ngroup ! parameter to group points (along longitude) near poles
    3528      INTEGER mode_top_bound  ! sponge mode
    3629      REAL tau_top_bound ! inverse of sponge characteristic time scale (Hz)
    … …  
    4134      REAL ihf ! (W/m2) Intrinsic heat flux (for giant planets)
    4235
    43 !-----------------------------------------------------------------------
     36
     37END MODULE comconst_mod

  • LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90

    r1945 r2597  
    1010USE ioipsl_getincom
    1111#endif
     12USE comconst_mod, ONLY: pi, g, molmass, kappa, cpp, omeg, rad, &
     13                        year_day, daylen, daysec, ihf
    1214IMPLICIT NONE
    1315!
    … …  
    1618!   --------------
    1719#include "dimensions.h"
    18 #include "comconst.h"
    1920#include "comvert.h"
    2021!

  • LMDZ5/trunk/libf/dyn3d_common/coordij.F

    r1945 r2597  
    1111c=======================================================================
    1212
     13      USE comconst_mod, ONLY: pi
     14     
    1315      IMPLICIT NONE
    1416      REAL lon,lat
    … …  
    1820#include "dimensions.h"
    1921#include "paramet.h"
    20 #include "comconst.h"
    2122#include "comgeom.h"
    2223#include "serre.h"

  • LMDZ5/trunk/libf/dyn3d_common/disvert.F90

    r2153 r2597  
    1616  include "paramet.h"
    1717  include "comvert.h"
    18   include "comconst.h"
    1918  include "iniprint.h"
    2019  include "logic.h"

  • LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F

    r1952 r2597  
    1212      use ioipsl_getincom
    1313#endif
     14      USE comconst_mod, ONLY: kappa
    1415
    1516      IMPLICIT NONE
    … …  
    1819#include "paramet.h"
    1920#include "comvert.h"
    20 #include "comconst.h"
    2121#include "logic.h"
    2222#include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90

    r2021 r2597  
    3333    !
    3434    !
     35    USE comconst_mod, ONLY: jmp1, cpp, kappa, r
     36    IMPLICIT NONE
     37   
    3538    include "dimensions.h"
    3639    include "paramet.h"
    37     include "comconst.h"
    3840    include "comgeom.h"
    3941    include "comvert.h"

  • LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90

    r2021 r2597  
    3030    !
    3131    !
     32    USE comconst_mod, ONLY: jmp1, cpp, kappa, r
     33    IMPLICIT NONE
     34   
    3235    include "dimensions.h"
    3336    include "paramet.h"
    34     include "comconst.h"
    3537    include "comgeom.h"
    3638    include "comvert.h"

  • LMDZ5/trunk/libf/dyn3d_common/fxy.F

    r1952 r2597  
    66     , rlonu,xprimu,rlonv,xprimv,rlonm025,xprimm025,rlonp025,xprimp025)
    77
     8      USE comconst_mod, ONLY: pi
    89      IMPLICIT NONE
    910
    … …  
    1718#include "paramet.h"
    1819#include "serre.h"
    19 #include "comconst.h"
    2020
    2121       INTEGER i,j

  • LMDZ5/trunk/libf/dyn3d_common/fxysinus.F

    r1952 r2597  
    77
    88
     9      USE comconst_mod, ONLY: pi
    910      IMPLICIT NONE
    1011c
    … …  
    1718#include "dimensions.h"
    1819#include "paramet.h"
    19 #include "comconst.h"
    2020
    2121       INTEGER i,j

  • LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90

    r2221 r2597  
    99SUBROUTINE grilles_gcm_netcdf_sub(masque,phis)
    1010
     11  USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi
    1112  IMPLICIT NONE
    1213
    1314  INCLUDE "dimensions.h"
    1415  INCLUDE "paramet.h"
    15   INCLUDE "comconst.h"
    1616  INCLUDE "comgeom.h"
    1717  INCLUDE "comvert.h"

  • LMDZ5/trunk/libf/dyn3d_common/iniconst.F90

    r2040 r2597  
    1111  use ioipsl_getincom
    1212#endif
    13 
     13  USE comconst_mod, ONLY: im, imp1, jm, jmp1, lllm, lllmm1, lllmp1, &
     14                          unsim, pi, r, kappa, cpp, dtvr, dtphys
     15 
    1416  IMPLICIT NONE
    1517  !
    … …  
    2123  include "dimensions.h"
    2224  include "paramet.h"
    23   include "comconst.h"
    2425  include "temps.h"
    2526  include "comvert.h"

  • LMDZ5/trunk/libf/dyn3d_common/inidissip.F90

    r1952 r2597  
    1212
    1313  USE control_mod, only : dissip_period,iperiod
     14  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
     15                          dtdiss, dtvr, rad
    1416
    1517  IMPLICIT NONE
    … …  
    1719  include "paramet.h"
    1820  include "comdissipn.h"
    19   include "comconst.h"
    2021  include "comvert.h"
    2122  include "logic.h"

  • LMDZ5/trunk/libf/dyn3d_common/inigeom.F

    r2218 r2597  
    1818      use fxhyp_m, only: fxhyp
    1919      use fyhyp_m, only: fyhyp
     20      USE comconst_mod, ONLY: pi, g, omeg, rad
    2021      IMPLICIT NONE
    2122c
    22 #include "dimensions.h"
    23 #include "paramet.h"
    24 #include "comconst.h"
    25 #include "comgeom2.h"
    26 #include "serre.h"
    27 #include "logic.h"
    28 #include "comdissnew.h"
     23      include "dimensions.h"
     24      include "paramet.h"
     25      include "comgeom2.h"
     26      include "serre.h"
     27      include "logic.h"
     28      include "comdissnew.h"
    2929
    3030c-----------------------------------------------------------------------

  • LMDZ5/trunk/libf/dyn3d_common/initdynav.F90

    r2239 r2597  
    99  use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid, &
    1010       dynhistave_file,dynhistvave_file,dynhistuave_file
     11  USE comconst_mod, ONLY: pi
    1112  implicit none
    1213
    … …  
    3435  include "dimensions.h"
    3536  include "paramet.h"
    36   include "comconst.h"
    3737  include "comvert.h"
    3838  include "comgeom.h"

  • LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F

    r2239 r2597  
    99       USE IOIPSL
    1010#endif
     11      USE comconst_mod, ONLY: pi
    1112      implicit none
    1213
    … …  
    3839C
    3940C   Declarations
    40 #include "dimensions.h"
    41 #include "paramet.h"
    42 #include "comconst.h"
    43 #include "comvert.h"
    44 #include "comgeom.h"
    45 #include "temps.h"
    46 #include "ener.h"
    47 #include "logic.h"
    48 #include "description.h"
    49 #include "serre.h"
    50 #include "iniprint.h"
     41      include "dimensions.h"
     42      include "paramet.h"
     43      include "comvert.h"
     44      include "comgeom.h"
     45      include "temps.h"
     46      include "ener.h"
     47      include "logic.h"
     48      include "description.h"
     49      include "serre.h"
     50      include "iniprint.h"
    5151
    5252C   Arguments
    … …  
    114114     .             tau0, zjulian, tstep, vhoriid, filevid)
    115115       
    116         rl(1,1) = 1.   
     116        rl(1,1) = 1.
    117117      call histbeg('defstoke.nc', 1, rl, 1, rl,
    118118     .             1, 1, 1, 1,

  • LMDZ5/trunk/libf/dyn3d_common/inithist.F

    r2239 r2597  
    1010       use com_io_dyn_mod, only : histid,histvid,histuid,               &
    1111     &                        dynhist_file,dynhistv_file,dynhistu_file
    12 
     12       USE comconst_mod, ONLY: pi
    1313      implicit none
    1414
    … …  
    3838C
    3939C   Declarations
    40 #include "dimensions.h"
    41 #include "paramet.h"
    42 #include "comconst.h"
    43 #include "comvert.h"
    44 #include "comgeom.h"
    45 #include "temps.h"
    46 #include "ener.h"
    47 #include "logic.h"
    48 #include "description.h"
    49 #include "serre.h"
    50 #include "iniprint.h"
     40      include "dimensions.h"
     41      include "paramet.h"
     42      include "comvert.h"
     43      include "comgeom.h"
     44      include "temps.h"
     45      include "ener.h"
     46      include "logic.h"
     47      include "description.h"
     48      include "serre.h"
     49      include "iniprint.h"
    5150
    5251C   Arguments

  • LMDZ5/trunk/libf/dyn3d_common/inter_barxy_m.F90

    r1952 r2597  
    374374
    375375    use assert_eq_m, only: assert_eq
     376    use comconst_mod, only: pi
    376377
    377378    IMPLICIT NONE
    378 
    379     include "comconst.h"
    380     ! (for "pi")
    381379
    382380    REAL, intent(in):: xi(:)
    … …  
    431429    ! order.
    432430
     431    use comconst_mod, only: pi
     432
    433433    IMPLICIT NONE
    434 
    435     include "comconst.h"
    436     ! (for "pi")
    437434
    438435    REAL, intent(in):: xi(:) ! angle, in rad or degrees

  • LMDZ5/trunk/libf/dyn3d_common/interpost.F

    r1945 r2597  
    77
    88
    9 #include "dimensions.h"
    10 #include "paramet.h"
    11 #include "comconst.h"
    12 #include "comvert.h"
    13 #include "comgeom2.h"
     9      include "dimensions.h"
     10      include "paramet.h"
     11      include "comvert.h"
     12      include "comgeom2.h"
    1413
    1514c Arguments   

  • LMDZ5/trunk/libf/dyn3d_common/interpre.F

    r2121 r2597  
    66     s            unatppm,vnatppm,psppm)
    77
    8       USE control_mod
     8      USE comconst_mod, ONLY: g
    99
    1010       implicit none
    1111
    12 #include "dimensions.h"
    13 c#include "paramr2.h"
    14 #include "paramet.h"
    15 #include "comconst.h"
    16 #include "comdissip.h"
    17 #include "comvert.h"
    18 #include "comgeom2.h"
    19 #include "logic.h"
    20 #include "temps.h"
    21 #include "ener.h"
    22 #include "description.h"
     12      include "dimensions.h"
     13      include "paramet.h"
     14      include "comdissip.h"
     15      include "comvert.h"
     16      include "comgeom2.h"
     17      include "logic.h"
     18      include "temps.h"
     19      include "ener.h"
     20      include "description.h"
    2321
    2422c---------------------------------------------------
    … …  
    7775          do j=1,jjm
    7876              do i=1,iip1
    79                   vnat(i,j,l)=-pbarv(i,j,l)/masseby(i,j,l)*cv(i,j)             
     77                  vnat(i,j,l)=-pbarv(i,j,l)/masseby(i,j,l)*cv(i,j)
    8078              enddo
    8179          enddo
    … …  
    119117                 vnatppm(i,j,l)=vnat(i,j,llm-l+1)
    120118                 fluxwppm(i,j,l)=fluxw(i,j,llm-l+1)
    121                  qppm(i,j,l)=q(i,j,llm-l+1)                             
     119                 qppm(i,j,l)=q(i,j,llm-l+1)
    122120             enddo
    123121          enddo                               

  • LMDZ5/trunk/libf/dyn3d_common/limx.F

    r1952 r2597  
    1515      IMPLICIT NONE
    1616c
    17 #include "dimensions.h"
    18 #include "paramet.h"
    19 #include "logic.h"
    20 #include "comvert.h"
    21 #include "comconst.h"
    22 #include "comgeom.h"
     17      include "dimensions.h"
     18      include "paramet.h"
     19      include "logic.h"
     20      include "comvert.h"
     21      include "comgeom.h"
    2322c
    2423c

  • LMDZ5/trunk/libf/dyn3d_common/limy.F

    r1952 r2597  
    1414c
    1515c   --------------------------------------------------------------------
     16      USE comconst_mod, ONLY: pi
    1617      IMPLICIT NONE
    1718c
    18 #include "dimensions.h"
    19 #include "paramet.h"
    20 #include "logic.h"
    21 #include "comvert.h"
    22 #include "comconst.h"
    23 #include "comgeom.h"
     19      include "dimensions.h"
     20      include "paramet.h"
     21      include "logic.h"
     22      include "comvert.h"
     23      include "comgeom.h"
    2424c
    2525c

  • LMDZ5/trunk/libf/dyn3d_common/limz.F

    r1952 r2597  
    1515      IMPLICIT NONE
    1616c
    17 #include "dimensions.h"
    18 #include "paramet.h"
    19 #include "logic.h"
    20 #include "comvert.h"
    21 #include "comconst.h"
    22 #include "comgeom.h"
     17      include "dimensions.h"
     18      include "paramet.h"
     19      include "logic.h"
     20      include "comvert.h"
     21      include "comgeom.h"
    2322c
    2423c

  • LMDZ5/trunk/libf/dyn3d_common/massbarxy.F90

    r2336 r2597  
    99  include "dimensions.h"
    1010  include "paramet.h"
    11   include "comconst.h"
    1211  include "comgeom.h"
    1312!===============================================================================

  • LMDZ5/trunk/libf/dyn3d_common/massdair.F

    r1945 r2597  
    1818      IMPLICIT NONE
    1919c
    20 #include "dimensions.h"
    21 #include "paramet.h"
    22 #include "comconst.h"
    23 #include "comgeom.h"
     20      include "dimensions.h"
     21      include "paramet.h"
     22      include "comgeom.h"
    2423c
    2524c  .....   arguments  ....

  • LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F

    r1952 r2597  
    33!
    44      SUBROUTINE pentes_ini (q,w,masse,pbaru,pbarv,mode)
     5     
     6      USE comconst_mod, ONLY: pi, dtvr
     7     
    58      IMPLICIT NONE
    69
    … …  
    2225
    2326
    24 #include "dimensions.h"
    25 #include "paramet.h"
    26 #include "comconst.h"
    27 #include "comvert.h"
    28 #include "comgeom2.h"
     27      include "dimensions.h"
     28      include "paramet.h"
     29      include "comvert.h"
     30      include "comgeom2.h"
    2931
    3032c   Arguments:

  • LMDZ5/trunk/libf/dyn3d_common/prather.F

    r1952 r2597  
    33!
    44      SUBROUTINE prather (q,w,masse,pbaru,pbarv,nt,dt)
     5     
     6      USE comconst_mod, ONLY: pi
     7     
    58      IMPLICIT NONE
    69
    … …  
    1922
    2023
    21 #include "dimensions.h"
    22 #include "paramet.h"
    23 #include "comconst.h"
    24 #include "comvert.h"
    25 #include "comgeom2.h"
     24      include "dimensions.h"
     25      include "paramet.h"
     26      include "comvert.h"
     27      include "comgeom2.h"
    2628
    2729c   Arguments:

  • LMDZ5/trunk/libf/dyn3d_common/sortvarc.F

    r2083 r2597  
    77
    88      USE control_mod, ONLY: resetvarc
     9      USE comconst_mod, ONLY: dtvr, daysec, g, rad, omeg
    910      IMPLICIT NONE
    1011
    … …  
    2728      INCLUDE "dimensions.h"
    2829      INCLUDE "paramet.h"
    29       INCLUDE "comconst.h"
    3030      INCLUDE "comvert.h"
    3131      INCLUDE "comgeom.h"

  • LMDZ5/trunk/libf/dyn3d_common/traceurpole.F

    r1952 r2597  
    44          subroutine traceurpole(q,masse)
    55
    6       USE control_mod
    7 
    86          implicit none
    97     
    10 #include "dimensions.h"
    11 c#include "paramr2.h"
    12 #include "paramet.h"
    13 #include "comconst.h"
    14 #include "comdissip.h"
    15 #include "comvert.h"
    16 #include "comgeom2.h"
    17 #include "logic.h"
    18 #include "temps.h"
    19 #include "ener.h"
    20 #include "description.h"
     8      include "dimensions.h"
     9      include "paramet.h"
     10      include "comdissip.h"
     11      include "comvert.h"
     12      include "comgeom2.h"
     13      include "logic.h"
     14      include "temps.h"
     15      include "ener.h"
     16      include "description.h"
    2117
    2218

  • LMDZ5/trunk/libf/dyn3d_common/ugeostr.F90

    r1952 r2597  
    1111  ! levels are pressure levels.
    1212
     13  use comconst_mod, only: omeg, rad
     14 
    1315  implicit none
    1416
    1517  include "dimensions.h"
    1618  include "paramet.h"
    17   include "comconst.h"
    1819  include "comgeom2.h"
    1920

  • LMDZ5/trunk/libf/dyn3d_common/writedynav.F90

    r2239 r2597  
    88  USE infotrac, ONLY : nqtot, ttext
    99  use com_io_dyn_mod, only : histaveid, histvaveid, histuaveid
     10  USE comconst_mod, ONLY: cpp
    1011
    1112  implicit none
    … …  
    3132  include "dimensions.h"
    3233  include "paramet.h"
    33   include "comconst.h"
    3434  include "comvert.h"
    3535  include "comgeom.h"

  • LMDZ5/trunk/libf/dyn3d_common/writehist.F

    r2239 r2597  
    3333C
    3434C   Declarations
    35 #include "dimensions.h"
    36 #include "paramet.h"
    37 #include "comconst.h"
    38 #include "comvert.h"
    39 #include "comgeom.h"
    40 #include "temps.h"
    41 #include "ener.h"
    42 #include "logic.h"
    43 #include "description.h"
    44 #include "serre.h"
    45 #include "iniprint.h"
     35      include "dimensions.h"
     36      include "paramet.h"
     37      include "comvert.h"
     38      include "comgeom.h"
     39      include "temps.h"
     40      include "ener.h"
     41      include "logic.h"
     42      include "description.h"
     43      include "serre.h"
     44      include "iniprint.h"
    4645
    4746C
Note: See TracChangeset for help on using the changeset viewer.