Changeset 1107


Ignore:
Timestamp:
Feb 24, 2009, 4:07:48 PM (15 years ago)
Author:
lguez
Message:

"comconst.h" and "comgeom2.h" are now both fixed and free form.
Removed calls to procedure "flush".
Corrected kinds of constants which appeared as arguments to "min" or
"max" (all arguments are now of the same type and kind).

Location:
LMDZ4/trunk/libf
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/trunk/libf/dyn3d/abort_gcm.F

    r1004 r1107  
    1919C         ierr    = severity of situation ( = 0 normal )
    2020
    21       character*(*) modname
     21      character(len=*) modname
    2222      integer ierr
    23       character*(*) message
     23      character(len=*) message
    2424
    2525!      write(lunout,*) 'in abort_gcm'

  • LMDZ4/trunk/libf/dyn3d/comconst.h

    r524 r1107  
    22! $Header$
    33!
    4 c-----------------------------------------------------------------------
    5 c INCLUDE comconst.h
     4!-----------------------------------------------------------------------
     5! INCLUDE comconst.h
    66
    7       COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl,
    8      * dtvr,daysec,
    9      * pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg
     7      COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl,           &
     8     & dtvr,daysec,                                                     &
     9     & pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg
    1010
    1111      INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl
    … …  
    1414      REAL cotot,unsim,g,omeg
    1515
    16 c-----------------------------------------------------------------------
     16!-----------------------------------------------------------------------

  • LMDZ4/trunk/libf/dyn3d/comgeom2.h

    r524 r1107  
    22! $Header$
    33!
    4 *CDK comgeom2
    5       COMMON/comgeom/
    6      1 cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm)  ,
    7      2 aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1)           ,
    8      3 airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols                 , 
    9      4 unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm)       ,
    10      5 aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1)       ,
    11      6 aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1)         ,
    12      7 alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1)        ,
    13      8 alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1)    ,
    14      9 fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm),
    15      1 rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm)  ,
    16      1 cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1)                        ,
    17      2 cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1),
    18      3 cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) ,
    19      4 unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2                ,
    20      5 unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1)                  ,
    21      6 unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm)
    22      7 , xprimu(iip1),xprimv(iip1)
     4!CDK comgeom2
     5      COMMON/comgeom/                                                   &
     6     & cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm)  , &
     7     & aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1)           , &
     8     & airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols                 , &
     9     & unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm)       , &
     10     & aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1)       , &
     11     & aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1)         , &
     12     & alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1)        , &
     13     & alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1)    , &
     14     & fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm),      &
     15     & rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm)  , &
     16     & cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1)                        , &
     17     & cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1), &
     18     & cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) , &
     19     & unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2                , &
     20     & unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1)                  , &
     21     & unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm)  &
     22     & , xprimu(iip1),xprimv(iip1)
    2323
    24 c
    25       REAL
    26      1 cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire
    27      2 ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4     ,
    28      3 alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 ,
    29      4 fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2     ,
    30      5 cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1           ,
    31      6 unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2     ,
    32      7 unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu    ,
    33      8 cusurcvu,xprimu,xprimv
    34 c
     24
     25      REAL                                                               &
     26     & cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire &
     27     & ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4     , &
     28     & alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 , &
     29     & fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2     , &
     30     & cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1           , &
     31     & unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2     , &
     32     & unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu    , &
     33     & cusurcvu,xprimu,xprimv

  • LMDZ4/trunk/libf/dyn3dpar/comconst.h

    r774 r1107  
    22! $Header$
    33!
    4 c-----------------------------------------------------------------------
    5 c INCLUDE comconst.h
     4!-----------------------------------------------------------------------
     5! INCLUDE comconst.h
    66
    7       COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl,
    8      * dtvr,daysec,
    9      * pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg
     7      COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl,           &
     8     & dtvr,daysec,                                                     &
     9     & pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg
    1010
    1111      INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl
    … …  
    1414      REAL cotot,unsim,g,omeg
    1515
    16 c-----------------------------------------------------------------------
     16!-----------------------------------------------------------------------

  • LMDZ4/trunk/libf/dyn3dpar/comgeom2.h

    r774 r1107  
    22! $Header$
    33!
    4 *CDK comgeom2
    5       COMMON/comgeom/
    6      1 cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm)  ,
    7      2 aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1)           ,
    8      3 airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols                 , 
    9      4 unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm)       ,
    10      5 aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1)       ,
    11      6 aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1)         ,
    12      7 alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1)        ,
    13      8 alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1)    ,
    14      9 fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm),
    15      1 rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm)  ,
    16      1 cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1)                        ,
    17      2 cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1),
    18      3 cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) ,
    19      4 unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2                ,
    20      5 unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1)                  ,
    21      6 unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm)
    22      7 , xprimu(iip1),xprimv(iip1)
     4!CDK comgeom2
     5      COMMON/comgeom/                                                   &
     6     & cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm)  , &
     7     & aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1)           , &
     8     & airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols                 , &
     9     & unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm)       , &
     10     & aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1)       , &
     11     & aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1)         , &
     12     & alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1)        , &
     13     & alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1)    , &
     14     & fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm),      &
     15     & rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm)  , &
     16     & cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1)                        , &
     17     & cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1), &
     18     & cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) , &
     19     & unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2                , &
     20     & unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1)                  , &
     21     & unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm)  &
     22     & , xprimu(iip1),xprimv(iip1)
    2323
    24 c
    25       REAL
    26      1 cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire
    27      2 ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4     ,
    28      3 alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 ,
    29      4 fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2     ,
    30      5 cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1           ,
    31      6 unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2     ,
    32      7 unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu    ,
    33      8 cusurcvu,xprimu,xprimv
    34 c
     24
     25      REAL                                                               &
     26     & cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire &
     27     & ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4     , &
     28     & alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 , &
     29     & fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2     , &
     30     & cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1           , &
     31     & unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2     , &
     32     & unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu    , &
     33     & cusurcvu,xprimu,xprimv

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

    r1067 r1107  
    9999       WRITE(*,*)' radsol (min, max)', &
    100100            MINVAL(radsol(1:knon)), MAXVAL(radsol(1:knon))
    101        CALL flush(6)
    102101    ENDIF
    103102 

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

    r1067 r1107  
    284284    WRITE (nuout,*) 'Fromcpl: Reading fields from CPL, ktime=',ktime
    285285    WRITE (nuout,*) ' '
    286     CALL flush (nuout)
    287286   
    288287    istart=ii_begin

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

    r998 r1107  
    21232123      ZALPHA = 3.*ZWCP*ZRM2*(1.+ZGP*ZWM)/ZX2
    21242124      ZBETA = 3.*ZWCP* PRMUZ(JL) *(1.+3.*ZGP*ZRM2*ZWM)/ZX2
    2125 CMAF      ZARG=MIN(ZTOP/PRMUZ(JL),200.)
    2126       ZARG=MIN(ZTOP/PRMUZ(JL),2.0d+2)
     2125      ZARG=MIN(ZTOP/PRMUZ(JL),200._8)
    21272126      ZEXMU0=EXP(-ZARG)
    2128 CMAF      ZARG2=MIN(ZRK*ZTOP,200.)
    2129       ZARG2=MIN(ZRK*ZTOP,2.0d+2)
     2127      ZARG2=MIN(ZRK*ZTOP,200._8)
    21302128      ZEXKP=EXP(ZARG2)
    21312129      ZEXKM = 1./ZEXKP
    … …  
    28982896      ZTX2=ZTX*ZTX
    28992897      ZZABLY = ZABLY(JL,6,JAE1)+ZABLY(JL,6,JAE2)+ZABLY(JL,6,JAE3)
    2900 CMAF      ZUP=MIN( MAX( 0.5*R10E*LOG( ZZABLY ) + 5., 0.), 6.0)
    2901       ZUP=MIN( MAX( 0.5*R10E*LOG( ZZABLY ) + 5., 0.d+0), 6.d+0)
     2898      ZUP=MIN( MAX( 0.5*R10E*LOG( ZZABLY ) + 5., 0._8), 6._8)
    29022899      ZCAH1=AT(1,1)+ZUP*(AT(1,2)+ZUP*(AT(1,3)))
    29032900      ZCBH1=BT(1,1)+ZUP*(BT(1,2)+ZUP*(BT(1,3)))
    … …  
    29302927      ZZABLY = ZABLY(JL,9,JAE1)+ZABLY(JL,9,JAE2)+ZABLY(JL,9,JAE3)
    29312928      ZALUP = R10E * LOG ( ZZABLY )
    2932 CMAF      ZUP   = MAX( 0.0 , 5.0 + 0.5 * ZALUP )
    2933       ZUP   = MAX( 0.d+0 , 5.0 + 0.5 * ZALUP )
     2929      ZUP   = MAX( 0._8, 5.0 + 0.5 * ZALUP )
    29342930      ZPSC2(JL) = (ZTAVI(JL)/TREF) ** ZUP
    29352931      ZCAC8=AT(8,1)+ZUP*(AT(8,2)+ZUP*(AT(8,3)))

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

    r902 r1107  
    6464            delu(i) = (ustar(i)/RKAR)* &
    6565                      (log(zref/(rugos(i))+1.) + &
    66                       min(5.0, 5.0 *(zref - rugos(i))/lmon(i)))
     66                      min(5.d0, 5.0 *(zref - rugos(i))/lmon(i)))
    6767            delte(i) = (testar(i)/RKAR)* &
    6868                       (log(zref/(rugos(i))+1.) + &
    69                        min(5.0, 5.0 * (zref - rugos(i))/lmon(i)))
     69                       min(5.d0, 5.0 * (zref - rugos(i))/lmon(i)))
    7070            delq(i) = (qstar(i)/RKAR)* &
    7171                      (log(zref/(rugos(i))+1.) + &
    72                       min(5.0, 5.0 * (zref - rugos(i))/lmon(i)))
     72                      min(5.d0, 5.0 * (zref - rugos(i))/lmon(i)))
    7373          ELSE
    7474            delu(i)  = 0.1 * speed(i)
Note: See TracChangeset for help on using the changeset viewer.