Ignore:
Timestamp:
May 19, 2014, 10:05:08 AM (11 years ago)
Author:
aslmd
Message:

LMDZ.MARS
IMPORTANT CHANGE

  • Remove all reference/use of nlayermx and dimphys.h
  • Made use of automatic arrays whenever arrays are needed with dimension nlayer
  • Remove lots of obsolete reference to dimensions.h
  • Converted iono.h and param_v4.h into corresponding modules

(with embedded subroutine to allocate arrays)
(no arrays allocated if thermosphere not used)

  • Deleted param.h and put contents into module param_v4_h
  • Adapted testphys1d, newstart, etc...
  • Made DATA arrays in param_read to be initialized by subroutine

fill_data_thermos in module param_v4_h

  • Optimized computations in paramfoto_compact (twice less dlog10 calculations)
  • Checked consistency before/after modification in debug mode
  • Checked performance is not impacted (same as before)
Location:
trunk/LMDZ.MARS/libf/phymars
Files:
1 deleted
71 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.MARS/libf/phymars/aeropacity.F

    r1246 r1266  
    5656c
    5757c=======================================================================
    58 !#include "dimensions.h"
    59 !#include "dimphys.h"
    6058#include "callkeys.h"
    61 !#include "comgeomfi.h"
    62 !#include "dimradmars.h"
    63 !#include "tracer.h"
    6459
    6560c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/aeroptproperties.F

    r1246 r1266  
    2828
    2929#include "dimensions.h"
    30 #include "dimphys.h"
    3130#include "callkeys.h"
    32 !#include "dimradmars.h"
    3331
    3432c     Local variables

  • trunk/LMDZ.MARS/libf/phymars/albedocaps.F90

    r1130 r1266  
    1313
    1414#include"dimensions.h"
    15 #include"dimphys.h"
    16 !#include"surfdat.h"
    1715#include"callkeys.h"
    18 !#ifdef MESOSCALE
    19 !#include"comgeomfi.h"
    20 !#endif
    2116
    2217! arguments:
    … …  
    10095implicit none
    10196#include"dimensions.h"
    102 #include"dimphys.h"
    103 !#include"surfdat.h"
    104 !#include"comgeomfi.h"
    10597#include"datafile.h"
    10698

  • trunk/LMDZ.MARS/libf/phymars/blendrad.F

    r1047 r1266  
    1515      use yomlw_h, only: nlaylte
    1616      implicit none
    17 !#include "dimensions.h"
    18 !#include "dimphys.h"
    19 !#include "dimradmars.h"
    2017#include "nlteparams.h"
    21 !#include "yomlw.h"
    2218
    2319c     Input:

  • trunk/LMDZ.MARS/libf/phymars/calldrag_noro.F

    r1047 r1266  
    5555c    ------------------
    5656c
    57 !#include "dimensions.h"
    58 !#include "dimphys.h"
    59 !#include "dimradmars.h"
    60 !#include "surfdat.h"
    6157
    6258c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/callradite.F

    r1246 r1266  
    8282c   over layers 1..NFLEV (set in dimradmars_mod).  Returns zero for higher
    8383c   layers, if any.
    84 c   In other routines, nlayermx -> nflev.
     84c   In other routines, nlayer -> nflev.
    8585c   Routines affected: lwflux, lwi, lwmain, lwxb, lwxd, lwxn.
    8686c
    … …  
    151151c    -------------
    152152c
    153 !#include "dimensions.h"
    154 !#include "dimphys.h"
    155 !#include "dimradmars.h"
    156153#include "callkeys.h"
    157 !#include "yomlw.h"
    158154
    159155c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/callsedim.F

    r1226 r1266  
    3030c   -------------
    3131     
    32 !#include "dimensions.h"
    33 !#include "dimphys.h"
    34 !#include "tracer.h"
    3532#include "callkeys.h"
    3633

  • trunk/LMDZ.MARS/libf/phymars/co2snow.F

    r1226 r1266  
    1818
    1919#include "dimensions.h"
    20 #include "dimphys.h"
    21 !#include "surfdat.h"
    2220#include "callkeys.h"
    2321

  • trunk/LMDZ.MARS/libf/phymars/conf_phys.F

    r1264 r1266  
    4646      IMPLICIT NONE
    4747#include "dimensions.h"
    48 #include "dimphys.h"
    49 !#include "comsaison.h"
    50 !#include "comdiurn.h"
    51 !#include "comgeomfi.h"
    5248#include "callkeys.h"
    53 !#include "surfdat.h"
    54 !#include "dimradmars.h"
    5549#include "datafile.h"
    56 !#include "slope.h"
    5750#include "microphys.h"
    58 !#include "tracer.h"
    5951
    6052      INTEGER,INTENT(IN) :: ngrid,nlayer,nq

  • trunk/LMDZ.MARS/libf/phymars/convadj.F

    r1226 r1266  
    3232!     ------------
    3333
    34 !#include "dimensions.h"
    35 !#include "dimphys.h"
    3634#include "callkeys.h"
    37 !#include "tracer.h"
    3835
    3936

  • trunk/LMDZ.MARS/libf/phymars/dimradmars_mod.F90

    r1246 r1266  
    88  ! NDLO2 and ndomainsz for the splitting in the physics call
    99  ! WARNING:  One must have  1 < ndomainsz =< ngrid
    10   integer,save :: NFLEV !=nlayermx   ! with splitting
     10  integer,save :: NFLEV !=nlayer   ! with splitting
    1111  integer,save :: ndomainsz !=(ngrid-1)/20 + 1
    1212  integer,save :: NDLON !=ndomainsz  ! with splitting

  • trunk/LMDZ.MARS/libf/phymars/drag_noro.F

    r1226 r1266  
    4848C
    4949C     comcstfi.h
    50 C     dimphys.h
    5150C
    5251c
    … …  
    7170c d_v-----output-R-increment de la vitesse v
    7271c======================================================================
    73 !#include "dimensions.h"
    74 !#include "dimphys.h"
    75 !#include "dimradmars.h"
    7672c
    7773c ARGUMENTS

  • trunk/LMDZ.MARS/libf/phymars/dustdevil.F

    r1226 r1266  
    3030c   -------------
    3131
    32 !#include "dimensions.h"
    33 !#include "dimphys.h"
    34 c#include "comconst.h"        ! TEMPORAIRE AVEC ANLDEVIL !!!!
    35 !#include "surfdat.h"
    36 !#include "comgeomfi.h"
    37 !#include "tracer.h"
    3832c   arguments:
    3933c   ----------

  • trunk/LMDZ.MARS/libf/phymars/dustlift.F

    r1226 r1266  
    2424c   declarations:
    2525c   -------------
    26 
    27 !#include "dimensions.h"
    28 !#include "dimphys.h"
    29 !#include "tracer.h"
    3026
    3127c

  • trunk/LMDZ.MARS/libf/phymars/eofdump_mod.F90

    r1226 r1266  
    2222!
    2323#include "dimensions.h"
    24 !#include "dimphys.h"
    2524!
    2625
    … …  
    8685!
    8786#include "dimensions.h"
    88 !#include "dimphys.h"
    8987#include "comvert.h"
    90 !#include "comgeomfi.h"
    9188
    9289      integer,intent(in) :: ngrid ! total number of physics grid points

  • trunk/LMDZ.MARS/libf/phymars/flusv.F

    r1047 r1266  
    11      SUBROUTINE flusv(KDLON,nsf,n,omega,g,tau,emis,bh,bsol,fah,fdh)
    2       use dimradmars_mod, only: ndlo2, ndlon
     2      use dimradmars_mod, only: ndlo2, ndlon, nflev
    33      IMPLICIT NONE
    44c.......................................................................
    … …  
    3737c
    3838#include "dimensions.h"
    39 #include "dimphys.h"
    40 !#include "dimradmars.h"
    4139c.......................................................................
    4240c  declaration des arguments
    … …  
    5250      INTEGER iv,i,j
    5351      REAL beta,gama1,gama2,amu1,grgama,b0,b1
    54       REAL a(NDLON,4*nlayermx),b(NDLON,4*nlayermx)
    55      &    ,d(NDLON,4*nlayermx),e(NDLON,4*nlayermx)
    56      &    ,y(NDLON,4*nlayermx)
    57      &    ,alambda(NDLON,2*nlayermx)
    58      &    ,e1(NDLON,2*nlayermx),e2(NDLON,2*nlayermx)
    59      &    ,e3(NDLON,2*nlayermx),e4(NDLON,2*nlayermx)
    60      &    ,cah(NDLON,2*nlayermx),cab(NDLON,2*nlayermx)
    61      &    ,cdh(NDLON,2*nlayermx),cdb(NDLON,2*nlayermx)
    62       REAL grg(NDLON,2*nlayermx),grh(NDLON,2*nlayermx)
    63      &    ,grj(NDLON,2*nlayermx),grk(NDLON,2*nlayermx)
    64      &    ,alpha1(NDLON,2*nlayermx),alpha2(NDLON,2*nlayermx)
    65      &    ,sigma1(NDLON,2*nlayermx),sigma2(NDLON,2*nlayermx)
     52      REAL a(NDLON,4*nflev),b(NDLON,4*nflev)
     53     &    ,d(NDLON,4*nflev),e(NDLON,4*nflev)
     54     &    ,y(NDLON,4*nflev)
     55     &    ,alambda(NDLON,2*nflev)
     56     &    ,e1(NDLON,2*nflev),e2(NDLON,2*nflev)
     57     &    ,e3(NDLON,2*nflev),e4(NDLON,2*nflev)
     58     &    ,cah(NDLON,2*nflev),cab(NDLON,2*nflev)
     59     &    ,cdh(NDLON,2*nflev),cdb(NDLON,2*nflev)
     60      REAL grg(NDLON,2*nflev),grh(NDLON,2*nflev)
     61     &    ,grj(NDLON,2*nflev),grk(NDLON,2*nflev)
     62     &    ,alpha1(NDLON,2*nflev),alpha2(NDLON,2*nflev)
     63     &    ,sigma1(NDLON,2*nflev),sigma2(NDLON,2*nflev)
    6664      INTEGER nq
    6765      PARAMETER (nq=8)
    … …  
    272270
    273271      SUBROUTINE sys3v(KDLON,n,a,b,d,e,y)
    274       use dimradmars_mod, only: ndlon, ndlo2
     272      use dimradmars_mod, only: ndlon, ndlo2, nflev
    275273      IMPLICIT NONE
    276274c.......................................................................
    … …  
    291289c
    292290c.......................................................................
    293 c  include des dimensions locales
    294 c
    295 #include "dimensions.h"
    296 #include "dimphys.h"
    297 !#include "dimradmars.h"
    298 c.......................................................................
    299291c  declaration des arguments
    300292c
    … …  
    305297c
    306298      INTEGER iv,i
    307       REAL as(NDLON,4*nlayermx),ds(NDLON,4*nlayermx)
    308      &    ,x(NDLON,4*nlayermx)
     299      REAL as(NDLON,4*nflev),ds(NDLON,4*nflev)
     300     &    ,x(NDLON,4*nflev)
    309301c.......................................................................
    310302c

  • trunk/LMDZ.MARS/libf/phymars/getslopes.F90

    r1226 r1266  
    77
    88#include "dimensions.h"
    9 !#include "dimphys.h"
    10 !#include "slope.h"
    11 !#include "comgeomfi.h"
    12 
    139
    1410! This routine computes slope inclination and orientation for the GCM (callslope=.true. in callphys.def)

  • trunk/LMDZ.MARS/libf/phymars/growthrate.F

    r1226 r1266  
    2020c   -------------
    2121
    22 #include "dimensions.h"
    23 #include "dimphys.h"
    24 !#include "tracer.h"
    2522#include "microphys.h"
    2623

  • trunk/LMDZ.MARS/libf/phymars/gwprofil.F

    r1047 r1266  
    5858C
    5959
    60 #include "dimensions.h"
    61 #include "dimphys.h"
    62 !#include "dimradmars.h"
    6360      integer klon,klev,kidia,kfdia
    6461#include "yoegwd.h"
    … …  
    9188
    9289      integer ji,jk,jl,ilevh
    93       REAL ZDZ2 (NDLO2,nlayermx) , ZNORM(NDLO2) , zoro(NDLO2)
    94       REAL ZTAU (NDLO2,nlayermx+1)
     90      REAL ZDZ2 (NDLO2,klev) , ZNORM(NDLO2) , zoro(NDLO2)
     91      REAL ZTAU (NDLO2,klev+1)
    9592C
    9693C-----------------------------------------------------------------------
    … …  
    182179c     write(*,*) 'ptau'
    183180c     write(*,99) ((ji,ilevh,ptau(ji,ilevh),ji=1,NDLO2),
    184 c    .                  ilevh=1,nlayermx+1)
     181c    .                  ilevh=1,klev+1)
    185182 99   FORMAT(i3,i3,f15.5)
    186183

  • trunk/LMDZ.MARS/libf/phymars/gwstress.F

    r1047 r1266  
    4848      implicit none
    4949#include "dimensions.h"
    50 #include "dimphys.h"
    51 !#include "dimradmars.h"
    5250      integer klon,klev,kidia,kfdia
    5351

  • trunk/LMDZ.MARS/libf/phymars/improvedclouds.F

    r1226 r1266  
    3535c           A. Spiga, optimization (February 2012)
    3636c------------------------------------------------------------------
    37 !#include "dimensions.h"
    38 !#include "dimphys.h"
    3937#include "callkeys.h"
    40 !#include "tracer.h"
    41 !#include "comgeomfi.h"
    42 !#include "dimradmars.h"
    4338#include "microphys.h"
    44 !#include "conc.h"
    4539c------------------------------------------------------------------
    4640c     Inputs:

  • trunk/LMDZ.MARS/libf/phymars/ini_archive.F

    r1208 r1266  
    3838
    3939#include "dimensions.h"
    40 #include "dimphys.h"
    4140#include "paramet.h"
    4241#include "comconst.h"
    … …  
    4847#include "description.h"
    4948#include "serre.h"
    50 !#include "control.h"
    51 !#include"comsoil.h"
    52 
    5349#include "netcdf.inc"
    5450

  • trunk/LMDZ.MARS/libf/phymars/initracer.F

    r1226 r1266  
    2727
    2828
    29 !#include "dimensions.h"
    30 !#include "dimphys.h"
    3129#include "callkeys.h"
    32 !#include "tracer.h"
    33 !#include "advtrac.h"
    34 !#include "comgeomfi.h"
    35 
    36 !#include "surfdat.h"
    3730
    3831      integer,intent(in) :: ngrid ! number of atmospheric columns

  • trunk/LMDZ.MARS/libf/phymars/iniwrite.F

    r1226 r1266  
    2323#include "dimensions.h"
    2424#include "paramet.h"
    25 !include "comconst.h"
    2625#include "comvert.h"
    2726#include "comgeom.h"
    … …  
    3231#include "description.h"
    3332#include "serre.h"
    34 !#include"dimphys.h"
    35 !#include"comsoil.h"
    3633
    3734c   Arguments:

  • trunk/LMDZ.MARS/libf/phymars/iniwritesoil.F90

    r1226 r1266  
    1111
    1212#include"dimensions.h"
    13 !#include"dimphys.h"
    1413#include"paramet.h"
    1514#include"comgeom.h"
    16 !#include"comsoil.h"
    1715#include"netcdf.inc"
    1816
    … …  
    5149endif
    5250ierr=NF_DEF_DIM(nid,"depth",nsoilmx,idim_depth)
    53 ! nsoilmx known from dimphys.h
     51! nsoilmx known from comsoil_h
    5452if (ierr.ne.NF_NOERR) then
    5553  write(*,*)"iniwritesoil: Error, could not define depth dimension"

  • trunk/LMDZ.MARS/libf/phymars/lect_start_archive.F

    r1246 r1266  
    2323
    2424#include "dimensions.h"
    25 !#include "dimphys.h"
    26 !#include "surfdat.h"
    27 !#include "comsoil.h"
    28 !#include "dimradmars.h"
    2925#include "paramet.h"
    3026#include "comconst.h"
    3127#include "comvert.h"
    3228#include "comgeom2.h"
    33 !#include "control.h"
    3429#include "logic.h"
    3530#include "description.h"
    3631#include "ener.h"
    3732#include "temps.h"
    38 !#include "lmdstd.h"
    3933#include "netcdf.inc"
    40 !#include "tracer.h"
    41 !#include"advtrac.h"
    4234c=======================================================================
    4335c   Declarations
    … …  
    337329      write(*,*) '    which implies that you want subterranean interpola
    338330     &tion.'
    339       write(*,*) '  Otherwise, set nsoilmx -in dimphys.h- to: ',nsoilold
     331      write(*,*) '  Otherwise, set nsoilmx -in comsoil_h- to: ',nsoilold
    340332      endif
    341333      write(*,*) "time lenght: ",timelen

  • trunk/LMDZ.MARS/libf/phymars/lwb.F

    r1085 r1266  
    1111      implicit none
    1212 
    13 !#include "dimensions.h"
    14 !#include "dimphys.h"
    15 !#include "dimradmars.h"
    16 !#include "callkeys.h"
    17 
    18 !#include "yomlw.h"
    19 
    2013c----------------------------------------------------------------------
    2114c         0.1   arguments

  • trunk/LMDZ.MARS/libf/phymars/lwdiff.F

    r1246 r1266  
    1010      IMPLICIT NONE
    1111 
    12 !#include "dimensions.h"
    13 !#include "dimphys.h"
    14 !#include "dimradmars.h"
    1512#include "callkeys.h"
    1613
    17 !#include "yomlw.h"
    1814C-----------------------------------------------------------------------
    1915C

  • trunk/LMDZ.MARS/libf/phymars/lwflux.F

    r1047 r1266  
    1515      implicit none
    1616 
    17 
    18 !#include "dimensions.h"
    19 !#include "dimphys.h"
    20 !#include "dimradmars.h"
    2117#include "callkeys.h"
    2218#include "comg1d.h"
    23  
    24 !#include "yomlw.h"
    2519
    2620c----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/lwi.F

    r1226 r1266  
    99      implicit none
    1010
    11 
    12 !#include "dimensions.h"
    13 !#include "dimphys.h"
    14 !#include "dimradmars.h"
    1511#include "comg1d.h"
    1612#include "callkeys.h"
    17 !#include "yomlw.h"
    1813 
    1914CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC

  • trunk/LMDZ.MARS/libf/phymars/lwmain.F

    r1246 r1266  
    1717      implicit none
    1818 
    19 !#include "dimensions.h"
    20 !#include "dimphys.h"
    21 !#include "dimradmars.h"
    2219#include "callkeys.h"
    2320#include "comg1d.h"
    24 !#include "yomlw.h"
    2521
    2622c----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/lwtt.F

    r1047 r1266  
    1010      use yomlw_h, only: ga, gb, cst_voigt
    1111      implicit none
    12 
    13 !#include "dimensions.h"
    14 !#include "dimphys.h"
    15 !#include "dimradmars.h"
    16 !#include "yomlw.h"
    1712
    1813c----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/lwu.F

    r1246 r1266  
    3737      implicit none
    3838
    39 !#include "dimensions.h"
    40 !#include "dimphys.h"
    41 !#include "dimradmars.h"
    42 
    43 !#include "yomlw.h"
    44 
    4539#include "callkeys.h"
    4640

  • trunk/LMDZ.MARS/libf/phymars/lwxb.F

    r1047 r1266  
    3636      use yomlw_h, only: xi, nlaylte
    3737      implicit none
    38 
    39 !#include "dimensions.h"
    40 !#include "dimphys.h"
    41 !#include "dimradmars.h"
    42 !#include "callkeys.h"
    43  
    44 !#include "yomlw.h"
    4538
    4639c----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/lwxd.F

    r1047 r1266  
    3636      implicit none
    3737
    38 !#include "dimensions.h"
    39 !#include "dimphys.h"
    40 !#include "dimradmars.h"
    41  
    42 !#include "yomlw.h"
    4338#include "callkeys.h"
    4439

  • trunk/LMDZ.MARS/libf/phymars/lwxn.F

    r1047 r1266  
    7474      implicit none
    7575
    76 !#include "dimensions.h"
    77 !#include "dimphys.h"
    78 !#include "dimradmars.h"
    79  
    80 !#include "yomlw.h"
    8176#include "callkeys.h"
    8277

  • trunk/LMDZ.MARS/libf/phymars/newcondens.F

    r1263 r1266  
    5959c
    6060#include "dimensions.h"
    61 !#include "dimphys.h"
    62 !#include "surfdat.h"
    63 !#include "comgeomfi.h"
    6461#include "comvert.h"
    65 !#include "paramet.h"
    6662#include "callkeys.h"
    67 !#include "tracer.h"
    6863
    6964c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/newsedim.F

    r1226 r1266  
    1414c   declarations:
    1515c   -------------
    16 
    17 !#include "dimensions.h"
    18 !#include "dimphys.h"
    1916
    2017c

  • trunk/LMDZ.MARS/libf/phymars/newstart.F

    r1246 r1266  
    3939#include "dimensions.h"
    4040      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm)
    41 #include "dimphys.h"
    42 !#include "surfdat.h"
    43 !#include "comsoil.h"
    44 !#include "dimradmars.h"
    4541#include "paramet.h"
    4642#include "comconst.h"
    4743#include "comvert.h"
    4844#include "comgeom2.h"
    49 !#include "control.h"
    5045#include "logic.h"
    5146#include "description.h"
    5247#include "ener.h"
    5348#include "temps.h"
    54 !#include "lmdstd.h"
    5549#include "comdissnew.h"
    5650#include "clesph0.h"
    5751#include "serre.h"
    5852#include "netcdf.inc"
    59 !#include"advtrac.h"
    60 !#include"tracer.h"
    6153#include "datafile.h"
    6254c=======================================================================
    … …  
    10597c variable physique
    10698c------------------
    107 !      REAL tsurf(ngridmx)      ! surface temperature
    108 !      REAL tsoil(ngridmx,nsoilmx) ! soil temperature
    109 !      REAL co2ice(ngridmx)     ! CO2 ice layer
    110 !      REAL emis(ngridmx)       ! surface emissivity
    111 !      REAL tauscaling(ngridmx) ! dust conversion factor
    11299      REAL tauscadyn(iip1,jjp1) ! dust conversion factor on the dynamics grid
    113 !      REAL,ALLOCATABLE :: qsurf(:,:)
    114 !      REAL q2(ngridmx,nlayermx+1)
    115 !      REAL rnaturfi(ngridmx)
    116100      real alb(iip1,jjp1),albfi(ngridmx) ! albedos
    117101      real ith(iip1,jjp1,nsoilmx),ithfi(ngridmx,nsoilmx) ! thermal inertia (3D)
    … …  
    203187! allocate arrays
    204188      allocate(q(iip1,jjp1,llm,nqtot))
    205 !      allocate(qsurf(ngridmx,nqtot)) ! done in ini_surfdat_h
    206189      allocate(coefvmr(nqtot))
    207190

  • trunk/LMDZ.MARS/libf/phymars/nirco2abs.F

    r1226 r1266  
    4747c    ------------------
    4848c
    49 !#include "dimensions.h"
    50 !#include "dimphys.h"
    5149#include "callkeys.h"
    52 !#include "comdiurn.h"
    5350#include "nirdata.h"
    54 !#include "tracer.h"
    5551
    5652c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/nlte_tcool.F

    r1260 r1266  
    3434
    3535      include "dimensions.h"
    36       include "dimphys.h"
    3736      include 'nlte_paramdef.h'
    3837      include 'nlte_commons.h'
    3938      include "chimiedata.h"
    40 !      include "conc.h"
    4139
    4240
    … …  
    13611359     @     ( mmean_nlte,cpmean_nlte )         
    13621360      USE comcstfi_h
     1361      use param_v4_h, only: n_avog
    13631362      implicit none                           
    13641363     
    1365       include 'param.h'
    1366      
    13671364c     argumentos                                   
    1368       real      mmean_nlte,cpmean_nlte
    1369       real      hrkday_convert                           
     1365      real mmean_nlte,cpmean_nlte
     1366      real hrkday_convert                           
    13701367     
    13711368ccccccccccccccccccccccccccccccccccccc

  • trunk/LMDZ.MARS/libf/phymars/nltecool.F

    r1047 r1266  
    3636#include "nltedata.h" ! (Equivalent to the reading of the "nlte_escape.dat" file)
    3737#include "dimensions.h"
    38 #include "dimphys.h"
    3938#include "chimiedata.h"
    40 !#include "conc.h" !Added to have "dynamic composition" in the scheme
    41 !#include "tracer.h" !"
    4239#include "callkeys.h"
    4340

  • trunk/LMDZ.MARS/libf/phymars/nlthermeq.F

    r1047 r1266  
    1010      use yomlw_h, only: nlaylte
    1111      implicit none
    12 !#include "dimensions.h"
    13 !#include "dimphys.h"
    14 !#include "dimradmars.h"
    1512#include "nlteparams.h"
    16 !#include "yomlw.h"
    1713#include "callkeys.h"
    1814

  • trunk/LMDZ.MARS/libf/phymars/nuclea.F

    r1226 r1266  
    1616
    1717#include "dimensions.h"
    18 #include "dimphys.h"
    19 !#include "tracer.h"
    2018#include "microphys.h"
    2119

  • trunk/LMDZ.MARS/libf/phymars/orodrag.F

    r1226 r1266  
    5353C
    5454C     comcstfi.h
    55 C     dimphys.h
    5655C     yoegwd.h
    5756C
    … …  
    7675C
    7776C
    78 #include "dimensions.h"
    79 #include "dimphys.h"
    80 !#include "dimradmars.h"
    8177      integer klon,klev,kidia
    8278      parameter(kidia=1)
    … …  
    123119      real zconb,zabsv,zzd1,ratio,zust,zvst,zdis,ztemp
    124120C
    125       REAL   ZTAU(NDLO2,nlayermx+1),
    126      *       ZSTAB(NDLO2,nlayermx+1),
    127      *       ZVPH(NDLO2,nlayermx+1),
    128      *       ZRHO(NDLO2,nlayermx+1),
    129      *       ZRI(NDLO2,nlayermx+1),
    130      *       ZpsI(NDLO2,nlayermx+1),
    131      *       Zzdep(NDLO2,nlayermx)
     121      REAL   ZTAU(NDLO2,klev+1),
     122     *       ZSTAB(NDLO2,klev+1),
     123     *       ZVPH(NDLO2,klev+1),
     124     *       ZRHO(NDLO2,klev+1),
     125     *       ZRI(NDLO2,klev+1),
     126     *       ZpsI(NDLO2,klev+1),
     127     *       Zzdep(NDLO2,klev)
    132128      REAL   ZDUDT(NDLO2),
    133129     *       ZDVDT(NDLO2),

  • trunk/LMDZ.MARS/libf/phymars/orosetup.F

    r1226 r1266  
    5151C
    5252
    53 #include "dimensions.h"
    54 #include "dimphys.h"
    55 !#include "dimradmars.h"
    5653      integer klon,klev,kidia,kfdia
    5754
    … …  
    8380C
    8481C
    85       LOGICAL LL1(NDLO2,nlayermx+1)
     82      LOGICAL LL1(NDLO2,klev+1)
    8683      integer kknu(NDLO2),kknu2(NDLO2),kknub(NDLO2),kknul(NDLO2),
    8784     *        kentp(NDLO2),ncount(NDLO2) 
    8885C
    89       REAL ZHCRIT(NDLO2,nlayermx),ZNCRIT(NDLO2,nlayermx),
    90      *     ZVPF(NDLO2,nlayermx), ZDP(NDLO2,nlayermx)
     86      REAL ZHCRIT(NDLO2,klev),ZNCRIT(NDLO2,klev),
     87     *     ZVPF(NDLO2,klev), ZDP(NDLO2,klev)
    9188      REAL ZNORM(NDLO2),zpsi(NDLO2),zb(NDLO2),zc(NDLO2),
    9289     *      zulow(NDLO2),zvlow(NDLO2),znup(NDLO2),znum(NDLO2)

  • trunk/LMDZ.MARS/libf/phymars/phyetat0.F90

    r1246 r1266  
    2121!         June 2013 TN : Possibility to read files with a time axis
    2222!         November 2013 EM : Enabeling parallel, using iostart module
    23 !======================================================================
    24 !#include "netcdf.inc"
    25 !#include "dimensions.h"
    26 !#include "dimphys.h"
    27 !#include "comgeomfi.h"
    28 !#include "surfdat.h"
    29 !#include "dimradmars.h"
    30 !#include "tracer.h"
    31 !#include "advtrac.h"
    32 !#include "control.h"
    3323!======================================================================
    3424  INTEGER nbsrf !Mars nbsrf a 1 au lieu de 4

  • trunk/LMDZ.MARS/libf/phymars/physiq.F

    r1264 r1266  
    3434     &                     obliquit
    3535      USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad, daysec
     36      use param_v4_h, only: nreact,n_avog,
     37     &                      fill_data_thermos, allocate_param_thermos
     38      use iono_h, only: allocate_param_iono
    3639#ifdef MESOSCALE
    3740      use comsoil_h, only: mlayer,layer
    … …  
    144147
    145148#include "dimensions.h"
    146 #include "dimphys.h"
    147 !#include "comgeomfi.h"
    148 !#include "surfdat.h"
    149 !#include "comsoil.h"
    150 !#include "comdiurn.h"
    151149#include "callkeys.h"
    152 !#include "comsaison.h"
    153 !#include "control.h"
    154 !#include "dimradmars.h"
    155150#include "comg1d.h"
    156 !#include "tracer.h"
    157151#include "nlteparams.h"
    158152#include "comvert.h"
    159 
    160153#include "chimiedata.h"
    161 #include "param.h"
    162 #include "param_v4.h"
    163 !#include "conc.h"
    164 
    165154#include "netcdf.inc"
    166 
    167 !#include "slope.h"
    168155
    169156c Arguments :
    … …  
    415402      PRINT*,'check: tracernames ', noms
    416403      PRINT*,'check: emis ',emis(1),emis(ngrid)
    417       PRINT*,'check: q2 ',q2(1,1),q2(ngrid,nlayermx+1)
     404      PRINT*,'check: q2 ',q2(1,1),q2(ngrid,nlayer+1)
    418405      PRINT*,'check: qsurf ',qsurf(1,1),qsurf(ngrid,nq)
    419406      PRINT*,'check: co2 ',co2ice(1),co2ice(ngrid)
    … …  
    463450
    464451         if (callthermos) then
     452            call fill_data_thermos
     453            call allocate_param_thermos(nlayer)
     454            call allocate_param_iono(nlayer,nreact)
    465455            if(solvarmod.eq.0) call param_read
    466456            if(solvarmod.eq.1) call param_read_e107
    … …  
    884874             zdqdif(1:ngrid,1,igcm_dust_mass) =
    885875     .                  -zdqsdif(1:ngrid,igcm_dust_mass)
    886              zdqdif(1:ngrid,2:nlayermx,1:nq) = 0.
     876             zdqdif(1:ngrid,2:nlayer,1:nq) = 0.
    887877             DO iq=1, nq
    888878              IF ((iq .ne. igcm_dust_mass)

  • trunk/LMDZ.MARS/libf/phymars/read_dust_scenario.F90

    r1156 r1266  
    88
    99#include "dimensions.h"
    10 #include "dimphys.h"
    11 !#include "comgeomfi.h"
    1210#include "datafile.h"
    1311#include "callkeys.h"

  • trunk/LMDZ.MARS/libf/phymars/simpleclouds.F

    r1246 r1266  
    3131c                            of the typical CCN profile, Oct. 2011)
    3232c------------------------------------------------------------------
    33 !#include "dimensions.h"
    34 !#include "dimphys.h"
    3533#include "callkeys.h"
    36 !#include "tracer.h"
    37 !#include "comgeomfi.h"
    38 !#include "dimradmars.h"
    3934
    4035c------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/soil.F

    r1224 r1266  
    2121
    2222#include "dimensions.h"
    23 #include "dimphys.h"
    24 
    25 !#include"comsoil.h"
    26 
    27 !#include"surfdat.h"
    28 #include"callkeys.h"
     23#include "callkeys.h"
    2924
    3025c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/soil_tifeedback.F

    r1224 r1266  
    2626
    2727#include "dimensions.h"
    28 #include "dimphys.h"
    29 !#include "comsoil.h"
    30 !#include "tracer.h"
    31 !#include "surfdat.h"
    3228
    3329c Local variables

  • trunk/LMDZ.MARS/libf/phymars/start2archive.F

    r1230 r1266  
    3535#include "logic.h"
    3636#include "temps.h"
    37 !#include "control.h"
    3837#include "ener.h"
    3938#include "description.h"
    40 
    41 !#include "dimphys.h"
    42 !#include "comsoil.h"
    43 !#include"advtrac.h"
    4439#include "netcdf.inc"
    4540

  • trunk/LMDZ.MARS/libf/phymars/suaer.F90

    r1246 r1266  
    4545#include "callkeys.h"
    4646#include "datafile.h"
    47 !#include "dimensions.h"
    48 !#include "dimphys.h"
    49 !#include "dimradmars.h"     
    5047
    5148! Optical properties (read in external ASCII files)

  • trunk/LMDZ.MARS/libf/phymars/surfini.F

    r1226 r1266  
    2323c   -------------
    2424#include "dimensions.h"
    25 !#include "dimphys.h"
    26 !#include "surfdat.h"
    2725#include "callkeys.h"
    28 !#include "tracer.h"
    29 !#include "comgeomfi.h"
    30 
    3126#include "datafile.h"
    3227

  • trunk/LMDZ.MARS/libf/phymars/swmain.F

    r1246 r1266  
    1010      IMPLICIT NONE
    1111     
    12 !#include "dimensions.h"
    13 !#include "dimphys.h"
    14 !#include "dimradmars.h"
    15 
    16 !#include "yomlw.h"
    1712#include "callkeys.h"
    1813c     

  • trunk/LMDZ.MARS/libf/phymars/swr_fouquart.F

    r1246 r1266  
    99      IMPLICIT NONE
    1010C     
    11 !#include "dimensions.h"
    12 !#include "dimphys.h"
    13 !#include "dimradmars.h"
    1411#include "callkeys.h"
    15 !#include "yomlw.h"
    1612
    1713C     
    … …  
    382378      implicit none
    383379C
    384 !#include "dimensions.h"
    385 !#include "dimphys.h"
    386 !#include "dimradmars.h"
    387380C
    388381C**** *DEDD* - DELTA-EDDINGTON IN A CLOUDY LAYER

  • trunk/LMDZ.MARS/libf/phymars/swr_toon.F

    r1246 r1266  
    1010      IMPLICIT NONE
    1111C     
    12 !#include "dimensions.h"
    13 !#include "dimphys.h"
    14 !#include "dimradmars.h"
    1512#include "callkeys.h"
    16 !#include "yomaer.h"
    17 !#include "yomlw.h"
    1813
    1914C     

  • trunk/LMDZ.MARS/libf/phymars/tabfi.F

    r1246 r1266  
    3434c                              comparer avec le day_ini dynamique)
    3535c
    36 c      - lmax:    tab_cntrl(tab0+2) (pour test avec nlayermx)
     36c      - lmax:    tab_cntrl(tab0+2) (pour test avec nlayer)
    3737c
    3838c      - p_rad
    … …  
    5454      implicit none
    5555 
    56 !#include "dimensions.h"
    57 !#include "dimphys.h"
    58 !#include "comgeomfi.h"
    59 !#include "surfdat.h"
    60 !#include "comsoil.h"
    6156#include "netcdf.inc"
    62 !#include "dimradmars.h"
    6357
    6458c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/testphys1d.F

    r1246 r1266  
    4141
    4242#include "dimensions.h"
    43 #include "dimphys.h"
    4443      integer, parameter :: ngrid = 1 !(2+(jjm-1)*iim - 1/jjm)
     44      integer, parameter :: nlayer = llm
    4545!#include "dimradmars.h"
    4646!#include "comgeomfi.h"
    … …  
    7272      REAL day           ! date durant le run
    7373      REAL time             ! time (0<time<1 ; time=0.5 a midi)
    74       REAL play(nlayermx)   ! Pressure at the middle of the layers (Pa)
    75       REAL plev(nlayermx+1) ! intermediate pressure levels (pa)
     74      REAL play(nlayer)   ! Pressure at the middle of the layers (Pa)
     75      REAL plev(nlayer+1) ! intermediate pressure levels (pa)
    7676      REAL psurf,tsurf(1)     
    77       REAL u(nlayermx),v(nlayermx)  ! zonal, meridional wind
     77      REAL u(nlayer),v(nlayer)  ! zonal, meridional wind
    7878      REAL gru,grv   ! prescribed "geostrophic" background wind
    79       REAL temp(nlayermx)   ! temperature at the middle of the layers
     79      REAL temp(nlayer)   ! temperature at the middle of the layers
    8080      REAL,ALLOCATABLE :: q(:,:) ! tracer mixing ratio (e.g. kg/kg)
    8181      REAL,ALLOCATABLE :: qsurf(:) ! tracer surface budget (e.g. kg.m-2)
    … …  
    8383      REAL co2ice(1)        ! co2ice layer (kg.m-2)
    8484      REAL emis(1)          ! surface layer
    85       REAL q2(nlayermx+1)   ! Turbulent Kinetic Energy
    86       REAL zlay(nlayermx)   ! altitude estimee dans les couches (km)
     85      REAL q2(nlayer+1)   ! Turbulent Kinetic Energy
     86      REAL zlay(nlayer)   ! altitude estimee dans les couches (km)
    8787
    8888c    Physical and dynamical tandencies (e.g.  m.s-2, K/s, Pa/s)
    89       REAL du(nlayermx),dv(nlayermx),dtemp(nlayermx)
    90       REAL dudyn(nlayermx),dvdyn(nlayermx),dtempdyn(nlayermx)
     89      REAL du(nlayer),dv(nlayer),dtemp(nlayer)
     90      REAL dudyn(nlayer),dvdyn(nlayer),dtempdyn(nlayer)
    9191      REAL dpsurf   
    9292      REAL,ALLOCATABLE :: dq(:,:)
    … …  
    9696      INTEGER thermo
    9797      REAL zls
    98       REAL phi(nlayermx),h(nlayermx),s(nlayermx)
    99       REAL pks, ptif, w(nlayermx)
     98      REAL phi(nlayer),h(nlayer),s(nlayer)
     99      REAL pks, ptif, w(nlayer)
    100100      REAL qtotinit,qtot
    101101      real,allocatable :: mqtot(:)
    102102      INTEGER ierr, aslun
    103       REAL tmp1(0:nlayermx),tmp2(0:nlayermx)
     103      REAL tmp1(0:nlayer),tmp2(0:nlayer)
    104104      Logical  tracerdyn
    105105      integer :: nq=1 ! number of tracers
    … …  
    212212        ! allocate arrays:
    213213        allocate(tname(nq))
    214         allocate(q(nlayermx,nq))
     214        allocate(q(nlayer,nq))
    215215        allocate(qsurf(nq))
    216         allocate(dq(nlayermx,nq))
    217         allocate(dqdyn(nlayermx,nq))
     216        allocate(dq(nlayer,nq))
     217        allocate(dqdyn(nlayer,nq))
    218218        allocate(mqtot(nq))
    219219       
    … …  
    247247            if (ierr.eq.0) then
    248248              read(91,*) qsurf(iq)
    249               do ilayer=1,nlayermx
     249              do ilayer=1,nlayer
    250250                read(91,*) q(ilayer,iq)
    251251              enddo
    … …  
    262262            if (ierr.eq.0) then
    263263              read(91,*) qsurf(iq)
    264               do ilayer=1,nlayermx
     264              do ilayer=1,nlayer
    265265                read(91,*) q(ilayer,iq)
    266266              enddo
    … …  
    278278            if (ierr.eq.0) then
    279279              read(91,*) qsurf(iq)
    280               do ilayer=1,nlayermx
     280              do ilayer=1,nlayer
    281281                read(91,*) q(ilayer,iq)
    282282              enddo
    … …  
    293293            if (ierr.eq.0) then
    294294              read(91,*) qsurf(iq)
    295               do ilayer=1,nlayermx
     295              do ilayer=1,nlayer
    296296                read(91,*) q(ilayer,iq)
    297297              enddo
    … …  
    313313            if (ierr.eq.0) then
    314314              read(91,*) qsurf(iq)
    315               do ilayer=1,nlayermx
     315              do ilayer=1,nlayer
    316316                read(91,*) q(ilayer,iq)
    317317!                write(*,*) "l=",ilayer," q(ilayer,iq)=",q(ilayer,iq)
    … …  
    329329            if (ierr.eq.0) then
    330330              read(91,*) qsurf(iq)
    331               do ilayer=1,nlayermx
     331              do ilayer=1,nlayer
    332332                read(91,*) q(ilayer,iq)
    333333              enddo
    … …  
    345345            if (ierr.eq.0) then
    346346              read(91,*) qsurf(iq)
    347               do ilayer=1,nlayermx
     347              do ilayer=1,nlayer
    348348                read(91,*) q(ilayer,iq)
    349349              enddo
    … …  
    360360            if (ierr.eq.0) then
    361361              read(91,*) qsurf(iq)
    362               do ilayer=1,nlayermx
     362              do ilayer=1,nlayer
    363363                read(91,*) q(ilayer,iq)
    364364              enddo
    … …  
    375375        ! allocate arrays:
    376376        allocate(tname(nq))
    377         allocate(q(nlayermx,nq))
     377        allocate(q(nlayer,nq))
    378378        allocate(qsurf(nq))
    379         allocate(dq(nlayermx,nq))
    380         allocate(dqdyn(nlayermx,nq))
     379        allocate(dq(nlayer,nq))
     380        allocate(dqdyn(nlayer,nq))
    381381        allocate(mqtot(nq))
    382382        do iq=1,nq
    … …  
    410410c  --------------
    411411c
    412       nlayer=nlayermx
    413412      nlevel=nlayer+1
    414413      nsoil=nsoilmx

  • trunk/LMDZ.MARS/libf/phymars/updaterad.F90

    r1226 r1266  
    6565USE comcstfi_h
    6666implicit none
    67 
    68 #include "dimensions.h"
    69 #include "dimphys.h"
    70 !#include "tracer.h"
    7167
    7268real, intent(in)  :: qice,qccn,nccn
    … …  
    122118USE comcstfi_h
    123119implicit none
    124 
    125 #include "dimensions.h"
    126 #include "dimphys.h"
    127 !#include "tracer.h"
    128120
    129121real, intent(in)  :: qice
    … …  
    181173implicit none
    182174
    183 #include "dimensions.h"
    184 #include "dimphys.h"
    185 !#include "tracer.h"
    186 
    187175real, intent(in) :: qdust,ndust ! needed if doubleq
    188176real, intent(in), optional :: tauscaling ! useful for realistic thresholds
    … …  
    237225implicit none
    238226
    239 #include "dimensions.h"
    240 #include "dimphys.h"
    241 !#include "tracer.h"
    242 
    243227real, intent(in) :: qccn,nccn ! needed if doubleq
    244228real, intent(in), optional :: tauscaling ! useful for realistic thresholds

  • trunk/LMDZ.MARS/libf/phymars/updatereffrad.F

    r1246 r1266  
    3535c    -------------
    3636c
    37 !#include "dimensions.h"
    38 !#include "dimphys.h"
    3937#include "callkeys.h"
    40 !#include "dimradmars.h"
    41 !#include "tracer.h"
    42 !#include "yomaer.h"
    4338
    4439c-----------------------------------------------------------------------

  • trunk/LMDZ.MARS/libf/phymars/vdif_kc.F

    r1130 r1266  
    55      IMPLICIT NONE
    66c.......................................................................
    7 !#include "dimensions.h"
    8 !#include "dimphys.h"
    9 !#include "tracer.h"
    107#include "callkeys.h"
    118c.......................................................................

  • trunk/LMDZ.MARS/libf/phymars/vdifc.F

    r1242 r1266  
    3636c   -------------
    3737
    38 !#include "dimensions.h"
    39 !#include "dimphys.h"
    4038#include "callkeys.h"
    41 !#include "surfdat.h"
    42 !#include "comgeomfi.h"
    43 !#include "tracer.h"
    4439#include "microphys.h"
    4540

  • trunk/LMDZ.MARS/libf/phymars/vlz_fi.F

    r1047 r1266  
    1616      IMPLICIT NONE
    1717c
    18 !#include "dimensions.h"
    19 !#include "dimphys.h"
    2018
    2119c

  • trunk/LMDZ.MARS/libf/phymars/watercloud.F

    r1246 r1266  
    3636c   -------------
    3737
    38 !#include "dimensions.h"
    39 !#include "dimphys.h"
    4038#include "callkeys.h"
    41 !#include "tracer.h"
    42 !#include "comgeomfi.h"
    43 !#include "dimradmars.h"
    4439
    4540c   Inputs:

  • trunk/LMDZ.MARS/libf/phymars/write_archive.F

    r1208 r1266  
    3636
    3737#include "dimensions.h"
    38 #include "dimphys.h"
    3938#include "paramet.h"
    4039!#include "control.h"

  • trunk/LMDZ.MARS/libf/phymars/writediagfi.F

    r1130 r1266  
    4848! Commons
    4949#include "dimensions.h"
    50 !#include "dimphys.h"
    5150#include "paramet.h"
    52 !#include "control.h"
    5351#include "comvert.h"
    5452#include "comgeom.h"
    … …  
    5654#include "netcdf.inc"
    5755#include "temps.h"
    58 !#include "surfdat.h"
    5956
    6057! Arguments on input:

  • trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

    r1130 r1266  
    2020
    2121#include"dimensions.h"
    22 !#include"dimphys.h"
    2322#include"paramet.h"
    2423!#include"control.h"

  • trunk/LMDZ.MARS/libf/phymars/wstats.F90

    r1130 r1266  
    77
    88#include "dimensions.h"
    9 #include "dimphys.h"
    109#include "comconst.h"
    1110#include "statto.h"
    … …  
    293292
    294293include "dimensions.h"
    295 include "dimphys.h"
    296294include "netcdf.inc"
    297295

  • trunk/LMDZ.MARS/libf/phymars/yamada4.F

    r1224 r1266  
    1616!.......................................................................
    1717! MARS
    18 #include "dimensions.h"
    19 #include "dimphys.h"
    20 !#include "tracer.h"
    2118#include "callkeys.h"
    2219!.......................................................................
    … …  
    608605!.......................................................................
    609606! MARS
    610 #include "dimensions.h"
    611 #include "dimphys.h"
    612 !#include "tracer.h"
    613607#include "callkeys.h"
    614608!.......................................................................
    … …  
    689683!.......................................................................
    690684! MARS
    691 #include "dimensions.h"
    692 #include "dimphys.h"
    693 !#include "tracer.h"
    694685#include "callkeys.h"
    695686!.......................................................................
Note: See TracChangeset for help on using the changeset viewer.