Changeset 1384 for trunk/LMDZ.GENERIC


Ignore:
Timestamp:
Mar 4, 2015, 5:00:33 PM (10 years ago)
Author:
emillour
Message:

Generic GCM:

  • Some code cleanup: turning comcstfi.h into module comcstfi_mod.F90

EM

Location:
trunk/LMDZ.GENERIC
Files:
52 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.GENERIC/README

    r1350 r1384  
    10511051- Added missing allocation in soil_settings, needed when changing number of
    10521052  soil layers.
     1053
     1054== 04/03/2015 == EM
     1055- Some code cleanup: turning comcstfi.h into module comcstfi_mod

  • trunk/LMDZ.GENERIC/libf/phystd/aeropacity.F90

    r1315 r1384  
    66       USE comgeomfi_h
    77       USE tracer_h, only: noms,rho_co2,rho_ice
     8       use comcstfi_mod, only: g
    89                 
    910       implicit none
    … …  
    4041!=======================================================================
    4142
    42 !#include "dimensions.h"
    43 !#include "dimphys.h"
    4443#include "callkeys.h"
    45 #include "comcstfi.h"
    46 !#include "comvert.h"
    4744
    4845      INTEGER,INTENT(IN) :: ngrid  ! number of atmospheric columns

  • trunk/LMDZ.GENERIC/libf/phystd/calc_cpp3d.F90

    r253 r1384  
    1212!
    1313!==================================================================
    14 
     14      use comcstfi_mod, only: cpp, r
    1515      implicit none
    1616
    17 #include "comcstfi.h"
    1817#include "callkeys.h"
    1918#include "cpdet.h"

  • trunk/LMDZ.GENERIC/libf/phystd/calc_cpp_mugaz.F90

    r1365 r1384  
    1818
    1919      use gases_h
     20      use comcstfi_mod, only: cpp, mugaz
    2021      implicit none
    2122
    22 !#include "dimensions.h"
    23 !#include "dimphys.h"
    24 #include "comcstfi.h"
    2523#include "callkeys.h"
    2624

  • trunk/LMDZ.GENERIC/libf/phystd/calc_rayleigh.F90

    r1025 r1384  
    2828      use radcommon_h, only: WAVEV, BWNV, DWNV, tstellar, tauray, taurayvar, scalep
    2929      use gases_h
     30      use comcstfi_mod, only: g, mugaz
    3031
    3132      implicit none
    3233
    33 #include "comcstfi.h"
    3434#include "callkeys.h"
    3535

  • trunk/LMDZ.GENERIC/libf/phystd/calcenergy_kcm.F90

    r1308 r1384  
    44use params_h, only : Rc
    55use watercommon_h, only : mH2O
     6use comcstfi_mod, only: g, mugaz
    67implicit none
    78
    … …  
    1011!     Authour: R. Wordsworth (2011)
    1112!     ----------------------------------------------------------------
    12 
    13 !#include "dimensions.h"
    14 !#include "dimphys.h"
    15 #include "comcstfi.h"
    16 !#include "callkeys.h"
    17 
    1813
    1914

  • trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90

    r1315 r1384  
    1818      use aerosol_mod, only : iaero_co2,iaero_h2o,iaero_dust,iaero_h2so4, iaero_back2lay
    1919      USE tracer_h
     20      use comcstfi_mod, only: pi, mugaz, cpp
    2021
    2122      implicit none
    … …  
    3637!==================================================================
    3738
    38 !#include "dimphys.h"
    39 #include "comcstfi.h"
    4039#include "callkeys.h"
    4140

  • trunk/LMDZ.GENERIC/libf/phystd/callsedim.F

    r1315 r1384  
    77      use aerosol_mod, only : iaero_h2o
    88      USE tracer_h, only : igcm_co2_ice,igcm_h2o_ice,radius,rho_q
     9      use comcstfi_mod, only: g
    910
    1011      IMPLICIT NONE
    … …  
    2829c   -------------
    2930
    30 !#include "dimensions.h"
    31 !#include "dimphys.h"
    32 #include "comcstfi.h"
    3331#include "callkeys.h"
    3432

  • trunk/LMDZ.GENERIC/libf/phystd/comcstfi_mod.F90

    r1382 r1384  
    1 !-----------------------------------------------------------------------
    2 ! INCLUDE "comcstfi.h"
     1MODULE comcstfi_mod
     2IMPLICIT NONE
     3     
     4      REAL :: pi ! something like 3.14159
     5      REAL :: rad ! radius of the planet (m)
     6      REAL :: g ! gravity (m/s2)
     7      REAL :: r ! reduced gas constant (r=8.314511/(mugaz/1000.0))
     8      REAL :: cpp ! Cp of the atmosphere
     9      REAL :: rcp ! r/cpp
     10      REAL :: dtphys ! physics time step (s)
     11      REAL :: daysec ! length of day (s)
     12      REAL :: mugaz ! molar mass of the atmosphere (g/mol)
     13      REAL :: omeg ! planet rotation rate (rad/s)
     14      REAL :: avocado ! something like 6.022e23
    315
    4       common/comcstfi/pi,rad,g,r,cpp,rcp,dtphys,daysec,mugaz,omeg
    5       common/comcstfi/avocado!,molrad,visc
    6      
    7       real pi,rad,g,r,cpp,rcp,dtphys,daysec,mugaz,omeg
    8       real avocado!,molrad,visc
    9 
     16END MODULE comcstfi_mod

  • trunk/LMDZ.GENERIC/libf/phystd/condense_cloud.F90

    r1315 r1384  
    1313      USE comgeomfi_h, only: lati
    1414      USE tracer_h, only: noms, rho_co2
    15 
     15      use comcstfi_mod, only: g, r, cpp
    1616
    1717      implicit none
    … …  
    5656!==================================================================
    5757
    58 !#include "dimensions.h"
    59 !#include "dimphys.h"
    60 #include "comcstfi.h"
    61 !#include "comvert.h"
    6258#include "callkeys.h"
    6359

  • trunk/LMDZ.GENERIC/libf/phystd/convadj.F

    r1315 r1384  
    77
    88      USE tracer_h
     9      use comcstfi_mod, only: g
    910
    1011      implicit none
    … …  
    2930!     ------------
    3031
    31 !#include "dimensions.h"
    32 !#include "dimphys.h"
    33 #include "comcstfi.h"
    3432#include "callkeys.h"
    3533

  • trunk/LMDZ.GENERIC/libf/phystd/evap.F

    r1308 r1384  
    66
    77      implicit none
    8 
    9 !#include "dimensions.h"
    10 !#include "dimphys.h"
    11 #include "comcstfi.h"
    128
    139!==================================================================

  • trunk/LMDZ.GENERIC/libf/phystd/forceWCfn.F

    r1308 r1384  
    22
    33      USE tracer_h
     4      use comcstfi_mod, only: g
    45
    56      implicit none
    … …  
    1718!     
    1819!==================================================================
    19 
    20 !#include "dimensions.h"
    21 !#include "dimphys.h"
    22 #include "comcstfi.h"
    2320
    2421      INTEGER ngrid,nlayer,nq

  • trunk/LMDZ.GENERIC/libf/phystd/gfluxi.F

    r1146 r1384  
    3232      use radinc_h
    3333      use radcommon_h, only: planckir
     34      use comcstfi_mod, only: pi
    3435
    3536      implicit none
    36 
    37 #include "comcstfi.h"
    3837
    3938      INTEGER NLP

  • trunk/LMDZ.GENERIC/libf/phystd/hydrol.F90

    r1315 r1384  
    4040!==================================================================
    4141
    42 !#include "dimensions.h"
    43 !#include "dimphys.h"
    44 #include "comcstfi.h"
    4542#include "callkeys.h"
    4643

  • trunk/LMDZ.GENERIC/libf/phystd/inifis.F

    r1315 r1384  
    1010      use comsoil_h, only: ini_comsoil_h
    1111      use control_mod, only: ecritphy
     12      use comcstfi_mod, only: rad, daysec, dtphys, cpp, g, r, rcp,
     13     &                        mugaz, pi, avocado
    1214      use planete_mod, only: nres
    1315      use planetwide_mod, only: planetwide_sumval
    … …  
    5355      USE ioipsl_getincom_p
    5456      IMPLICIT NONE
    55 !#include "dimensions.h"
    56 !#include "dimphys.h"
    57 !#include "planete.h"
    58 #include "comcstfi.h"
     57
    5958#include "callkeys.h"
    6059
    … …  
    712711
    713712!$OMP MASTER
    714       pi=2.*asin(1.) ! NB: pi is a common in comcstfi.h
     713      pi=2.*asin(1.) ! NB: pi is a common in comcstfi_mod
    715714!$OMP END MASTER
    716715!$OMP BARRIER

  • trunk/LMDZ.GENERIC/libf/phystd/iniorbit.F

    r1308 r1384  
    44      USE planete_mod, only: apoastr, periastr, year_day, obliquit,
    55     &                       peri_day, e_elips, p_elips, timeperi
     6      use comcstfi_mod, only: pi
    67      IMPLICIT NONE
    78
    8 c=======================================================================
    9 c
    10 c   Auteur:
    11 c   -------
    12 c     Frederic Hourdin      22 Fevrier 1991
    13 c
    14 c   Objet:
    15 c   ------
    16 c    Initialisation du sous programme orbite qui calcule
    17 c    a une date donnee de l'annee de duree year_day commencant
    18 c    a l'equinoxe de printemps et dont le periastre se situe
    19 c    a la date peri_day, la distance au soleil et la declinaison.
    20 c
    21 c   Interface:
    22 c   ----------
    23 c   - Doit etre appele avant d'utiliser orbite.
    24 c   - initialise une partie du common planete_mod
    25 c
    26 c   Arguments:
    27 c   ----------
    28 c
    29 c   Input:
    30 c   ------
    31 c   apoastr       \   apoastron and periastron of the orbit in AU
    32 c   periastr      /   
    33 c
    34 c=======================================================================
    35 
    36 c-----------------------------------------------------------------------
    37 c   Declarations:
    38 c   -------------
    39 
    40 !#include "planete.h"
    41 #include "comcstfi.h"
     9!=======================================================================
     10! Initialisation of orbital parameters (stored in planete_h module)
     11!=======================================================================
    4212
    4313c   Arguments:
    4414c   ----------
    4515
    46       REAL papoastr,pperiastr,pyear_day,pperi_day,pobliq
     16      REAL,INTENT(IN) :: papoastr,pperiastr,pyear_day,pperi_day,pobliq
    4717
    4818c   Local:
    … …  
    8050
    8151 
    82       PRINT*,'Periastron in AU  ',periastr
    83       PRINT*,'Apoastron in AU  ',apoastr
    84       PRINT*,'Obliquity in degrees  :',obliquit
     52      PRINT*,'iniorbit: Periastron in AU  ',periastr
     53      PRINT*,'iniorbit: Apoastron in AU  ',apoastr
     54      PRINT*,'iniorbit: Obliquity in degrees  :',obliquit
    8555
    8656
    … …  
    8858      p_elips=0.5*(periastr+apoastr)*(1-e_elips*e_elips)
    8959
    90       print*,'e_elips',e_elips
    91       print*,'p_elips',p_elips
     60      print*,'iniorbit: e_elips',e_elips
     61      print*,'iniorbit: p_elips',p_elips
    9262
    93 c-----------------------------------------------------------------------
    94 c calcul de l'angle polaire et de la distance au soleil :
    95 c -------------------------------------------------------
     63!-----------------------------------------------------------------------
     64! compute polar angle and distance to the Sun:
     65! -------------------------------------------------------
    9666
    97 c  calcul de l'zanomalie moyenne
     67!  compute mean anomaly zanom
    9868
    9969      zz=(year_day-pperi_day)/year_day
    10070      zanom=2.*pi*(zz-nint(zz))
    10171      zxref=abs(zanom)
    102       PRINT*,'zanom  ',zanom
     72      PRINT*,'iniorbit: zanom  ',zanom
    10373
    104 c  resolution de l'equation horaire  zx0 - e * sin (zx0) = zxref
    105 c  methode de Newton
     74!  solve equation  zx0 - e * sin (zx0) = zxref for eccentric anomaly zx0
     75!  using Newton method
    10676
    10777      zx0=zxref+e_elips*sin(zxref)
    108       DO 110 iter=1,100
     78      DO iter=1,100
    10979         zdx=-(zx0-e_elips*sin(zx0)-zxref)/(1.-e_elips*cos(zx0))
    110          if(abs(zdx).le.(1.e-12)) goto 120
     80         if(abs(zdx).le.(1.e-12)) exit
    11181         zx0=zx0+zdx
    112 110   continue
    113 120   continue
     82      ENDDO
     83
    11484      zx0=zx0+zdx
    11585      if(zanom.lt.0.) zx0=-zx0
    116       PRINT*,'zx0   ',zx0
    117 
    118 c zteta est la longitude solaire
     86      PRINT*,'iniorbit: zx0   ',zx0
    11987
    12088      timeperi=2.*atan(sqrt((1.+e_elips)/(1.-e_elips))*tan(zx0/2.))
    121       PRINT*,'Solar longitude of periastron timeperi = ',timeperi
     89      PRINT*,'iniorbit: Perihelion solar long. Ls (deg)=',
     90     &       360.-timeperi*180./pi
    12291
    123       RETURN
    12492      END

  • trunk/LMDZ.GENERIC/libf/phystd/initracer.F

    r1308 r1384  
    2424
    2525#include "dimensions.h"
    26 !#include "dimphys.h"
    27 #include "comcstfi.h"
    2826#include "callkeys.h"
    2927

  • trunk/LMDZ.GENERIC/libf/phystd/iniwrite.F

    r1216 r1384  
    22
    33      use comsoil_h, only: mlayer, nsoilmx
     4      use comcstfi_mod, only: rad, omeg, g, mugaz, rcp, daysec, dtphys,
     5     &                        pi
    46      IMPLICIT NONE
    57
    … …  
    2224#include "dimensions.h"
    2325#include "paramet.h"
    24 #include "comcstfi.h"
    2526#include "comvert.h"
    2627#include "comgeom.h"

  • trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specIR.F

    r1308 r1384  
    33      use radinc_h, only: L_NSPECTI
    44      use radcommon_h, only: WNOI,DWNI
    5 !      use comsoil_h
     5      use comcstfi_mod, only: rad, omeg, g, mugaz, rcp, daysec, dtphys,
     6     &                        pi
    67
    78      implicit none
    … …  
    2526#include "dimensions.h"
    2627#include "paramet.h"
    27 !include "comconst.h"
    28 #include "comcstfi.h"
    2928#include "comvert.h"
    3029#include "comgeom.h"

  • trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specVI.F

    r1308 r1384  
    44      use radcommon_h, only: WNOV,DWNV
    55      use comsoil_h
    6 
     6      use comcstfi_mod, only: rad, omeg, g, mugaz, rcp, daysec, dtphys,
     7     &                        pi
    78      implicit none
    89
    … …  
    2526#include "dimensions.h"
    2627#include "paramet.h"
    27 !include "comconst.h"
    28 #include "comcstfi.h"
    2928#include "comvert.h"
    3029#include "comgeom.h"

  • trunk/LMDZ.GENERIC/libf/phystd/iniwritesoil.F90

    r1216 r1384  
    66
    77use comsoil_h, only: mlayer, inertiedat, nsoilmx
     8use comcstfi_mod, only: pi
    89
    910implicit none
    … …  
    1112#include"dimensions.h"
    1213#include"paramet.h"
    13 #include"comcstfi.h"
    1414#include"comgeom.h"
    1515#include"netcdf.inc"
    … …  
    8989ierr=NF_PUT_VAR_REAL(nid,varid,rlonv*(180./pi))
    9090#endif
    91 ! Note: rlonv is known from comgeom.h and pi from comcstfi.h
     91! Note: rlonv is known from comgeom.h
    9292if (ierr.ne.NF_NOERR) then
    9393  write(*,*)"iniwritesoil: Error, could not write longitude variable"
    … …  
    121121ierr=NF_PUT_VAR_REAL(nid,varid,rlatu*(180./pi))
    122122#endif
    123 ! Note: rlatu is known from comgeom.h and pi from comcstfi.h
     123! Note: rlatu is known from comgeom.h
    124124if (ierr.ne.NF_NOERR) then
    125125  write(*,*)"iniwritesoil: Error, could not write longitude variable"

  • trunk/LMDZ.GENERIC/libf/phystd/kcm1d.F90

    r1308 r1384  
    99  use planete_mod
    1010!  use control_mod
    11 
     11  use comcstfi_mod
    1212  implicit none
    1313
    … …  
    3333!#include "dimphys.h"
    3434#include "callkeys.h"
    35 #include "comcstfi.h"
    36 !#include "planete.h"
    37 !#include "control.h"
    3835
    3936  ! --------------------------------------------------------------

  • trunk/LMDZ.GENERIC/libf/phystd/kcmprof_fn.F90

    r1308 r1384  
    44use watercommon_h, only : mH2O
    55use gases_h
     6use comcstfi_mod, only: mugaz, cpp, g
    67implicit none
    78
    … …  
    1213!     ----------------------------------------------------------------
    1314
    14 !#include "dimensions.h"
    15 !#include "dimphys.h"
    16 #include "comcstfi.h"
    1715#include "callkeys.h"
    1816

  • trunk/LMDZ.GENERIC/libf/phystd/largescale.F90

    r1315 r1384  
    2323!     
    2424!==================================================================
    25 
    26 !#include "dimensions.h"
    27 !#include "dimphys.h"
    28 #include "comcstfi.h"
    2925
    3026#include "callkeys.h"

  • trunk/LMDZ.GENERIC/libf/phystd/mass_redistribution.F90

    r1315 r1384  
    1010       USE tracer_h
    1111       USE planete_mod, only: bp
    12 
     12       use comcstfi_mod, only: g
     13       
    1314       IMPLICIT NONE
    1415!=======================================================================
    … …  
    5152!    ------------------
    5253!
    53 !#include "dimensions.h"
    54 !#include "dimphys.h"
    55 #include "comcstfi.h"
    56 !#include "comvert.h"
    57 !#include "paramet.h"
    5854#include "callkeys.h"
    5955

  • trunk/LMDZ.GENERIC/libf/phystd/moistadj.F90

    r1315 r1384  
    33  use watercommon_h, only: T_h2O_ice_liq, RLVTT, RCPD, RCPV, Psat_water, Lcpdqsat_water
    44  USE tracer_h, only: igcm_h2o_vap, igcm_h2o_ice
     5  use comcstfi_mod, only: r
    56
    67  implicit none
    … …  
    1920!     
    2021!=====================================================================
    21 
    22 !#include "dimensions.h"
    23 !#include "dimphys.h"
    24 #include "comcstfi.h"
    2522
    2623      INTEGER,INTENT(IN) :: ngrid, nlayer, nq

  • trunk/LMDZ.GENERIC/libf/phystd/newsedim.F

    r1315 r1384  
    11      SUBROUTINE newsedim(ngrid,nlay,naersize,ptimestep,
    22     &  pplev,masse,epaisseur,pt,rd,rho,pqi,wq)
     3     
     4      use comcstfi_mod, only: r, g
    35      IMPLICIT NONE
    46
    … …  
    1517!   declarations
    1618!   ------------
    17 
    18 !#include "dimensions.h"
    19 !#include "dimphys.h"
    20 #include "comcstfi.h"
    2119
    2220!   arguments

  • trunk/LMDZ.GENERIC/libf/phystd/newtrelax.F90

    r1315 r1384  
    11subroutine newtrelax(ngrid,nlayer,mu0,sinlat,popsk,temp,pplay,pplev,dtrad,firstcall)
    22       
     3  use comcstfi_mod, only: rcp, pi
    34  implicit none
    45
    5 !#include "dimensions.h"
    6 !#include "dimphys.h"
    7 #include "comcstfi.h"
    86#include "callkeys.h"
    97#include "netcdf.inc"

  • trunk/LMDZ.GENERIC/libf/phystd/ocean_slab_mod.F90

    r1315 r1384  
    1515
    1616
    17 !#include "dimensions.h"
    18 !#include "dimphys.h"
    19 #include "comcstfi.h"
    2017#include "callkeys.h"
    2118
    … …  
    6764
    6865
    69 !#include "dimensions.h"
    70 !#include "dimphys.h"
    71 #include "comcstfi.h"
    7266#include "callkeys.h"
    7367
    … …  
    210204      use slab_ice_h
    211205
    212 !#include "dimensions.h"
    213 !#include "dimphys.h"
    214 #include "comcstfi.h"
    215206#include "callkeys.h"
    216207
    … …  
    451442    use slab_ice_h
    452443
    453 !#include "dimensions.h"
    454 !#include "comcstfi.h"
    455 !    INCLUDE "iniprint.h"
    456444#include "callkeys.h"
    457445

  • trunk/LMDZ.GENERIC/libf/phystd/optci.F90

    r1194 r1384  
    66  use radcommon_h, only: gasi,tlimit,wrefVAR,Cmk,tgasref,pfgasref,wnoi,scalep,indi,glat_ig
    77  use gases_h
     8  use comcstfi_mod, only: g, r, mugaz
    89  implicit none
    910
    … …  
    2829  !==================================================================
    2930
    30 #include "comcstfi.h"
    3131#include "callkeys.h"
    3232

  • trunk/LMDZ.GENERIC/libf/phystd/optcv.F90

    r1194 r1384  
    66  use radcommon_h, only: gasv, tlimit, wrefVAR, Cmk, tgasref, pfgasref,wnov,scalep,indv,glat_ig
    77  use gases_h
     8  use comcstfi_mod, only: g, r, mugaz
    89
    910  implicit none
    … …  
    3536  !-------------------------------------------------------------------
    3637
    37 #include "comcstfi.h"
    3838#include "callkeys.h"
    3939

  • trunk/LMDZ.GENERIC/libf/phystd/orbite.F

    r1327 r1384  
    22
    33      use planete_mod, only: p_elips, e_elips, timeperi, obliquit
     4      use comcstfi_mod, only: pi
    45      implicit none
    56!==================================================================
    … …  
    2425c   Declarations:
    2526c   -------------
    26 
    27 #include "comcstfi.h"
    2827
    2928c arguments:

  • trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90

    r1308 r1384  
    2020!======================================================================
    2121#include "netcdf.inc"
    22 !#include "dimensions.h"
    23 !#include "dimphys.h"
    24 !#include "planete.h"
    25 #include "comcstfi.h"
    2622
    2723!======================================================================

  • trunk/LMDZ.GENERIC/libf/phystd/phyredem.F90

    r1308 r1384  
    1919  use planete_mod, only: year_day, periastr, apoastr, peri_day, &
    2020                         obliquit, z0, lmixmin, emin_turb
     21  use comcstfi_mod, only: rad, omeg, g, mugaz, rcp, daysec
    2122
    2223  implicit none
    23 !#include "planete.h"
    24 #include "comcstfi.h"
     24
    2525  character(len=*), intent(in) :: filename
    2626  real,intent(in) :: lonfi(ngrid)
    … …  
    147147  implicit none
    148148!======================================================================
    149 !#include "temps.h"
    150 #include "comcstfi.h"
    151 !#include "planete.h"
    152149#include "callkeys.h"
    153150!======================================================================

  • trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

    r1346 r1384  
    3434      use planete_mod, only: apoastr, periastr, year_day, peri_day, &
    3535                            obliquit, nres, z0
    36 
     36      use comcstfi_mod, only: pi, g, rcp, r, rad, mugaz, cpp, daysec
    3737      implicit none
    3838
    … …  
    132132!    ------------------
    133133
    134 !#include "dimensions.h"
    135 !#include "dimphys.h"
    136134#include "callkeys.h"
    137 #include "comcstfi.h"
    138 !#include "planete.h"
    139 !#include "control.h"
    140135#include "netcdf.inc"
    141136

  • trunk/LMDZ.GENERIC/libf/phystd/radii_mod.F90

    r1315 r1384  
    142142!==================================================================
    143143      use watercommon_h, Only: T_h2O_ice_liq,T_h2O_ice_clouds,rhowater,rhowaterice
     144      use comcstfi_mod, only: pi
    144145      Implicit none
    145146
    146147      include "callkeys.h"
    147 !      include "dimensions.h"
    148 !      include "dimphys.h"
    149       include "comcstfi.h"
    150148
    151149      integer,intent(in) :: ngrid
    … …  
    203201!==================================================================
    204202      use watercommon_h, Only: rhowater,rhowaterice
     203      use comcstfi_mod, only: pi
    205204      Implicit none
    206205
    207206      include "callkeys.h"
    208 !      include "dimensions.h"
    209 !      include "dimphys.h"
    210       include "comcstfi.h"
    211207
    212208      integer,intent(in) :: ngrid
    … …  
    252248!==================================================================
    253249      USE tracer_h, only:igcm_co2_ice,rho_co2
     250      use comcstfi_mod, only: pi
    254251      Implicit none
    255252
    256253      include "callkeys.h"
    257 !      include "dimensions.h"
    258 !      include "dimphys.h"
    259       include "comcstfi.h"
    260254
    261255      integer,intent(in) :: ngrid,nlayer,nq
    … …  
    300294      Implicit none
    301295
    302 !      include "callkeys.h"
    303 !      include "dimensions.h"
    304 !      include "dimphys.h"
    305 
    306296      integer,intent(in) :: ngrid
    307297      integer,intent(in) :: nlayer
    … …  
    329319      Implicit none
    330320
    331 !      include "callkeys.h"
    332 !      include "dimensions.h"
    333 !      include "dimphys.h"
    334 
    335321      integer,intent(in) :: ngrid
    336322      integer,intent(in) :: nlayer
    … …  
    360346
    361347     include "callkeys.h"
    362 !     include "dimensions.h"
    363 !     include "dimphys.h"
    364348
    365349      integer,intent(in) :: ngrid

  • trunk/LMDZ.GENERIC/libf/phystd/rain.F90

    r1315 r1384  
    88  use radii_mod, only: h2o_cloudrad
    99  USE tracer_h, only: igcm_h2o_vap, igcm_h2o_ice
     10  use comcstfi_mod, only: g, r
    1011  implicit none
    1112
    … …  
    2425!==================================================================
    2526
    26 !  include "dimensions.h"
    27 !  include "dimphys.h"
    28   include "comcstfi.h"
    2927  include "callkeys.h"
    3028

  • trunk/LMDZ.GENERIC/libf/phystd/rcm1d.F

    r1371 r1384  
    1919     &         obliquit,nres,z0,lmixmin,emin_turb,coefvis,coefir,
    2020     &         timeperi,e_elips,p_elips
    21 
     21      use comcstfi_mod, only: pi, cpp, daysec, dtphys, rad, g, r,
     22     &                        mugaz, rcp, omeg
    2223      implicit none
    2324
    … …  
    5051!include "dimphys.h"
    5152#include "callkeys.h"
    52 #include "comcstfi.h"
    53 !#include "planete.h"
    54 !#include "control.h"
    5553#include "comvert.h"
    5654#include "netcdf.inc"

  • trunk/LMDZ.GENERIC/libf/phystd/setspi.F90

    r1315 r1384  
    2525      use radcommon_h, only: BWNI,BLAMI,WNOI,DWNI,WAVEI,planckir,sigma
    2626      use datafile_mod, only: datadir
     27      use comcstfi_mod, only: pi
    2728
    2829      implicit none
    2930
    3031#include "callkeys.h"
    31 #include "comcstfi.h"
    3232
    3333      logical file_ok

  • trunk/LMDZ.GENERIC/libf/phystd/setspv.F90

    r1315 r1384  
    3030      implicit none
    3131
    32 #include "comcstfi.h"
    3332#include "callkeys.h"
    3433

  • trunk/LMDZ.GENERIC/libf/phystd/sfluxi.F

    r961 r1384  
    66      use radinc_h
    77      use radcommon_h, only: planckir, tlimit,sigma
     8      use comcstfi_mod, only: pi
    89
    910      implicit none
    10 
    11 #include "comcstfi.h"
    1211
    1312      integer NLEVRAD, L, NW, NG, NTS, NTT

  • trunk/LMDZ.GENERIC/libf/phystd/stellarlong.F

    r1308 r1384  
    22     
    33      USE planete_mod, ONLY: year_day, peri_day, e_elips, timeperi
     4      use comcstfi_mod, only: pi
    45      IMPLICIT NONE
    56
    … …  
    4142c   Declarations:
    4243c   -------------
    43 
    44 !#include "planete.h"
    45 #include "comcstfi.h"
    4644
    4745c arguments:

  • trunk/LMDZ.GENERIC/libf/phystd/stokes.F90

    r1324 r1384  
    1414
    1515!      use radcommon_h, only : Rgas
     16      use comcstfi_mod, only: g, pi, avocado
    1617
    1718      implicit none
    18 
    19 #include "comcstfi.h"
    2019
    2120!     input

  • trunk/LMDZ.GENERIC/libf/phystd/su_watercycle.F90

    r875 r1384  
    22
    33      use watercommon_h
     4      use comcstfi_mod, only: cpp, mugaz
    45      implicit none
    5 #include "comcstfi.h"
     6
    67#include "callkeys.h"
    78

  • trunk/LMDZ.GENERIC/libf/phystd/sugas_corrk.F90

    r1328 r1384  
    2626      use radcommon_h, only : wrefvar,WNOI,WNOV
    2727      use datafile_mod, only: datadir
    28 
     28      use comcstfi_mod, only: mugaz
    2929      use gases_h
    3030!      use ioipsl_getincom
    … …  
    3333
    3434#include "callkeys.h"
    35 #include "comcstfi.h"
    3635
    3736!==================================================================

  • trunk/LMDZ.GENERIC/libf/phystd/surf_heat_transp_mod.F90

    r1308 r1384  
    1616!#include "dimphys.h"
    1717#include "paramet.h"
    18 #include "comcstfi.h"
    1918#include "comgeom.h"
    2019#include "comhdiff.h"
    … …  
    5150!#include "dimphys.h"
    5251#include "paramet.h"
    53 #include "comcstfi.h"   
    5452#include "comgeom.h"
    5553#include "comhdiff.h"
    … …  
    115113!#include "dimphys.h"
    116114#include "paramet.h"
    117 #include "comcstfi.h"
    118115#include "callkeys.h"
    119116#include "comgeom.h"

  • trunk/LMDZ.GENERIC/libf/phystd/surface_nature.F

    r1308 r1384  
    3333!==================================================================
    3434
    35 !#include "dimensions.h"
    36 !#include "dimphys.h"
    37 #include "comcstfi.h"
    3835#include "callkeys.h"
    3936

  • trunk/LMDZ.GENERIC/libf/phystd/tabfi.F

    r1308 r1384  
    5353      use planete_mod, only: year_day, periastr, apoastr, peri_day,
    5454     &                       obliquit, z0, lmixmin, emin_turb
    55 
     55      use comcstfi_mod, only: rad, omeg, g, mugaz, rcp, cpp, dtphys,
     56     &                        daysec, r
    5657      implicit none
    5758 
    58 #include "comcstfi.h"
    59 !#include "planete.h"
    6059#include "netcdf.inc"
    6160#include "callkeys.h"

  • trunk/LMDZ.GENERIC/libf/phystd/totalcloudfrac.F90

    r1308 r1384  
    1919!==================================================================
    2020
    21 !#include "dimensions.h"
    22 !#include "dimphys.h"
    23 #include "comcstfi.h"
    2421#include "callkeys.h"
    2522

  • trunk/LMDZ.GENERIC/libf/phystd/turbdiff.F90

    r1315 r1384  
    1111      use surfdat_h, only: dryness
    1212      use tracer_h, only: igcm_h2o_vap, igcm_h2o_ice
     13      use comcstfi_mod, only: rcp, g, r, cpp
    1314
    1415      implicit none
    … …  
    4142!     ------------
    4243
    43 !      include "dimensions.h"
    44 !      include "dimphys.h"
    45       include "comcstfi.h"
    4644      include "callkeys.h"
    4745

  • trunk/LMDZ.GENERIC/libf/phystd/vdifc.F

    r1315 r1384  
    1212      USE comgeomfi_h
    1313      USE tracer_h
     14      use comcstfi_mod, only: g, r, cpp, rcp
    1415
    1516      implicit none
    … …  
    3839!     ------------
    3940
    40 !#include "dimensions.h"
    41 !#include "dimphys.h"
    42 #include "comcstfi.h"
    4341#include "callkeys.h"
    4442

  • trunk/LMDZ.GENERIC/libf/phystd/writeg1d.F

    r135 r1384  
    128128
    129129      SUBROUTINE endg1d(ngrid,nlayer,zlayer,ndt)
     130      USE comcstfi_mod, ONLY: dtphys, daysec
    130131      IMPLICIT NONE
    131132c.......................................................................
    … …  
    142143c
    143144#include "comg1d.h"
    144 #include "comcstfi.h"
    145145
    146146
Note: See TracChangeset for help on using the changeset viewer.