Ignore:
Timestamp:
Sep 29, 2016, 11:26:46 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2593:2640 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 deleted
46 edited
2 copied

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/dyn3dmem/addfi_loc.F

    r1999 r2641  
    4646c    ------------------
    4747c
    48 #include "dimensions.h"
    49 #include "paramet.h"
    50 #include "comconst.h"
    51 #include "comgeom.h"
    52 #include "serre.h"
     48      include "dimensions.h"
     49      include "paramet.h"
     50      include "comgeom.h"
    5351c
    5452c    Arguments :

  • LMDZ5/branches/testing/libf/dyn3dmem/advect_new_loc.F

    r1910 r2641  
    77      USE write_field_loc
    88      USE advect_new_mod
     9      USE comconst_mod, ONLY: daysec
     10      USE logic_mod, ONLY: conser
     11     
    912      IMPLICIT NONE
    1013c=======================================================================
    … …  
    2730c   -------------
    2831
    29 #include "dimensions.h"
    30 #include "paramet.h"
    31 #include "comconst.h"
    32 #include "comvert.h"
    33 #include "comgeom.h"
    34 #include "logic.h"
    35 #include "ener.h"
     32      include "dimensions.h"
     33      include "paramet.h"
     34      include "comgeom.h"
    3635
    3736c   Arguments:
    … …  
    6160c   -------------------------
    6261     
    63       IF (conser)  THEN
     62      IF (conser.AND.1==0)  THEN
    6463         deuxjour = 2. * daysec
    6564
    … …  
    122121                 
    123122           uav(ij,l)=0.25*(ucov(ij,l)+ucov(ij-iip1,l))
    124      .               +0.25*(ucov(ij+iip1,l)+ucov(ij,l))
     123     .               +0.25*(ucov(ij+iip1,l)+ucov(ij,l))
    125124         ENDDO
    126125         

  • LMDZ5/branches/testing/libf/dyn3dmem/advtrac_loc.F

    r2298 r2641  
    2727      USE control_mod, ONLY: iapp_tracvl, day_step, planet_type
    2828      USE advtrac_mod, ONLY: finmasse
     29      USE comconst_mod, ONLY: dtvr
    2930      IMPLICIT NONE
    3031c
    31 #include "dimensions.h"
    32 #include "paramet.h"
    33 #include "comconst.h"
    34 #include "comvert.h"
    35 #include "comdissip.h"
    36 #include "comgeom2.h"
    37 #include "logic.h"
    38 #include "temps.h"
    39 #include "ener.h"
    40 #include "description.h"
     32      include "dimensions.h"
     33      include "paramet.h"
     34      include "comdissip.h"
     35      include "comgeom2.h"
     36      include "description.h"
    4137
    4238c-------------------------------------------------------------------
    … …  
    172168#endif
    173169         
    174           GOTO 1234     
     170          GOTO 1234     
    175171c-----------------------------------------------------------
    176172c     Appel des sous programmes d'advection
    … …  
    184180        if(iadv(iq).eq.10) THEN
    185181     
    186 !LF         call vlsplt_p(q(1,1,iq),2.,massem,wg,pbarug,pbarvg,dtvr)
     182!LF            call vlsplt_p(q(1,1,iq),2.,massem,wg,pbarug,pbarvg,dtvr)
    187183
    188184c   ----------------------------------------------------------------

  • LMDZ5/branches/testing/libf/dyn3dmem/bernoui_loc.F

    r1910 r2641  
    2424c   -------------
    2525c
    26 #include "dimensions.h"
    27 #include "paramet.h"
    28 #include "logic.h"
     26      include "dimensions.h"
     27      include "paramet.h"
    2928c
    3029c   Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/bilan_dyn_loc.F

    r2488 r2641  
    1717      use misc_mod
    1818      USE write_field_loc
     19      USE comconst_mod, ONLY: cpp, pi
     20      USE comvert_mod, ONLY: presnivs
     21      USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn
     22     
    1923      IMPLICIT NONE
    2024
    21 #include "dimensions.h"
    22 #include "paramet.h"
    23 #include "comconst.h"
    24 #include "comvert.h"
    25 #include "comgeom2.h"
    26 #include "temps.h"
    27 #include "iniprint.h"
     25      include "dimensions.h"
     26      include "paramet.h"
     27      include "comgeom2.h"
     28      include "iniprint.h"
    2829
    2930c====================================================================
    … …  
    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/branches/testing/libf/dyn3dmem/caladvtrac_loc.F

    r2298 r2641  
    2929
    3030
    31 #include "dimensions.h"
    32 #include "paramet.h"
    33 #include "comconst.h"
     31      include "dimensions.h"
     32      include "paramet.h"
    3433
    3534c   Arguments:
    … …  
    210209        call resume_timer(timer_caldyn)
    211210c$OMP END MASTER
    212 c$OMP BARRIER   
     211c$OMP BARRIER
    213212          iadvtr=0
    214213       ENDIF ! if iadvtr.EQ.iapp_tracvl

  • LMDZ5/branches/testing/libf/dyn3dmem/caldyn_loc.F

    r1999 r2641  
    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
    … …  
    3132!   ----------------
    3233
    33 #include "dimensions.h"
    34 #include "paramet.h"
    35 #include "comconst.h"
    36 #include "comvert.h"
    37 #include "comgeom.h"
     34      include "dimensions.h"
     35      include "paramet.h"
     36      include "comgeom.h"
    3837
    3938!   Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/call_calfis_mod.F90

    r2408 r2641  
    8282  USE write_field_loc
    8383  USE write_field
     84  USE comconst_mod, ONLY: dtphys
     85  USE logic_mod, ONLY: leapf, forward, ok_strato
     86  USE comvert_mod, ONLY: ap, bp, pressure_exner
     87  USE temps_mod, ONLY: day_ini, day_ref, jd_ref, jh_ref, start_time
     88 
    8489  IMPLICIT NONE
    85     INCLUDE "comconst.h"
    86     INCLUDE "comvert.h"
    87     INCLUDE "logic.h"
    88     INCLUDE "temps.h"
    8990    INCLUDE "iniprint.h"
    9091

  • LMDZ5/branches/testing/libf/dyn3dmem/conf_gcm.F90

    r2471 r2641  
    1717  USE infotrac, ONLY : type_trac
    1818  use assert_m, only: assert
     19  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
     20                          iflag_top_bound, mode_top_bound, tau_top_bound, &
     21                          ngroup
     22  USE logic_mod, ONLY: fxyhypb, iflag_phys, ok_etat0, ok_gradsfile, &
     23                       ok_guide, ok_limit, ok_strato, purmats, read_start, &
     24                       ysinus
     25  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     26                       alphax,alphay,taux,tauy
     27  USE temps_mod, ONLY: calend
    1928
    2029  IMPLICIT NONE
    … …  
    3544  include "dimensions.h"
    3645  include "paramet.h"
    37   include "logic.h"
    38   include "serre.h"
    3946  include "comdissnew.h"
    40   include "temps.h"
    41   include "comconst.h"
    4247  include "iniprint.h"
    4348

  • LMDZ5/branches/testing/libf/dyn3dmem/convmas1_loc.F90

    r2408 r2641  
    1212  include "paramet.h"
    1313  include "comgeom.h"
    14   include "logic.h"
    1514!===============================================================================
    1615! Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/convmas2_loc.F90

    r2408 r2641  
    1111  include "paramet.h"
    1212  include "comgeom.h"
    13   include "logic.h"
    1413!===============================================================================
    1514! Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/convmas_loc.F90

    r2408 r2641  
    1111  include "paramet.h"
    1212  include "comgeom.h"
    13   include "logic.h"
    1413!===============================================================================
    1514! Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/dissip_loc.F

    r1999 r2641  
    77      USE write_field_loc
    88      USE dissip_mod, ONLY: dissip_allocate
     9      USE comconst_mod, ONLY: dtdiss
    910      IMPLICIT NONE
    1011
    … …  
    2829c   -------------
    2930
    30 #include "dimensions.h"
    31 #include "paramet.h"
    32 #include "comconst.h"
    33 #include "comgeom.h"
    34 #include "comdissnew.h"
    35 #include "comdissipn.h"
     31      include "dimensions.h"
     32      include "paramet.h"
     33      include "comgeom.h"
     34      include "comdissnew.h"
     35      include "comdissipn.h"
    3636
    3737c   Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/dteta1_loc.F

    r1910 r2641  
    2121
    2222
    23 #include "dimensions.h"
    24 #include "paramet.h"
    25 #include "logic.h"
     23      include "dimensions.h"
     24      include "paramet.h"
    2625
    2726      REAL teta( ijb_u:ije_u,llm )

  • LMDZ5/branches/testing/libf/dyn3dmem/dudv2_loc.F

    r1910 r2641  
    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/branches/testing/libf/dyn3dmem/dynetat0_loc.f90

    r2408 r2641  
    1212  USE control_mod, ONLY: planet_type
    1313  USE assert_eq_m, ONLY: assert_eq
     14  USE comvert_mod, ONLY: pa,preff
     15  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
     16                          omeg, rad
     17  USE logic_mod, ONLY: fxyhypb, ysinus
     18  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
     19  USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, &
     20                       start_time,day_ini,hour_ini
     21  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     22 
    1423  IMPLICIT NONE
    1524  include "dimensions.h"
    1625  include "paramet.h"
    17   include "temps.h"
    18   include "comconst.h"
    19   include "comvert.h"
    2026  include "comgeom.h"
    21   include "ener.h"
    2227  include "description.h"
    23   include "serre.h"
    24   include "logic.h"
    2528  include "iniprint.h"
    2629!===============================================================================
    … …  
    99102  day_ini    = tab_cntrl(30)
    100103  itau_dyn   = tab_cntrl(31)
    101 !  start_time = tab_cntrl(32)   ????
     104  start_time = tab_cntrl(32)
    102105
    103106!-------------------------------------------------------------------------------

  • LMDZ5/branches/testing/libf/dyn3dmem/dynredem_loc.F90

    r2594 r2641  
    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
     17  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     18  USE logic_mod, ONLY: fxyhypb, ysinus
     19  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     20                       taux,tauy
     21  USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itaufin, start_time
     22  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     23
    1524  IMPLICIT NONE
    1625  include "dimensions.h"
    1726  include "paramet.h"
    18   include "comconst.h"
    19   include "comvert.h"
    2027  include "comgeom.h"
    21   include "temps.h"
    22   include "ener.h"
    23   include "logic.h"
    2428  include "description.h"
    25   include "serre.h"
    2629  include "iniprint.h"
    2730!===============================================================================
    … …  
    176179  USE dynredem_mod, ONLY: dynredem_write_u, dynredem_write_v, dynredem_read_u, &
    177180                          err, modname, fil, msg
     181  USE temps_mod, ONLY: itau_dyn, itaufin
     182 
    178183  IMPLICIT NONE
    179184  include "dimensions.h"
    180185  include "paramet.h"
    181186  include "description.h"
    182   include "comvert.h"
    183187  include "comgeom.h"
    184   include "temps.h"
    185188  include "iniprint.h"
    186189!===============================================================================

  • LMDZ5/branches/testing/libf/dyn3dmem/exner_hyb_loc_m.F90

    r2056 r2641  
    3535    USE mod_filtreg_p
    3636    USE write_field_loc
     37    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
     38    USE comvert_mod, ONLY: preff
     39   
     40    IMPLICIT NONE
    3741    !
    3842    include "dimensions.h"
    3943    include "paramet.h"
    40     include "comconst.h"
    4144    include "comgeom.h"
    42     include "comvert.h"
    43     include "serre.h"
    4445
    4546    INTEGER  ngrid

  • LMDZ5/branches/testing/libf/dyn3dmem/exner_milieu_loc_m.F90

    r2056 r2641  
    3131    USE parallel_lmdz
    3232    USE mod_filtreg_p
     33    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
     34    USE comvert_mod, ONLY: preff
     35   
     36    IMPLICIT NONE
    3337    !
    3438    include "dimensions.h"
    3539    include "paramet.h"
    36     include "comconst.h"
    3740    include "comgeom.h"
    38     include "comvert.h"
    39     include "serre.h"
    4041
    4142    INTEGER  ngrid

  • LMDZ5/branches/testing/libf/dyn3dmem/friction_loc.F

    r1910 r2641  
    1212      USE ioipsl_getincom
    1313#endif
     14      USE comconst_mod, ONLY: pi
    1415      IMPLICIT NONE
    1516
    … …  
    2627!=======================================================================
    2728
    28 #include "dimensions.h"
    29 #include "paramet.h"
    30 #include "comgeom2.h"
    31 #include "comconst.h"
    32 #include "iniprint.h"
    33 #include "academic.h"
     29      include "dimensions.h"
     30      include "paramet.h"
     31      include "comgeom2.h"
     32      include "iniprint.h"
     33      include "academic.h"
    3434
    3535! arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/gcm.F90

    r2488 r2641  
    2121  USE iniphysiq_mod, ONLY: iniphysiq
    2222#endif
     23  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
     24  USE logic_mod ! all of it, because of copyin clause when calling leapfrog
     25  USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
     26                       itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end, &
     27                       dt,hour_ini,itaufin
     28
    2329  IMPLICIT NONE
    2430
    … …  
    5460  include "dimensions.h"
    5561  include "paramet.h"
    56   include "comconst.h"
    5762  include "comdissnew.h"
    58   include "comvert.h"
    5963  include "comgeom.h"
    60   include "logic.h"
    61   include "temps.h"
    62   include "ener.h"
    6364  include "description.h"
    64   include "serre.h"
    65   !include "com_io_dyn.h"
    6665  include "iniprint.h"
    6766  include "tracstoke.h"
    … …  
    452451  !       write(78,*) 'q',q
    453452
    454   !$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
     453  !!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
     454  !$OMP PARALLEL DEFAULT(SHARED) &
     455  !     Copy all threadprivate variables in temps_mod
     456  !$OMP COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end) &
     457  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend) &
     458  !     Copy all threadprivate variables from logic_mod
     459  !$OMP COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq) &
     460  !$OMP COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide) &
     461  !$OMP COPYIN(ok_strato,ok_gradsfile,ok_limit,ok_etat0) &
     462  !$OMP COPYIN(iflag_phys,iflag_trac)
    455463  CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,time_0)
    456464  !$OMP END PARALLEL

  • LMDZ5/branches/testing/libf/dyn3dmem/geopot_loc.F

    r1910 r2641  
    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/branches/testing/libf/dyn3dmem/groupe_loc.F

    r2471 r2641  
    33      USE Write_field_loc
    44      USE groupe_mod
     5      USE comconst_mod, ONLY: ngroup
    56      implicit none
    67
    … …  
    1617c   pas besoin de w en entree.
    1718
    18 #include "dimensions.h"
    19 #include "paramet.h"
    20 #include "comconst.h"
    21 #include "comgeom2.h"
    22 #include "comvert.h"
     19      include "dimensions.h"
     20      include "paramet.h"
     21      include "comgeom2.h"
    2322
    2423!     integer ngroup

  • LMDZ5/branches/testing/libf/dyn3dmem/groupeun_loc.F

    r2471 r2641  
    22      USE parallel_lmdz
    33      USE Write_Field_p
     4      USE comconst_mod, ONLY: ngroup
    45      IMPLICIT NONE
    56
    6 #include "dimensions.h"
    7 #include "paramet.h"
    8 #include "comconst.h"
    9 #include "comgeom2.h"
     7      include "dimensions.h"
     8      include "paramet.h"
     9      include "comgeom2.h"
    1010
    1111      INTEGER jjmax,llmax,sb,se,jjb,jje
    … …  
    136136
    137137      USE parallel_lmdz
     138      USE comconst_mod, ONLY: ngroup
    138139      IMPLICIT NONE
    139140
    140 #include "dimensions.h"
    141 #include "paramet.h"
    142 #include "comconst.h"
    143 #include "comgeom2.h"
     141      include "dimensions.h"
     142      include "paramet.h"
     143      include "comgeom2.h"
    144144
    145145!     INTEGER ngroup

  • LMDZ5/branches/testing/libf/dyn3dmem/guide_loc_mod.F90

    r2298 r2641  
    6969  SUBROUTINE guide_init
    7070
    71     USE control_mod
     71    USE control_mod, ONLY: day_step
     72    USE serre_mod, ONLY: grossismx
    7273
    7374    IMPLICIT NONE
    … …  
    7677    INCLUDE "paramet.h"
    7778    INCLUDE "netcdf.inc"
    78 
    79     ! For grossismx:
    80     include "serre.h"
    8179
    8280    INTEGER                :: error,ncidpl,rid,rcod
    … …  
    346344    USE control_mod
    347345    USE write_field_loc
     346    USE comconst_mod, ONLY: cpp, daysec, dtvr, kappa
     347    USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    348348   
    349349    IMPLICIT NONE
    … …  
    351351    INCLUDE "dimensions.h"
    352352    INCLUDE "paramet.h"
    353     INCLUDE "comconst.h"
    354     INCLUDE "comvert.h"
    355353
    356354    ! Variables entree
    … …  
    748746  SUBROUTINE guide_zonave_u(typ,vsize,field)
    749747
     748    USE comconst_mod, ONLY: pi
     749   
    750750    IMPLICIT NONE
    751751
    … …  
    753753    INCLUDE "paramet.h"
    754754    INCLUDE "comgeom.h"
    755     INCLUDE "comconst.h"
    756755   
    757756    ! input/output variables
    … …  
    819818  SUBROUTINE guide_zonave_v(typ,hsize,vsize,field)
    820819
     820    USE comconst_mod, ONLY: pi
     821   
    821822    IMPLICIT NONE
    822823
    … …  
    824825    INCLUDE "paramet.h"
    825826    INCLUDE "comgeom.h"
    826     INCLUDE "comconst.h"
    827827   
    828828    ! input/output variables
    … …  
    890890  USE mod_hallo
    891891  USE Bands
     892  USE comconst_mod, ONLY: cpp, kappa
     893  USE comvert_mod, ONLY: preff, pressure_exner, bp, ap, disvert_type
    892894  IMPLICIT NONE
    893895
    894896  include "dimensions.h"
    895897  include "paramet.h"
    896   include "comvert.h"
    897898  include "comgeom2.h"
    898   include "comconst.h"
    899899
    900900  REAL, DIMENSION (iip1,jjb_u:jje_u),     INTENT(IN) :: psi ! Psol gcm
    … …  
    10121012!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
    10131013        DO l=1,llm
    1014             DO j=jjbu,jjeu
    1015                 DO i =1, iip1
     1014            DO j=jjbu,jjeu
     1015                DO i =1, iip1
    10161016                    pls(i,j,l)=(ap(l)+ap(l+1))/2.+psi(i,j)*(bp(l)+bp(l+1))/2.
    10171017                ENDDO
    … …  
    10301030   DO l = 1, llm
    10311031       DO j=jjbu,jjeu
    1032         DO i =1, iip1
    1033             pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap
    1034         ENDDO
     1032           DO i =1, iip1
     1033               pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap
     1034           ENDDO
    10351035       ENDDO
    10361036   ENDDO
    … …  
    13021302        ! Calcul des nouvelles valeurs des niveaux de pression du guidage
    13031303        IF (guide_plevs.EQ.1) THEN
    1304         CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req)
    1305         CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req)
    1306         CALL SendRequest(Req)
    1307 !$OMP BARRIER
    1308         CALL WaitRequest(Req)
     1304        CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req)
     1305        CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req)
     1306        CALL SendRequest(Req)
     1307!$OMP BARRIER
     1308        CALL WaitRequest(Req)
    13091309!$OMP BARRIER
    13101310!$OMP DO
    … …  
    13201320            ENDDO
    13211321        ELSE IF (guide_plevs.EQ.2) THEN
    1322         CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req)
    1323         CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req)
    1324         CALL SendRequest(Req)
    1325 !$OMP BARRIER
    1326         CALL WaitRequest(Req)
     1322        CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req)
     1323        CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req)
     1324        CALL SendRequest(Req)
     1325!$OMP BARRIER
     1326        CALL WaitRequest(Req)
    13271327!$OMP BARRIER
    13281328!$OMP DO
    … …  
    13701370! Calcul des constantes de rappel alpha (=1/tau)
    13711371
     1372    use comconst_mod, only: pi
     1373    use serre_mod, only: clat, clon, grossismx, grossismy
     1374   
    13721375    implicit none
    13731376
    13741377    include "dimensions.h"
    13751378    include "paramet.h"
    1376     include "comconst.h"
    13771379    include "comgeom2.h"
    1378     include "serre.h"
    13791380
    13801381! input arguments :
    … …  
    21272128    USE parallel_lmdz
    21282129    USE mod_hallo, ONLY : gather_field_u, gather_field_v
     2130    USE comconst_mod, ONLY: pi
     2131    USE comvert_mod, ONLY: presnivs
    21292132    IMPLICIT NONE
    21302133
    … …  
    21332136    INCLUDE "netcdf.inc"
    21342137    INCLUDE "comgeom2.h"
    2135     INCLUDE "comconst.h"
    2136     INCLUDE "comvert.h"
    21372138   
    21382139    ! Variables entree

  • LMDZ5/branches/testing/libf/dyn3dmem/iniacademic_loc.F90

    r2298 r2641  
    1818#endif
    1919  USE Write_Field
     20  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
     21  USE logic_mod, ONLY: iflag_phys, read_start
     22  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
     23  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
     24  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     25
    2026
    2127  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    3036  include "dimensions.h"
    3137  include "paramet.h"
    32   include "comvert.h"
    33   include "comconst.h"
    3438  include "comgeom.h"
    3539  include "academic.h"
    36   include "ener.h"
    37   include "temps.h"
    3840  include "iniprint.h"
    39   include "logic.h"
    4041
    4142  !   Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/initdynav_loc.F

    r2488 r2641  
    1414       use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid,       &
    1515     &        dynhistave_file,dynhistvave_file,dynhistuave_file
     16       USE comconst_mod, ONLY: pi
     17       USE comvert_mod, ONLY: presnivs
     18       USE temps_mod, ONLY: itau_dyn
     19       
    1620       implicit none
    1721
    … …  
    4145C
    4246C   Declarations
    43 #include "dimensions.h"
    44 #include "paramet.h"
    45 #include "comconst.h"
    46 #include "comvert.h"
    47 #include "comgeom.h"
    48 #include "temps.h"
    49 #include "ener.h"
    50 #include "logic.h"
    51 #include "description.h"
    52 #include "serre.h"
    53 #include "iniprint.h"
     47      include "dimensions.h"
     48      include "paramet.h"
     49      include "comgeom.h"
     50      include "description.h"
     51      include "iniprint.h"
    5452
    5553C   Arguments

  • LMDZ5/branches/testing/libf/dyn3dmem/initfluxsto_p.F

    r1910 r2641  
    1313       use Write_field
    1414       use misc_mod
     15       USE comconst_mod, ONLY: pi
     16       USE comvert_mod, ONLY: nivsigs
     17       USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn
    1518       
    1619      implicit none
    … …  
    4346C
    4447C   Declarations
    45 #include "dimensions.h"
    46 #include "paramet.h"
    47 #include "comconst.h"
    48 #include "comvert.h"
    49 #include "comgeom.h"
    50 #include "temps.h"
    51 #include "ener.h"
    52 #include "logic.h"
    53 #include "description.h"
    54 #include "serre.h"
    55 #include "iniprint.h"
     48      include "dimensions.h"
     49      include "paramet.h"
     50      include "comgeom.h"
     51      include "description.h"
     52      include "iniprint.h"
    5653
    5754C   Arguments
    … …  
    106103      CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
    107104      tau0 = itau_dyn
    108        
    109         do jj = 1, jjp1
     105       
     106        do jj = 1, jjp1
    110107        do ii = 1, iip1
    111108          rlong(ii,jj) = rlonu(ii) * 180. / pi
    … …  
    165162     .             1, iip1, 1, jjn,tau0, zjulian, tstep, vhoriid,
    166163     .             filevid,dynv_domain_id)
    167        
    168       rl(1,1) = 1.     
     164       
     165      rl(1,1) = 1.
    169166     
    170167      if (mpi_rank==0) then
    … …  
    191188      call histhori(fileid, iip1, rlong(:,jjb:jje),jjn,rlat(:,jjb:jje),
    192189     .             'scalar','Grille points scalaires', thoriid)
    193        
     190       
    194191C
    195192C  Appel a histvert pour la grille verticale
    … …  
    211208C
    212209C  Appels a histdef pour la definition des variables a sauvegarder
    213        
    214         CALL histdef(fileid, "phis", "Surface geop. height", "-",
     210       
     211        CALL histdef(fileid, "phis", "Surface geop. height", "-",
    215212     .                iip1,jjn,thoriid, 1,1,1, -99, 32,
    216213     .                "once", t_ops, t_wrt)
    … …  
    219216     .                iip1,jjn,thoriid, 1,1,1, -99, 32,
    220217     .                "once", t_ops, t_wrt)
    221        
     218       
    222219        if (mpi_rank==0) then
    223        
    224         CALL histdef(filedid, "dtvr", "tps dyn", "s",
     220       
     221        CALL histdef(filedid, "dtvr", "tps dyn", "s",
    225222     .                1,1,dhoriid, 1,1,1, -99, 32,
    226223     .                "once", t_ops, t_wrt)
    … …  
    289286        if (mpi_rank==0) call histsync(filedid)
    290287      endif
    291        
     288       
    292289#else
    293290      write(lunout,*)'initfluxsto_p: Needs IOIPSL to function'

  • LMDZ5/branches/testing/libf/dyn3dmem/inithist_loc.F

    r2488 r2641  
    1414       use com_io_dyn_mod, only : histid,histvid,histuid,               &
    1515     &                        dynhist_file,dynhistv_file,dynhistu_file
     16       USE comconst_mod, ONLY: pi
     17       USE comvert_mod, ONLY: presnivs
     18       USE temps_mod, ONLY: itau_dyn
     19       
    1620       implicit none
    1721
    … …  
    4044C
    4145C   Declarations
    42 #include "dimensions.h"
    43 #include "paramet.h"
    44 #include "comconst.h"
    45 #include "comvert.h"
    46 #include "comgeom.h"
    47 #include "temps.h"
    48 #include "ener.h"
    49 #include "logic.h"
    50 #include "description.h"
    51 #include "serre.h"
    52 #include "iniprint.h"
     46      include "dimensions.h"
     47      include "paramet.h"
     48      include "comgeom.h"
     49      include "description.h"
     50      include "iniprint.h"
    5351
    5452C   Arguments

  • LMDZ5/branches/testing/libf/dyn3dmem/integrd_loc.F

    r2488 r2641  
    1212      USE integrd_mod
    1313      USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
     14      USE comconst_mod, ONLY: pi
     15      USE logic_mod, ONLY: leapf
     16      USE comvert_mod, ONLY: ap, bp
     17      USE temps_mod, ONLY: dt
     18     
    1419      IMPLICIT NONE
    1520
    … …  
    3035c   -------------
    3136
    32 #include "dimensions.h"
    33 #include "paramet.h"
    34 #include "comconst.h"
    35 #include "comgeom.h"
    36 #include "comvert.h"
    37 #include "logic.h"
    38 #include "temps.h"
    39 #include "serre.h"
    40 #include "iniprint.h"
    41 !      include 'mpif.h'
     37      include "dimensions.h"
     38      include "paramet.h"
     39      include "comgeom.h"
     40      include "iniprint.h"
    4241
    4342c   Arguments:
    … …  
    335334      ije=ij_end
    336335
    337         if (planet_type.eq."earth") then
     336        if (planet_type.eq."earth") then
    338337! Earth-specific treatment of first 2 tracers (water)
    339338c$OMP BARRIER
    … …  
    452451          DO l = 1, llm
    453452            massem1(ijb:ije,l)=massescr(ijb:ije,l)
    454           ENDDO
    455 c$OMP END DO NOWAIT      
     453          ENDDO
     454c$OMP END DO NOWAIT         
    456455      END IF
    457456c$OMP BARRIER

  • LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

    r2488 r2641  
    3232       use exner_hyb_loc_m, only: exner_hyb_loc
    3333       use exner_milieu_loc_m, only: exner_milieu_loc
     34       USE comconst_mod, ONLY: cpp, dtvr, ihf
     35       USE comvert_mod, ONLY: ap, bp, pressure_exner
     36       USE logic_mod, ONLY: iflag_phys,ok_guide,forward,leapf,apphys,
     37     &                      statcl,conser,apdiss,purmats,ok_strato
     38       USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
     39     &                        day_ref,start_time,dt
     40       
    3441      IMPLICIT NONE
    3542
    … …  
    6572c   -------------
    6673
    67 #include "dimensions.h"
    68 #include "paramet.h"
    69 #include "comconst.h"
    70 #include "comdissnew.h"
    71 #include "comvert.h"
    72 #include "comgeom.h"
    73 #include "logic.h"
    74 #include "temps.h"
    75 #include "ener.h"
    76 #include "description.h"
    77 #include "serre.h"
    78 !#include "com_io_dyn.h"
    79 #include "iniprint.h"
    80 #include "academic.h"
    81 !      include "mpif.h"
     74      include "dimensions.h"
     75      include "paramet.h"
     76      include "comdissnew.h"
     77      include "comgeom.h"
     78      include "description.h"
     79      include "iniprint.h"
     80      include "academic.h"
    8281     
    8382      REAL,INTENT(IN) :: time_0 ! not used
    … …  
    472471cym      apphys = .FALSE.
    473472      statcl = .FALSE.
    474       conser = .FALSE. ! ie: no output of control variables to stdout in //
     473!     conser = .FALSE. ! ie: no output of control variables to stdout in //
    475474     
    476475      if (firstCaldyn) then
    … …  
    700699
    701700c$OMP MASTER
     701      if (mpi_rank==0.AND.conser) THEN
     702         WRITE(lunout,*) 'leapfrog_loc, Time step: ',itau,' Day:',time
     703      ENDIF
    702704      call VTe(VTcaldyn)
    703705c$OMP END MASTER     
    … …  
    16351637            IF( MOD(itau,iecri).EQ.0) THEN
    16361638             ! Ehouarn: output only during LF or Backward Matsuno
    1637              if (leapf.or.(.not.leapf.and.(.not.forward))) then
     1639             if (leapf.or.(.not.leapf.and.(.not.forward))) then
    16381640
    16391641c$OMP BARRIER
    … …  
    16451647#ifdef CPP_IOIPSL
    16461648             if (ok_dyn_ins) then
    1647                  CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
     1649                 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
    16481650     &                              masse,ps,phis)
    16491651             endif

  • LMDZ5/branches/testing/libf/dyn3dmem/massbarxy_loc.F90

    r2408 r2641  
    1010  include "dimensions.h"
    1111  include "paramet.h"
    12   include "comconst.h"
    1312  include "comgeom.h"
    1413!===============================================================================

  • LMDZ5/branches/testing/libf/dyn3dmem/massdair_loc.F

    r1910 r2641  
    1616      IMPLICIT NONE
    1717c
    18 #include "dimensions.h"
    19 #include "paramet.h"
    20 #include "comconst.h"
    21 #include "comgeom.h"
     18      include "dimensions.h"
     19      include "paramet.h"
     20      include "comgeom.h"
    2221c
    2322c  .....   arguments  ....

  • LMDZ5/branches/testing/libf/dyn3dmem/mod_hallo.F90

    r2471 r2641  
    14111411         
    14121412#ifdef CPP_MPI
    1413          call MPI_ISSEND(Buffer(req%Pos),SizeBuffer,MPI_REAL_LMDZ,rank,a_request%tag+1000*omp_rank,     &
     1413         call MPI_ISEND(Buffer(req%Pos),SizeBuffer,MPI_REAL_LMDZ,rank,a_request%tag+1000*omp_rank,     &
    14141414                         COMM_LMDZ,Req%MSG_Request,ierr)
    14151415#endif

  • LMDZ5/branches/testing/libf/dyn3dmem/parallel_lmdz.F90

    r2056 r2641  
    575575!$OMP CRITICAL (MPI)
    576576#ifdef CPP_MPI
    577           call MPI_ISSEND(Buffer_send_up,Buffer_Size,MPI_REAL8,MPI_Rank-1,1,     &
     577          call MPI_ISEND(Buffer_send_up,Buffer_Size,MPI_REAL8,MPI_Rank-1,1,     &
    578578                          COMM_LMDZ,Request(NbRequest),ierr)
    579579#endif
    … …  
    590590!$OMP CRITICAL (MPI)
    591591#ifdef CPP_MPI
    592           call MPI_ISSEND(Buffer_send_down,Buffer_Size,MPI_REAL8,MPI_Rank+1,1,     &
     592          call MPI_ISEND(Buffer_send_down,Buffer_Size,MPI_REAL8,MPI_Rank+1,1,     &
    593593                          COMM_LMDZ,Request(NbRequest),ierr)
    594594#endif

  • LMDZ5/branches/testing/libf/dyn3dmem/qminimum_loc.F

    r2298 r2641  
    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/branches/testing/libf/dyn3dmem/sw_case_williamson91_6_loc.F

    r1910 r2641  
    2727c=======================================================================
    2828      USE parallel_lmdz
     29      USE comconst_mod, ONLY: cpp, omeg, rad
     30      USE comvert_mod, ONLY: ap, bp, preff
    2931
    3032      IMPLICIT NONE
    … …  
    3335c   ---------------
    3436
    35 #include "dimensions.h"
    36 #include "paramet.h"
    37 #include "comvert.h"
    38 #include "comconst.h"
    39 #include "comgeom.h"
    40 #include "iniprint.h"
     37      include "dimensions.h"
     38      include "paramet.h"
     39      include "comgeom.h"
     40      include "iniprint.h"
    4141
    4242c   Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/top_bound_loc.F

    r1910 r2641  
    44      SUBROUTINE top_bound_loc(vcov,ucov,teta,masse,dt)
    55      USE parallel_lmdz
     6      USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound,
     7     &                        tau_top_bound
     8      USE comvert_mod, ONLY: presnivs, preff, scaleheight
     9
    610      IMPLICIT NONE
    711c
    8 #include "dimensions.h"
    9 #include "paramet.h"
    10 #include "comconst.h"
    11 #include "comvert.h"
    12 #include "comgeom2.h"
     12      include "dimensions.h"
     13      include "paramet.h"
     14      include "comgeom2.h"
    1315
    1416
    … …  
    4042! NB: top_bound sponge is only called from leapfrog if ok_strato=.true.
    4143
    42 ! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst.h)
     44! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst_mod)
    4345!    iflag_top_bound=0 for no sponge
    4446!    iflag_top_bound=1 for sponge over 4 topmost layers
    … …  
    7476      REAL tzon(jjb_u:jje_u,llm)
    7577     
    76       integer i 
     78      integer i
    7779      REAL,SAVE :: rdamp(llm)
    7880      real,save :: lambda(llm) ! inverse or quenching time scale (Hz)

  • LMDZ5/branches/testing/libf/dyn3dmem/tourpot_loc.F90

    r2408 r2641  
    1111  include "paramet.h"
    1212  include "comgeom.h"
    13   include "logic.h"
    1413!===============================================================================
    1514! Arguments:

  • LMDZ5/branches/testing/libf/dyn3dmem/vitvert_loc.F90

    r2408 r2641  
    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/branches/testing/libf/dyn3dmem/vlsplt_loc.F

    r2298 r2641  
    1717      IMPLICIT NONE
    1818c
    19 #include "dimensions.h"
    20 #include "paramet.h"
    21 #include "logic.h"
    22 #include "comvert.h"
    23 #include "comconst.h"
     19      include "dimensions.h"
     20      include "paramet.h"
    2421c
    2522c
    … …  
    417414      USE parallel_lmdz
    418415      USE infotrac, ONLY : nqtot,nqfils,nqdesc,iqfils ! CRisi
     416      USE comconst_mod, ONLY: pi
    419417      IMPLICIT NONE
    420418c
    421 #include "dimensions.h"
    422 #include "paramet.h"
    423 #include "logic.h"
    424 #include "comvert.h"
    425 #include "comconst.h"
    426 #include "comgeom.h"
     419      include "dimensions.h"
     420      include "paramet.h"
     421      include "comgeom.h"
    427422c
    428423c
    … …  
    875870      IMPLICIT NONE
    876871c
    877 #include "dimensions.h"
    878 #include "paramet.h"
    879 #include "logic.h"
    880 #include "comvert.h"
    881 #include "comconst.h"
     872      include "dimensions.h"
     873      include "paramet.h"
    882874c
    883875c

  • LMDZ5/branches/testing/libf/dyn3dmem/vlspltgen_loc.F

    r2298 r2641  
    3131     &    ok_iso_verif
    3232      USE vlspltgen_mod
     33      USE comconst_mod, ONLY: cpp
    3334      IMPLICIT NONE
    3435
    3536c
    36 #include "dimensions.h"
    37 #include "paramet.h"
    38 #include "logic.h"
    39 #include "comvert.h"
    40 #include "comconst.h"
     37      include "dimensions.h"
     38      include "paramet.h"
    4139
    4240c
    … …  
    10098
    10199       
    102         ijb=ij_begin-iip1
    103         ije=ij_end+iip1
    104         if (pole_nord) ijb=ij_begin
    105         if (pole_sud) ije=ij_end
    106        
     100        ijb=ij_begin-iip1
     101        ije=ij_end+iip1
     102        if (pole_nord) ijb=ij_begin
     103        if (pole_sud) ije=ij_end
     104       
    107105c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
    108         DO l = 1, llm
     106        DO l = 1, llm
    109107         DO ij = ijb, ije
    110108          tempe(ij) = teta(ij,l) * pk(ij,l) /cpp
    … …  
    208206#endif
    209207        if(iadv(iq) == 0) then
    210        
    211           cycle
    212        
    213         else if (iadv(iq)==10) then
     208       
     209          cycle
     210       
     211        else if (iadv(iq)==10) then
    214212
    215213#ifdef _ADV_HALO       
    216214! CRisi: on ajoute les nombres de fils et tableaux des fils
    217215! On suppose qu'on ne peut advecter les fils que par le schéma 10. 
    218           call vlx_loc(zq,pente_max,zm,mu,
    219      &               ij_begin,ij_begin+2*iip1-1,iq)
     216          call vlx_loc(zq,pente_max,zm,mu,
     217     &                     ij_begin,ij_begin+2*iip1-1,iq)
    220218          call vlx_loc(zq,pente_max,zm,mu,
    221219     &               ij_end-2*iip1+1,ij_end,iq)
    222220#else
    223           call vlx_loc(zq,pente_max,zm,mu,
    224      &               ij_begin,ij_end,iq)
     221          call vlx_loc(zq,pente_max,zm,mu,
     222     &                     ij_begin,ij_end,iq)
    225223#endif
    226224
    … …  
    240238          call VTe(VTHallo)
    241239c$OMP END MASTER
    242         else if (iadv(iq)==14) then
     240        else if (iadv(iq)==14) then
    243241
    244242#ifdef _ADV_HALO           
    … …  
    268266c$OMP END MASTER
    269267        else
    270        
    271           stop 'vlspltgen_p : schema non parallelise'
     268       
     269          stop 'vlspltgen_p : schema non parallelise'
    272270     
    273271        endif
    … …  
    301299
    302300        if(iadv(iq) == 0) then
    303        
    304           cycle
    305        
    306         else if (iadv(iq)==10) then
     301       
     302          cycle
     303       
     304        else if (iadv(iq)==10) then
    307305
    308306#ifdef _ADV_HALLO
    … …  
    310308     &                 ij_begin+2*iip1,ij_end-2*iip1,iq)
    311309#endif       
    312         else if (iadv(iq)==14) then
     310        else if (iadv(iq)==14) then
    313311#ifdef _ADV_HALLO
    314312          call vlxqs_loc(zq,pente_max,zm,mu,
    … …  
    316314#endif   
    317315        else
    318        
    319           stop 'vlspltgen_p : schema non parallelise'
     316       
     317          stop 'vlspltgen_p : schema non parallelise'
    320318     
    321319        endif
    … …  
    358356
    359357        if(iadv(iq) == 0) then
    360        
    361           cycle
    362        
    363         else if (iadv(iq)==10) then
     358       
     359          cycle
     360       
     361        else if (iadv(iq)==10) then
    364362       
    365363          call vly_loc(zq,pente_max,zm,mv,iq)
    366364 
    367         else if (iadv(iq)==14) then
     365        else if (iadv(iq)==14) then
    368366     
    369367          call vlyqs_loc(zq,pente_max,zm,mv,
    … …  
    371369 
    372370        else
    373        
    374           stop 'vlspltgen_p : schema non parallelise'
     371       
     372          stop 'vlspltgen_p : schema non parallelise'
    375373     
    376374        endif
    … …  
    389387#endif
    390388        if(iadv(iq) == 0) then
    391          
    392           cycle
    393        
    394         else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
     389         
     390          cycle
     391       
     392        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
    395393
    396394c$OMP BARRIER       
    … …  
    420418c$OMP MASTER
    421419          call VTe(VTHallo)
    422 c$OMP END MASTER       
     420c$OMP END MASTER       
    423421c$OMP BARRIER
    424422        else
    425        
    426           stop 'vlspltgen_p : schema non parallelise'
     423       
     424          stop 'vlspltgen_p : schema non parallelise'
    427425     
    428426        endif
    … …  
    439437c$OMP MASTER
    440438      call VTe(VTHallo)
    441 c$OMP END MASTER       
     439c$OMP END MASTER       
    442440
    443441
    … …  
    451449
    452450        if(iadv(iq) == 0) then
    453          
    454           cycle
    455        
    456         else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
     451         
     452          cycle
     453       
     454        else if (iadv(iq)==10 .or. iadv(iq)==14 ) then
    457455c$OMP BARRIER       
    458456
    … …  
    464462c$OMP BARRIER       
    465463        else
    466        
    467           stop 'vlspltgen_p : schema non parallelise'
     464       
     465          stop 'vlspltgen_p : schema non parallelise'
    468466     
    469467        endif
    … …  
    501499#endif
    502500        if(iadv(iq) == 0) then
    503        
    504           cycle
    505        
    506         else if (iadv(iq)==10) then
     501       
     502          cycle
     503       
     504        else if (iadv(iq)==10) then
    507505       
    508506          call vly_loc(zq,pente_max,zm,mv,iq)
    509507 
    510         else if (iadv(iq)==14) then
     508        else if (iadv(iq)==14) then
    511509     
    512510          call vlyqs_loc(zq,pente_max,zm,mv,
    … …  
    514512 
    515513        else
    516        
    517           stop 'vlspltgen_p : schema non parallelise'
     514       
     515          stop 'vlspltgen_p : schema non parallelise'
    518516     
    519517        endif
    … …  
    532530#endif
    533531        if(iadv(iq) == 0) then
    534          
    535           cycle
    536        
    537         else if (iadv(iq)==10) then
     532         
     533          cycle
     534       
     535        else if (iadv(iq)==10) then
    538536       
    539537          call vlx_loc(zq,pente_max,zm,mu,
    540538     &               ij_begin,ij_end,iq)
    541539 
    542         else if (iadv(iq)==14) then
     540        else if (iadv(iq)==14) then
    543541     
    544542          call vlxqs_loc(zq,pente_max,zm,mu,
    … …  
    546544 
    547545        else
    548        
     546       
    549547          stop 'vlspltgen_p : schema non parallelise'
    550548     
    … …  
    574572           DO ij=ijb,ije
    575573c             print *,'zq-->',ij,l,iq,zq(ij,l,iq)
    576 c            print *,'q-->',ij,l,iq,q(ij,l,iq)
    577              q(ij,l,iq)=zq(ij,l,iq)
     574c             print *,'q-->',ij,l,iq,q(ij,l,iq)
     575             q(ij,l,iq)=zq(ij,l,iq)
    578576           ENDDO
    579577        ENDDO

  • LMDZ5/branches/testing/libf/dyn3dmem/vlspltqs_loc.F

    r2298 r2641  
    1212      IMPLICIT NONE
    1313c
    14 #include "dimensions.h"
    15 #include "paramet.h"
    16 #include "logic.h"
    17 #include "comvert.h"
    18 #include "comconst.h"
     14      include "dimensions.h"
     15      include "paramet.h"
    1916c
    2017c
    … …  
    174171c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
    175172        DO l=1,llm
    176           iadvplus(ip1jm+1:ip1jmp1,l)=0
     173          iadvplus(ip1jm+1:ip1jmp1,l)=0
    177174        ENDDO
    178175c$OMP END DO NOWAIT
    179176      endif
    180        
     177             
    181178c   calcul des flux a gauche et a droite
    182179
    … …  
    414411c    ********************************************************************
    415412c     q,masse_adv_v,w sont des arguments d'entree  pour le s-pg ....
    416 c     qsat             est   un argument de sortie pour le s-pg ....
     413c     qsat                est   un argument de sortie pour le s-pg ....
    417414c
    418415c
    … …  
    420417      USE parallel_lmdz
    421418      USE infotrac, ONLY : nqtot,nqfils,nqdesc,iqfils ! CRisi 
     419      USE comconst_mod, ONLY: pi
    422420      IMPLICIT NONE
    423421c
    424 #include "dimensions.h"
    425 #include "paramet.h"
    426 #include "logic.h"
    427 #include "comvert.h"
    428 #include "comconst.h"
    429 #include "comgeom.h"
     422      include "dimensions.h"
     423      include "paramet.h"
     424      include "comgeom.h"
    430425c
    431426c
    … …  
    582577         dyq(ij,l)=fn*dyq(ij,l)
    583578        ENDDO
    584          
     579         
    585580      ENDIF
    586581     
    … …  
    603598        ENDDO
    604599       
    605 c   calcul des pentes limites aux poles 
     600c   calcul des pentes limites aux poles       
    606601        fs=1.
    607602        DO ij=1,iim
    … …  
    614609         dyq(ip1jm+ij,l)=fs*dyq(ip1jm+ij,l)
    615610        ENDDO
    616        
     611       
    617612      ENDIF
    618613
    … …  
    779774              masse(ij,l,iq)=newmasse
    780775           ENDDO
    781          
    782          ENDIF
    783776         
    784          IF (pole_sud) THEN
    785          
    786            convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
     777         ENDIF
     778         
     779         IF (pole_sud) THEN
     780         
     781           convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
    787782           convmps = -SSUM(iim,masse_adv_v(ip1jm-iim,l),1)/apols
    788783           DO ij = ip1jm+1,ip1jmp1
    … …  
    792787              masse(ij,l,iq)=newmasse
    793788           ENDDO
    794        
    795         ENDIF
     789       
     790        ENDIF
    796791c.-. fin ancienne version
    797792

  • LMDZ5/branches/testing/libf/dyn3dmem/writedynav_loc.F

    r2488 r2641  
    1313      USE infotrac, ONLY : nqtot, ttext
    1414      use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid
     15      USE comconst_mod, ONLY: cpp
     16      USE temps_mod, ONLY: itau_dyn
     17     
    1518      implicit none
    1619
    … …  
    4144C
    4245C   Declarations
    43 #include "dimensions.h"
    44 #include "paramet.h"
    45 #include "comconst.h"
    46 #include "comvert.h"
    47 #include "comgeom.h"
    48 #include "temps.h"
    49 #include "ener.h"
    50 #include "logic.h"
    51 #include "description.h"
    52 #include "serre.h"
    53 #include "iniprint.h"
     46      include "dimensions.h"
     47      include "paramet.h"
     48      include "comgeom.h"
     49      include "description.h"
     50      include "iniprint.h"
    5451
    5552C

  • LMDZ5/branches/testing/libf/dyn3dmem/writehist_loc.F

    r2488 r2641  
    1313      USE infotrac, ONLY : nqtot, ttext
    1414      use com_io_dyn_mod, only : histid,histvid,histuid
     15      USE comconst_mod, ONLY: cpp
     16      USE temps_mod, ONLY: itau_dyn
     17     
    1518      implicit none
    1619
    … …  
    4144C
    4245C   Declarations
    43 #include "dimensions.h"
    44 #include "paramet.h"
    45 #include "comconst.h"
    46 #include "comvert.h"
    47 #include "comgeom.h"
    48 #include "temps.h"
    49 #include "ener.h"
    50 #include "logic.h"
    51 #include "description.h"
    52 #include "serre.h"
    53 #include "iniprint.h"
     46      include "dimensions.h"
     47      include "paramet.h"
     48      include "comgeom.h"
     49      include "description.h"
     50      include "iniprint.h"
    5451
    5552C
Note: See TracChangeset for help on using the changeset viewer.