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

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

Location:
LMDZ5/trunk/libf/dyn3dmem
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F

    r2597 r2600  
    3030      include "dimensions.h"
    3131      include "paramet.h"
    32       include "comvert.h"
    3332      include "comgeom.h"
    3433      include "logic.h"

  • LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F

    r2597 r2600  
    3232      include "dimensions.h"
    3333      include "paramet.h"
    34       include "comvert.h"
    3534      include "comdissip.h"
    3635      include "comgeom2.h"
    … …  
    172171#endif
    173172         
    174           GOTO 1234     
     173          GOTO 1234     
    175174c-----------------------------------------------------------
    176175c     Appel des sous programmes d'advection
    … …  
    184183        if(iadv(iq).eq.10) THEN
    185184     
    186 !LF         call vlsplt_p(q(1,1,iq),2.,massem,wg,pbarug,pbarvg,dtvr)
     185!LF            call vlsplt_p(q(1,1,iq),2.,massem,wg,pbarug,pbarvg,dtvr)
    187186
    188187c   ----------------------------------------------------------------

  • LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F

    r2597 r2600  
    1818      USE write_field_loc
    1919      USE comconst_mod, ONLY: cpp, pi
     20      USE comvert_mod, ONLY: presnivs
     21     
    2022      IMPLICIT NONE
    2123
    2224      include "dimensions.h"
    2325      include "paramet.h"
    24       include "comvert.h"
    2526      include "comgeom2.h"
    2627      include "temps.h"
    … …  
    598599        do l=1,llm
    599600          Q_cum(:,jjb:jje,l,iQ)=Q_cum(:,jjb:jje,l,iQ)
    600      .                          /masse_cum(:,jjb:jje,l)
     601     .                                /masse_cum(:,jjb:jje,l)
    601602        enddo
    602603!$OMP ENDDO NOWAIT

  • LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F

    r2597 r2600  
    1212      USE caldyn_mod, ONLY: vcont, ucont, ang, p, massebx, masseby,
    1313     &                      vorpot, ecin, bern, massebxy, convm
     14      USE comvert_mod, ONLY: ap, bp
    1415     
    1516      IMPLICIT NONE
    … …  
    3334      include "dimensions.h"
    3435      include "paramet.h"
    35       include "comvert.h"
    3636      include "comgeom.h"
    3737

  • LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90

    r2597 r2600  
    8383  USE write_field
    8484  USE comconst_mod, ONLY: dtphys
     85  USE comvert_mod, ONLY: ap, bp, pressure_exner
     86 
    8587  IMPLICIT NONE
    86     INCLUDE "comvert.h"
    8788    INCLUDE "logic.h"
    8889    INCLUDE "temps.h"

  • LMDZ5/trunk/libf/dyn3dmem/dudv2_loc.F

    r1907 r2600  
    2323c=======================================================================
    2424c
    25 #include "dimensions.h"
    26 #include "paramet.h"
    27 #include "comvert.h"
     25      include "dimensions.h"
     26      include "paramet.h"
    2827
    2928      REAL teta( ijb_u:ije_u,llm ),pkf( ijb_u:ije_u,llm )

  • LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90

    r2598 r2600  
    1212  USE control_mod, ONLY: planet_type
    1313  USE assert_eq_m, ONLY: assert_eq
     14  USE comvert_mod, ONLY: pa,preff
    1415  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
    1516                          omeg, rad
    … …  
    2021  include "paramet.h"
    2122  include "temps.h"
    22   include "comvert.h"
    2323  include "comgeom.h"
    2424  include "ener.h"

  • LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90

    r2598 r2600  
    1313                    NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
    1414  USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
     15  USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
     16                         nivsig,nivsigs
    1517  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
    1618  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    … …  
    2022  include "dimensions.h"
    2123  include "paramet.h"
    22   include "comvert.h"
    2324  include "comgeom.h"
    2425  include "temps.h"
    … …  
    182183  include "paramet.h"
    183184  include "description.h"
    184   include "comvert.h"
    185185  include "comgeom.h"
    186186  include "temps.h"

  • LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90

    r2598 r2600  
    3636    USE write_field_loc
    3737    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
     38    USE comvert_mod, ONLY: preff
     39   
    3840    IMPLICIT NONE
    3941    !
    … …  
    4143    include "paramet.h"
    4244    include "comgeom.h"
    43     include "comvert.h"
    4445
    4546    INTEGER  ngrid

  • LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90

    r2598 r2600  
    3232    USE mod_filtreg_p
    3333    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
     34    USE comvert_mod, ONLY: preff
     35   
    3436    IMPLICIT NONE
    3537    !
    … …  
    3739    include "paramet.h"
    3840    include "comgeom.h"
    39     include "comvert.h"
    4041
    4142    INTEGER  ngrid

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

    r2598 r2600  
    5656  include "paramet.h"
    5757  include "comdissnew.h"
    58   include "comvert.h"
    5958  include "comgeom.h"
    6059  include "logic.h"

  • LMDZ5/trunk/libf/dyn3dmem/geopot_loc.F

    r1907 r2600  
    2626c   -------------
    2727
    28 #include "dimensions.h"
    29 #include "paramet.h"
    30 #include "comvert.h"
     28      include "dimensions.h"
     29      include "paramet.h"
    3130
    3231c   Arguments:

  • LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F

    r2597 r2600  
    2020      include "paramet.h"
    2121      include "comgeom2.h"
    22       include "comvert.h"
    2322
    2423!     integer ngroup

  • LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90

    r2598 r2600  
    345345    USE write_field_loc
    346346    USE comconst_mod, ONLY: cpp, daysec, dtvr, kappa
     347    USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    347348   
    348349    IMPLICIT NONE
    … …  
    350351    INCLUDE "dimensions.h"
    351352    INCLUDE "paramet.h"
    352     INCLUDE "comvert.h"
    353353
    354354    ! Variables entree
    … …  
    891891  USE Bands
    892892  USE comconst_mod, ONLY: cpp, kappa
     893  USE comvert_mod, ONLY: preff, pressure_exner, bp, ap, disvert_type
    893894  IMPLICIT NONE
    894895
    895896  include "dimensions.h"
    896897  include "paramet.h"
    897   include "comvert.h"
    898898  include "comgeom2.h"
    899899
    … …  
    21292129    USE mod_hallo, ONLY : gather_field_u, gather_field_v
    21302130    USE comconst_mod, ONLY: pi
     2131    USE comvert_mod, ONLY: presnivs
    21312132    IMPLICIT NONE
    21322133
    … …  
    21352136    INCLUDE "netcdf.inc"
    21362137    INCLUDE "comgeom2.h"
    2137     INCLUDE "comvert.h"
    21382138   
    21392139    ! Variables entree

  • LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90

    r2597 r2600  
    1919  USE Write_Field
    2020  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
     21  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2122
    2223  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    3132  include "dimensions.h"
    3233  include "paramet.h"
    33   include "comvert.h"
    3434  include "comgeom.h"
    3535  include "academic.h"

  • LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F

    r2598 r2600  
    1515     &        dynhistave_file,dynhistvave_file,dynhistuave_file
    1616       USE comconst_mod, ONLY: pi
     17       USE comvert_mod, ONLY: presnivs
     18       
    1719       implicit none
    1820
    … …  
    4446      include "dimensions.h"
    4547      include "paramet.h"
    46       include "comvert.h"
    4748      include "comgeom.h"
    4849      include "temps.h"

  • LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F

    r2598 r2600  
    1414       use misc_mod
    1515       USE comconst_mod, ONLY: pi
     16       USE comvert_mod, ONLY: nivsigs
    1617       
    1718      implicit none
    … …  
    4647      include "dimensions.h"
    4748      include "paramet.h"
    48       include "comvert.h"
    4949      include "comgeom.h"
    5050      include "temps.h"
    … …  
    105105      CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
    106106      tau0 = itau_dyn
    107        
    108         do jj = 1, jjp1
     107       
     108        do jj = 1, jjp1
    109109        do ii = 1, iip1
    110110          rlong(ii,jj) = rlonu(ii) * 180. / pi
    … …  
    164164     .             1, iip1, 1, jjn,tau0, zjulian, tstep, vhoriid,
    165165     .             filevid,dynv_domain_id)
    166        
     166       
    167167      rl(1,1) = 1.
    168168     
    … …  
    190190      call histhori(fileid, iip1, rlong(:,jjb:jje),jjn,rlat(:,jjb:jje),
    191191     .             'scalar','Grille points scalaires', thoriid)
    192        
     192       
    193193C
    194194C  Appel a histvert pour la grille verticale
    … …  
    210210C
    211211C  Appels a histdef pour la definition des variables a sauvegarder
    212        
    213         CALL histdef(fileid, "phis", "Surface geop. height", "-",
     212       
     213        CALL histdef(fileid, "phis", "Surface geop. height", "-",
    214214     .                iip1,jjn,thoriid, 1,1,1, -99, 32,
    215215     .                "once", t_ops, t_wrt)
    … …  
    218218     .                iip1,jjn,thoriid, 1,1,1, -99, 32,
    219219     .                "once", t_ops, t_wrt)
    220        
     220       
    221221        if (mpi_rank==0) then
    222        
    223         CALL histdef(filedid, "dtvr", "tps dyn", "s",
     222       
     223        CALL histdef(filedid, "dtvr", "tps dyn", "s",
    224224     .                1,1,dhoriid, 1,1,1, -99, 32,
    225225     .                "once", t_ops, t_wrt)
    … …  
    288288        if (mpi_rank==0) call histsync(filedid)
    289289      endif
    290        
     290       
    291291#else
    292292      write(lunout,*)'initfluxsto_p: Needs IOIPSL to function'

  • LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F

    r2598 r2600  
    1515     &                        dynhist_file,dynhistv_file,dynhistu_file
    1616       USE comconst_mod, ONLY: pi
     17       USE comvert_mod, ONLY: presnivs
     18       
    1719       implicit none
    1820
    … …  
    4345      include "dimensions.h"
    4446      include "paramet.h"
    45       include "comvert.h"
    4647      include "comgeom.h"
    4748      include "temps.h"

  • LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F

    r2598 r2600  
    1313      USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
    1414      USE comconst_mod, ONLY: pi
     15      USE comvert_mod, ONLY: ap, bp
     16     
    1517      IMPLICIT NONE
    1618
    … …  
    3436      include "paramet.h"
    3537      include "comgeom.h"
    36       include "comvert.h"
    3738      include "logic.h"
    3839      include "temps.h"

  • LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F

    r2598 r2600  
    3333       use exner_milieu_loc_m, only: exner_milieu_loc
    3434       USE comconst_mod, ONLY: cpp, dtvr, ihf
     35       USE comvert_mod, ONLY: ap, bp, pressure_exner
     36       
    3537      IMPLICIT NONE
    3638
    … …  
    6971      include "paramet.h"
    7072      include "comdissnew.h"
    71       include "comvert.h"
    7273      include "comgeom.h"
    7374      include "logic.h"
    … …  
    16321633            IF( MOD(itau,iecri).EQ.0) THEN
    16331634             ! Ehouarn: output only during LF or Backward Matsuno
    1634              if (leapf.or.(.not.leapf.and.(.not.forward))) then
     1635             if (leapf.or.(.not.leapf.and.(.not.forward))) then
    16351636
    16361637c$OMP BARRIER
    … …  
    16421643#ifdef CPP_IOIPSL
    16431644             if (ok_dyn_ins) then
    1644                  CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
     1645                 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
    16451646     &                              masse,ps,phis)
    16461647             endif

  • LMDZ5/trunk/libf/dyn3dmem/qminimum_loc.F

    r2286 r2600  
    77c             pour l'eau vapeur et l'eau liquide
    88c
    9 #include "dimensions.h"
    10 #include "paramet.h"
    11 #include "comvert.h"
     9      include "dimensions.h"
     10      include "paramet.h"
    1211c
    1312      INTEGER nqtot ! CRisi: on remplace nq par nqtot

  • LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F

    r2597 r2600  
    2828      USE parallel_lmdz
    2929      USE comconst_mod, ONLY: cpp, omeg, rad
     30      USE comvert_mod, ONLY: ap, bp, preff
    3031
    3132      IMPLICIT NONE
    … …  
    3637      include "dimensions.h"
    3738      include "paramet.h"
    38       include "comvert.h"
    3939      include "comgeom.h"
    4040      include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.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
     9
    810      IMPLICIT NONE
    911c
    1012      include "dimensions.h"
    1113      include "paramet.h"
    12       include "comvert.h"
    1314      include "comgeom2.h"
    1415

  • LMDZ5/trunk/libf/dyn3dmem/vitvert_loc.F90

    r2336 r2600  
    66! Purpose: Compute vertical speed at sigma levels.
    77  USE parallel_lmdz
     8  USE comvert_mod, ONLY: bp
     9 
    810  IMPLICIT NONE
    911  include "dimensions.h"
    1012  include "paramet.h"
    11   include "comvert.h"
    1213!===============================================================================
    1314! Arguments:

  • LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F

    r2597 r2600  
    2020      include "paramet.h"
    2121      include "logic.h"
    22       include "comvert.h"
    2322c
    2423c
    … …  
    422421      include "paramet.h"
    423422      include "logic.h"
    424       include "comvert.h"
    425423      include "comgeom.h"
    426424c
    … …  
    877875      include "paramet.h"
    878876      include "logic.h"
    879       include "comvert.h"
    880877c
    881878c

  • LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F

    r2597 r2600  
    3838      include "paramet.h"
    3939      include "logic.h"
    40       include "comvert.h"
    4140
    4241c

  • LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F

    r2597 r2600  
    1515      include "paramet.h"
    1616      include "logic.h"
    17       include "comvert.h"
    1817c
    1918c
    … …  
    173172c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
    174173        DO l=1,llm
    175           iadvplus(ip1jm+1:ip1jmp1,l)=0
     174          iadvplus(ip1jm+1:ip1jmp1,l)=0
    176175        ENDDO
    177176c$OMP END DO NOWAIT
    178177      endif
    179        
     178             
    180179c   calcul des flux a gauche et a droite
    181180
    … …  
    413412c    ********************************************************************
    414413c     q,masse_adv_v,w sont des arguments d'entree  pour le s-pg ....
    415 c     qsat             est   un argument de sortie pour le s-pg ....
     414c     qsat                est   un argument de sortie pour le s-pg ....
    416415c
    417416c
    … …  
    425424      include "paramet.h"
    426425      include "logic.h"
    427       include "comvert.h"
    428426      include "comgeom.h"
    429427c
    … …  
    581579         dyq(ij,l)=fn*dyq(ij,l)
    582580        ENDDO
    583          
     581         
    584582      ENDIF
    585583     
    … …  
    602600        ENDDO
    603601       
    604 c   calcul des pentes limites aux poles 
     602c   calcul des pentes limites aux poles       
    605603        fs=1.
    606604        DO ij=1,iim
    … …  
    613611         dyq(ip1jm+ij,l)=fs*dyq(ip1jm+ij,l)
    614612        ENDDO
    615        
     613       
    616614      ENDIF
    617615
    … …  
    778776              masse(ij,l,iq)=newmasse
    779777           ENDDO
    780          
    781          ENDIF
    782778         
    783          IF (pole_sud) THEN
    784          
    785            convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
     779         ENDIF
     780         
     781         IF (pole_sud) THEN
     782         
     783           convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
    786784           convmps = -SSUM(iim,masse_adv_v(ip1jm-iim,l),1)/apols
    787785           DO ij = ip1jm+1,ip1jmp1
    … …  
    791789              masse(ij,l,iq)=newmasse
    792790           ENDDO
    793        
    794         ENDIF
     791       
     792        ENDIF
    795793c.-. fin ancienne version
    796794

  • LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F

    r2598 r2600  
    4444      include "dimensions.h"
    4545      include "paramet.h"
    46       include "comvert.h"
    4746      include "comgeom.h"
    4847      include "temps.h"

  • LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F

    r2598 r2600  
    4444      include "dimensions.h"
    4545      include "paramet.h"
    46       include "comvert.h"
    4746      include "comgeom.h"
    4847      include "temps.h"
Note: See TracChangeset for help on using the changeset viewer.