Ignore:
Timestamp:
Jul 23, 2016, 7:45:38 AM (9 years ago)
Author:
Ehouarn Millour
Message:

Cleanup in the dynamics: turn comvert.h into module comvert_mod.F90
EM

Location:
LMDZ5/trunk/libf/dyn3d
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/dyn3d/advect.F

    r2597 r2600  
    2828      include "dimensions.h"
    2929      include "paramet.h"
    30       include "comvert.h"
    3130      include "comgeom.h"
    3231      include "logic.h"

  • LMDZ5/trunk/libf/dyn3d/advtrac.F90

    r2597 r2600  
    1717  include "dimensions.h"
    1818  include "paramet.h"
    19   include "comvert.h"
    2019  include "comdissip.h"
    2120  include "comgeom2.h"

  • LMDZ5/trunk/libf/dyn3d/bilan_dyn.F

    r2597 r2600  
    1414#endif
    1515      USE comconst_mod, ONLY: pi, cpp
     16      USE comvert_mod, ONLY: presnivs
    1617
    1718      IMPLICIT NONE
    … …  
    1920      include "dimensions.h"
    2021      include "paramet.h"
    21       include "comvert.h"
    2222      include "comgeom2.h"
    2323      include "temps.h"

  • LMDZ5/trunk/libf/dyn3d/caldyn.F

    r2597 r2600  
    66     $  phi,conser,du,dv,dteta,dp,w,pbaru,pbarv,time )
    77
     8     
     9      USE comvert_mod, ONLY: ap, bp
     10     
    811      IMPLICIT NONE
    912
    … …  
    2629      include "dimensions.h"
    2730      include "paramet.h"
    28       include "comvert.h"
    2931      include "comgeom.h"
    3032

  • LMDZ5/trunk/libf/dyn3d/dudv2.F

    r1907 r2600  
    2626c=======================================================================
    2727c
    28 #include "dimensions.h"
    29 #include "paramet.h"
    30 #include "comvert.h"
     28      include "dimensions.h"
     29      include "paramet.h"
    3130
    3231      REAL teta( ip1jmp1,llm ),pkf( ip1jmp1,llm ) ,bern( ip1jmp1,llm ),

  • LMDZ5/trunk/libf/dyn3d/dynetat0.f90

    r2598 r2600  
    1111  USE control_mod, ONLY: planet_type
    1212  USE assert_eq_m, ONLY: assert_eq
     13  USE comvert_mod, ONLY: pa,preff
    1314  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
    1415  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
     16
    1517  IMPLICIT NONE
    1618  include "dimensions.h"
    1719  include "paramet.h"
    1820  include "temps.h"
    19   include "comvert.h"
    2021  include "comgeom2.h"
    2122  include "ener.h"

  • LMDZ5/trunk/libf/dyn3d/dynredem.F90

    r2598 r2600  
    1111                    NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
    1212  USE dynredem_mod, ONLY: cre_var, put_var1, put_var2, err, modname, fil
     13  USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
     14                              nivsig,nivsigs
    1315  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
    1416  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    15                         taux,tauy
     17                              taux,tauy
    1618  IMPLICIT NONE
    1719  include "dimensions.h"
    1820  include "paramet.h"
    19   include "comvert.h"
    2021  include "comgeom2.h"
    2122  include "temps.h"
    … …  
    173174  include "paramet.h"
    174175  include "description.h"
    175   include "comvert.h"
    176176  include "comgeom.h"
    177177  include "temps.h"

  • LMDZ5/trunk/libf/dyn3d/fluxstokenc.F

    r2597 r2600  
    1818      include "dimensions.h"
    1919      include "paramet.h"
    20       include "comvert.h"
    2120      include "comgeom.h"
    2221      include "tracstoke.h"
    … …  
    3534
    3635      REAL pbarvst(iip1,jjp1,llm),zistdyn
    37         real dtcum
     36        real dtcum
    3837
    3938      INTEGER iadvtr,ndex(1)
    … …  
    5958      if(first) then
    6059
    61         CALL initfluxsto( 'fluxstoke',
     60        CALL initfluxsto( 'fluxstoke',
    6261     .  time_step,istdyn* time_step,istdyn* time_step,
    6362     .  fluxid,fluxvid,fluxdid)
    64        
    65         ndex(1) = 0
     63       
     64        ndex(1) = 0
    6665        call histwrite(fluxid, 'phis', 1, phis, iip1*jjp1, ndex)
    6766        call histwrite(fluxid, 'aire', 1, aire, iip1*jjp1, ndex)
    68        
    69         ndex(1) = 0
     67       
     68        ndex(1) = 0
    7069        nscal = 1
    7170        tst(1) = time_step
    … …  
    7574        istp(1)= istphy
    7675        call histwrite(fluxdid, 'istphy', 1, istp, nscal, ndex)
    77        
    78         first = .false.
     76       
     77        first = .false.
    7978
    8079      endif
    … …  
    140139
    141140         iadvtr=0
    142         write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
    143        
    144         call histwrite(fluxid, 'masse', itau, massem,
     141        write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
     142       
     143        call histwrite(fluxid, 'masse', itau, massem,
    145144     .               iip1*jjp1*llm, ndex)
    146        
    147         call histwrite(fluxid, 'pbaru', itau, pbarug,
     145       
     146        call histwrite(fluxid, 'pbaru', itau, pbarug,
    148147     .               iip1*jjp1*llm, ndex)
    149        
    150         call histwrite(fluxvid, 'pbarv', itau, pbarvg,
     148       
     149        call histwrite(fluxvid, 'pbarv', itau, pbarvg,
    151150     .               iip1*jjm*llm, ndex)
    152        
     151       
    153152        call histwrite(fluxid, 'w' ,itau, wg,
    154153     .             iip1*jjp1*llm, ndex)
    155        
    156         call histwrite(fluxid, 'teta' ,itau, tetac,
     154       
     155        call histwrite(fluxid, 'teta' ,itau, tetac,
    157156     .             iip1*jjp1*llm, ndex)
    158        
    159         call histwrite(fluxid, 'phi' ,itau, phic,
     157       
     158        call histwrite(fluxid, 'phi' ,itau, phic,
    160159     .             iip1*jjp1*llm, ndex)
    161        
     160       
    162161C
    163162

  • LMDZ5/trunk/libf/dyn3d/gcm.F90

    r2598 r2600  
    6969  include "paramet.h"
    7070  include "comdissnew.h"
    71   include "comvert.h"
    7271  include "comgeom.h"
    7372  include "logic.h"

  • LMDZ5/trunk/libf/dyn3d/groupe.F

    r2597 r2600  
    2222      include "paramet.h"
    2323      include "comgeom2.h"
    24       include "comvert.h"
    2524
    2625!     integer ngroup

  • LMDZ5/trunk/libf/dyn3d/guide_mod.F90

    r2598 r2600  
    314314    USE control_mod, ONLY: day_step, iperiod
    315315    USE comconst_mod, ONLY: dtvr, daysec
     316    USE comvert_mod, ONLY: ap, bp, preff, presnivs
    316317 
    317318    IMPLICIT NONE
    … …  
    319320    INCLUDE "dimensions.h"
    320321    INCLUDE "paramet.h"
    321     INCLUDE "comvert.h"
    322322
    323323    ! Variables entree
    … …  
    607607  use exner_milieu_m, only: exner_milieu
    608608  use comconst_mod, only: kappa, cpp
     609  use comvert_mod, only: preff, pressure_exner, bp, ap
    609610  IMPLICIT NONE
    610611
    611612  include "dimensions.h"
    612613  include "paramet.h"
    613   include "comvert.h"
    614614  include "comgeom2.h"
    615615
    … …  
    15171517
    15181518    USE comconst_mod, ONLY: pi
     1519    USE comvert_mod, ONLY: presnivs
    15191520   
    15201521    IMPLICIT NONE
    … …  
    15241525    INCLUDE "netcdf.inc"
    15251526    INCLUDE "comgeom2.h"
    1526     INCLUDE "comvert.h"
    15271527   
    15281528    ! Variables entree

  • LMDZ5/trunk/libf/dyn3d/iniacademic.F90

    r2597 r2600  
    1717  use exner_milieu_m, only: exner_milieu
    1818  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
     19  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    1920
    2021  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    2930  include "dimensions.h"
    3031  include "paramet.h"
    31   include "comvert.h"
    3232  include "comgeom.h"
    3333  include "academic.h"

  • LMDZ5/trunk/libf/dyn3d/integrd.F

    r2598 r2600  
    99      use control_mod, only : planet_type
    1010      use comconst_mod, only: pi
     11      use comvert_mod, only: ap, bp
    1112
    1213      IMPLICIT NONE
    … …  
    3132      include "paramet.h"
    3233      include "comgeom.h"
    33       include "comvert.h"
    3434      include "logic.h"
    3535      include "temps.h"

  • LMDZ5/trunk/libf/dyn3d/leapfrog.F

    r2598 r2600  
    2020      use exner_hyb_m, only: exner_hyb
    2121      use exner_milieu_m, only: exner_milieu
     22      USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs
    2223      USE comconst_mod, ONLY: cpp, dtphys, dtvr, pi, ihf
    2324
    … …  
    5859      include "paramet.h"
    5960      include "comdissnew.h"
    60       include "comvert.h"
    6161      include "comgeom.h"
    6262      include "logic.h"
    … …  
    712712            IF( MOD(itau,iecri).EQ.0) THEN
    713713             ! Ehouarn: output only during LF or Backward Matsuno
    714              if (leapf.or.(.not.leapf.and.(.not.forward))) then
     714             if (leapf.or.(.not.leapf.and.(.not.forward))) then
    715715              CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
    716716              unat=0.
    … …  
    722722              if (ok_dyn_ins) then
    723723!               write(lunout,*) "leapfrog: call writehist, itau=",itau
    724                CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
     724               CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
    725725!               call WriteField('ucov',reshape(ucov,(/iip1,jmp1,llm/)))
    726726!               call WriteField('vcov',reshape(vcov,(/iip1,jjm,llm/)))
    … …  
    852852!                write(lunout,*) "leapfrog: call writehist (b)",
    853853!     &                        itau,iecri
    854                 CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
     854                CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
    855855              endif ! of if (ok_dyn_ins)
    856856#endif

  • LMDZ5/trunk/libf/dyn3d/qminimum.F

    r2286 r2600  
    1010c             pour l'eau vapeur et l'eau liquide
    1111c
    12 #include "dimensions.h"
    13 #include "paramet.h"
    14 #include "comvert.h"
     12      include "dimensions.h"
     13      include "paramet.h"
    1514c
    1615      INTEGER nqtot

  • LMDZ5/trunk/libf/dyn3d/sw_case_williamson91_6.F

    r2597 r2600  
    2727c=======================================================================
    2828      USE comconst_mod, ONLY: cpp, omeg, rad
     29      USE comvert_mod, ONLY: ap, bp, preff
    2930     
    3031      IMPLICIT NONE
    … …  
    3536      include "dimensions.h"
    3637      include "paramet.h"
    37       include "comvert.h"
    3838      include "comgeom.h"
    3939      include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3d/top_bound.F

    r2597 r2600  
    66      USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
    77     &                        tau_top_bound
     8      USE comvert_mod, ONLY: presnivs, preff, scaleheight
    89     
    910      IMPLICIT NONE
    … …  
    1112      include "dimensions.h"
    1213      include "paramet.h"
    13       include "comvert.h"
    1414      include "comgeom2.h"
    1515

  • LMDZ5/trunk/libf/dyn3d/vlsplt.F

    r2597 r2600  
    2424      include "paramet.h"
    2525      include "logic.h"
    26       include "comvert.h"
    2726
    2827c
    … …  
    157156      include "paramet.h"
    158157      include "logic.h"
    159       include "comvert.h"
    160158      include "iniprint.h"
    161159c
    … …  
    532530      include "paramet.h"
    533531      include "logic.h"
    534       include "comvert.h"
    535532      include "comgeom.h"
    536533c
    … …  
    894891      include "paramet.h"
    895892      include "logic.h"
    896       include "comvert.h"
    897893c
    898894c

  • LMDZ5/trunk/libf/dyn3d/vlspltqs.F

    r2597 r2600  
    3131      include "paramet.h"
    3232      include "logic.h"
    33       include "comvert.h"
    3433
    3534c
    … …  
    197196      include "paramet.h"
    198197      include "logic.h"
    199       include "comvert.h"
    200198c
    201199c
    … …  
    568566      include "paramet.h"
    569567      include "logic.h"
    570       include "comvert.h"
    571568      include "comgeom.h"
    572569c
Note: See TracChangeset for help on using the changeset viewer.