Changeset 2603


Ignore:
Timestamp:
Jul 25, 2016, 11:31:56 AM (8 years ago)
Author:
Ehouarn Millour
Message:

Cleanup in the dynamics: turn logic.h into module logic_mod.F90
EM

Location:
LMDZ5/trunk/libf
Files:
1 added
1 deleted
91 edited
3 moved

Legend:

Unmodified
Added
Removed

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

    r2600 r2603  
    55
    66      USE comconst_mod, ONLY: daysec
     7      USE logic_mod, ONLY: conser
    78     
    89      IMPLICIT NONE
    … …  
    2930      include "paramet.h"
    3031      include "comgeom.h"
    31       include "logic.h"
    3232      include "ener.h"
    3333

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

    r2601 r2603  
    1919  include "comdissip.h"
    2020  include "comgeom2.h"
    21   include "logic.h"
    2221  include "ener.h"
    2322  include "description.h"

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

    r2601 r2603  
    1616                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    1717                          ngroup
     18  USE logic_mod, ONLY: fxyhypb, iflag_phys, ok_etat0, ok_gradsfile, &
     19                       ok_guide, ok_limit, ok_strato, purmats, read_start, &
     20                       ysinus
    1821  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    1922                       alphax,alphay,taux,tauy
    … …  
    3740  include "dimensions.h"
    3841  include "paramet.h"
    39   include "logic.h"
    4042  include "comdissnew.h"
    4143  include "iniprint.h"

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

    r1907 r2603  
    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( ip1jmp1,llm ),pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm)

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

    r2601 r2603  
    1313  USE comvert_mod, ONLY: pa,preff
    1414  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
     15  USE logic_mod, ONLY: fxyhypb, ysinus
    1516  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
    1617  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
    … …  
    2223  include "ener.h"
    2324  include "description.h"
    24   include "logic.h"
    2525  include "iniprint.h"
    2626!===============================================================================

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

    r2601 r2603  
    1414                              nivsig,nivsigs
    1515  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     16  USE logic_mod, ONLY: fxyhypb, ysinus
    1617  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    1718                              taux,tauy
    … …  
    2324  include "comgeom2.h"
    2425  include "ener.h"
    25   include "logic.h"
    2626  include "description.h"
    2727  include "iniprint.h"

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

    r2601 r2603  
    2626                     itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end
    2727  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
     28  USE logic_mod, ONLY: ecripar, iflag_phys, read_start
    2829
    2930!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    … …  
    7273  include "comdissnew.h"
    7374  include "comgeom.h"
    74   include "logic.h"
    7575  include "ener.h"
    7676  include "description.h"

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

    r2601 r2603  
    1717  use exner_milieu_m, only: exner_milieu
    1818  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
     19  USE logic_mod, ONLY: iflag_phys, read_start
    1920  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2021  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
    … …  
    3536  include "ener.h"
    3637  include "iniprint.h"
    37   include "logic.h"
    3838
    3939  !   Arguments:

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

    r2601 r2603  
    99      use control_mod, only : planet_type
    1010      use comconst_mod, only: pi
     11      USE logic_mod, ONLY: leapf
    1112      use comvert_mod, only: ap, bp
    1213      USE temps_mod, ONLY: dt
    … …  
    3334      include "paramet.h"
    3435      include "comgeom.h"
    35       include "logic.h"
    3636      include "iniprint.h"
    3737

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

    r2601 r2603  
    2222      USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs
    2323      USE comconst_mod, ONLY: cpp, dtphys, dtvr, pi, ihf
     24      USE logic_mod, ONLY: iflag_phys,ok_guide,forward,leapf,apphys,
     25     &                     statcl,conser,apdiss,purmats,ok_strato
    2426      USE temps_mod, ONLY: jD_ref,jH_ref,itaufin,day_ini,day_ref,
    2527     &                        start_time,dt
    … …  
    6264      include "comdissnew.h"
    6365      include "comgeom.h"
    64       include "logic.h"
    6566      include "ener.h"
    6667      include "description.h"

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

    r2600 r2603  
    22! $Id$
    33!
    4 !
    5 ! NB: keep items of different kinds in seperate common blocs to avoid
    6 !     "misaligned commons" issues
    7 !-----------------------------------------------------------------------
    8 ! INCLUDE 'logic.h'
     4MODULE logic_mod
    95
    10       COMMON/logicl/ purmats,forward,leapf,apphys,                      &
    11      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
    12      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
    13      &  ,ok_limit,ok_etat0,hybrid
     6IMPLICIT NONE
    147
    15       COMMON/logici/ iflag_phys,iflag_trac
    16      
    17       LOGICAL purmats,forward,leapf,apphys,statcl,conser,               &
    18      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
    19      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
    20      &  ,ok_limit,ok_etat0
    21      
    22       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
    23                      ! (only used if disvert_type==2)
     8  LOGICAL purmats ! true if time stepping is purely Matsuno scheme
     9                  ! false implies Matsuno-Leapfrog time stepping scheme
     10  LOGICAL forward ! true if during forward phase of Matsuno step
     11  LOGICAL leapf ! true if during a leapfrog time stepping step
     12  LOGICAL apphys ! true if during a time step when physics will be called
     13  LOGICAL statcl
     14  LOGICAL conser
     15  LOGICAL apdiss ! true if during a time step when dissipation will be called
     16  LOGICAL apdelq
     17  LOGICAL saison
     18  LOGICAL ecripar
     19  LOGICAL fxyhypb ! true if using hyperbolic function discretization
     20                  ! for latitudinal grid
     21  LOGICAL ysinus ! true if using sine function discretiation
     22                 ! for latitudinal grid
     23  LOGICAL read_start ! true if reading a start.nc file to initialize fields
     24  LOGICAL ok_guide ! true if nudging
     25  LOGICAL ok_strato
     26  LOGICAL ok_gradsfile
     27  LOGICAL ok_limit
     28  LOGICAL ok_etat0
     29  LOGICAL hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
     30                 ! (only used if disvert_type==2)
     31  INTEGER iflag_phys ! type of physics to call: 0 none, 1: phy*** package,
     32                     ! 2: Held & Suarez, 101-200: aquaplanets & terraplanets
     33  INTEGER iflag_trac
    2434
    25       integer iflag_phys,iflag_trac
    26 !-----------------------------------------------------------------------
     35END MODULE logic_mod

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

    r2600 r2603  
    2323      include "dimensions.h"
    2424      include "paramet.h"
    25       include "logic.h"
    2625
    2726c
    … …  
    155154      include "dimensions.h"
    156155      include "paramet.h"
    157       include "logic.h"
    158156      include "iniprint.h"
    159157c
    … …  
    529527      include "dimensions.h"
    530528      include "paramet.h"
    531       include "logic.h"
    532529      include "comgeom.h"
    533530c
    … …  
    890887      include "dimensions.h"
    891888      include "paramet.h"
    892       include "logic.h"
    893889c
    894890c

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

    r2600 r2603  
    3030      include "dimensions.h"
    3131      include "paramet.h"
    32       include "logic.h"
    3332
    3433c
    … …  
    195194      include "dimensions.h"
    196195      include "paramet.h"
    197       include "logic.h"
    198196c
    199197c
    … …  
    565563      include "dimensions.h"
    566564      include "paramet.h"
    567       include "logic.h"
    568565      include "comgeom.h"
    569566c

  • LMDZ5/trunk/libf/dyn3d_common/adaptdt.F

    r2601 r2603  
    1212      include "comdissip.h"
    1313      include "comgeom2.h"
    14       include "logic.h"
    1514      include "ener.h"
    1615      include "description.h"

  • LMDZ5/trunk/libf/dyn3d_common/advn.F

    r2600 r2603  
    1919      include "dimensions.h"
    2020      include "paramet.h"
    21       include "logic.h"
    2221      include "comgeom.h"
    2322      include "iniprint.h"
    … …  
    484483      include "dimensions.h"
    485484      include "paramet.h"
    486       include "logic.h"
    487485      include "iniprint.h"
    488486c

  • LMDZ5/trunk/libf/dyn3d_common/bernoui.F

    r1945 r2603  
    2525c   -------------
    2626c
    27 #include "dimensions.h"
    28 #include "paramet.h"
    29 #include "logic.h"
     27      include "dimensions.h"
     28      include "paramet.h"
    3029c
    3130c   Arguments:

  • LMDZ5/trunk/libf/dyn3d_common/convmas.F90

    r2336 r2603  
    99  include "paramet.h"
    1010  include "comgeom.h"
    11   include "logic.h"
    1211!===============================================================================
    1312! Arguments:

  • LMDZ5/trunk/libf/dyn3d_common/disvert.F90

    r2600 r2603  
    1212  USE comvert_mod, ONLY: ap, bp, nivsigs, nivsig, dpres, presnivs, &
    1313                         pa, preff, scaleheight
     14  USE logic_mod, ONLY: ok_strato
    1415
    1516  IMPLICIT NONE
    … …  
    1819  include "paramet.h"
    1920  include "iniprint.h"
    20   include "logic.h"
    2121
    2222!-------------------------------------------------------------------------------

  • LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F

    r2600 r2603  
    1515     &                       nivsig,nivsigs,pa,preff,scaleheight
    1616      USE comconst_mod, ONLY: kappa
     17      USE logic_mod, ONLY: hybrid
    1718
    1819      IMPLICIT NONE
    … …  
    2021      include "dimensions.h"
    2122      include "paramet.h"
    22       include "logic.h"
    2323      include "iniprint.h"
    2424c

  • LMDZ5/trunk/libf/dyn3d_common/divgrad.F

    r1945 r2603  
    2020c   -------------
    2121c
    22 #include "dimensions.h"
    23 #include "paramet.h"
    24 #include "comgeom.h"
    25 #include "comdissipn.h"
    26 #include "logic.h"
     22      include "dimensions.h"
     23      include "paramet.h"
     24      include "comgeom.h"
     25      include "comdissipn.h"
    2726c
    2827      INTEGER klevel

  • LMDZ5/trunk/libf/dyn3d_common/gradiv.F

    r1945 r2603  
    1919      IMPLICIT NONE
    2020c
    21 #include "dimensions.h"
    22 #include "paramet.h"
    23 #include "comdissipn.h"
    24 #include "logic.h"
     21      include "dimensions.h"
     22      include "paramet.h"
     23      include "comdissipn.h"
    2524
    2625      INTEGER klevel

  • LMDZ5/trunk/libf/dyn3d_common/inidissip.F90

    r2600 r2603  
    2020  include "paramet.h"
    2121  include "comdissipn.h"
    22   include "logic.h"
    2322  include "iniprint.h"
    2423

  • LMDZ5/trunk/libf/dyn3d_common/inigeom.F

    r2598 r2603  
    1919      use fyhyp_m, only: fyhyp
    2020      USE comconst_mod, ONLY: pi, g, omeg, rad
     21      USE logic_mod, ONLY: fxyhypb, ysinus
    2122      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
    2223     &          alphax,alphay,taux,tauy,transx,transy,pxo,pyo
    … …  
    2627      include "paramet.h"
    2728      include "comgeom2.h"
    28       include "logic.h"
    2929      include "comdissnew.h"
    3030

  • LMDZ5/trunk/libf/dyn3d_common/initdynav.F90

    r2601 r2603  
    4040  include "comgeom.h"
    4141  include "ener.h"
    42   include "logic.h"
    4342  include "description.h"
    4443  include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F

    r2601 r2603  
    4646      include "comgeom.h"
    4747      include "ener.h"
    48       include "logic.h"
    4948      include "description.h"
    5049      include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3d_common/inithist.F

    r2601 r2603  
    4545      include "comgeom.h"
    4646      include "ener.h"
    47       include "logic.h"
    4847      include "description.h"
    4948      include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3d_common/interpre.F

    r2601 r2603  
    1515      include "comdissip.h"
    1616      include "comgeom2.h"
    17       include "logic.h"
    1817      include "ener.h"
    1918      include "description.h"

  • LMDZ5/trunk/libf/dyn3d_common/limx.F

    r2600 r2603  
    1717      include "dimensions.h"
    1818      include "paramet.h"
    19       include "logic.h"
    2019      include "comgeom.h"
    2120c

  • LMDZ5/trunk/libf/dyn3d_common/limy.F

    r2600 r2603  
    1919      include "dimensions.h"
    2020      include "paramet.h"
    21       include "logic.h"
    2221      include "comgeom.h"
    2322c

  • LMDZ5/trunk/libf/dyn3d_common/limz.F

    r2600 r2603  
    1717      include "dimensions.h"
    1818      include "paramet.h"
    19       include "logic.h"
    2019      include "comgeom.h"
    2120c

  • LMDZ5/trunk/libf/dyn3d_common/nxgrarot.F

    r1945 r2603  
    1919c
    2020c
    21 #include "dimensions.h"
    22 #include "paramet.h"
    23 #include "comdissipn.h"
    24 #include "logic.h"
     21      include "dimensions.h"
     22      include "paramet.h"
     23      include "comdissipn.h"
    2524c
    2625      INTEGER klevel

  • LMDZ5/trunk/libf/dyn3d_common/sortvarc.F

    r2601 r2603  
    88      USE control_mod, ONLY: resetvarc
    99      USE comconst_mod, ONLY: dtvr, daysec, g, rad, omeg
     10      USE logic_mod, ONLY: read_start
     11     
    1012      IMPLICIT NONE
    1113
    … …  
    3032      INCLUDE "comgeom.h"
    3133      INCLUDE "ener.h"
    32       INCLUDE "logic.h"
    3334      INCLUDE "iniprint.h"
    3435

  • LMDZ5/trunk/libf/dyn3d_common/tourpot.F90

    r2336 r2603  
    99  include "paramet.h"
    1010  include "comgeom.h"
    11   include "logic.h"
    1211!===============================================================================
    1312! Arguments:

  • LMDZ5/trunk/libf/dyn3d_common/traceurpole.F

    r2601 r2603  
    1010      include "comdissip.h"
    1111      include "comgeom2.h"
    12       include "logic.h"
    1312      include "ener.h"
    1413      include "description.h"

  • LMDZ5/trunk/libf/dyn3d_common/writedynav.F90

    r2601 r2603  
    3535  include "comgeom.h"
    3636  include "ener.h"
    37   include "logic.h"
    3837  include "description.h"
    3938  include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3d_common/writehist.F

    r2601 r2603  
    3939      include "comgeom.h"
    4040      include "ener.h"
    41       include "logic.h"
    4241      include "description.h"
    4342      include "iniprint.h"

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

    r2600 r2603  
    88      USE advect_new_mod
    99      USE comconst_mod, ONLY: daysec
     10      USE logic_mod, ONLY: conser
     11     
    1012      IMPLICIT NONE
    1113c=======================================================================
    … …  
    3133      include "paramet.h"
    3234      include "comgeom.h"
    33       include "logic.h"
    3435      include "ener.h"
    3536

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

    r2601 r2603  
    3434      include "comdissip.h"
    3535      include "comgeom2.h"
    36       include "logic.h"
    3736      include "ener.h"
    3837      include "description.h"

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

    r1907 r2603  
    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/trunk/libf/dyn3dmem/call_calfis_mod.F90

    r2601 r2603  
    8383  USE write_field
    8484  USE comconst_mod, ONLY: dtphys
     85  USE logic_mod, ONLY: leapf, forward, ok_strato
    8586  USE comvert_mod, ONLY: ap, bp, pressure_exner
    8687  USE temps_mod, ONLY: day_ini, day_ref, jd_ref, jh_ref, start_time
    8788 
    8889  IMPLICIT NONE
    89     INCLUDE "logic.h"
    9090    INCLUDE "iniprint.h"
    9191

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

    r2601 r2603  
    2020                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    2121                          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
    2225  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    2326                       alphax,alphay,taux,tauy
    … …  
    4144  include "dimensions.h"
    4245  include "paramet.h"
    43   include "logic.h"
    4446  include "comdissnew.h"
    4547  include "iniprint.h"

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

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

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

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

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

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

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

    r1907 r2603  
    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/trunk/libf/dyn3dmem/dynetat0_loc.f90

    r2601 r2603  
    1515  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
    1616                          omeg, rad
     17  USE logic_mod, ONLY: fxyhypb, ysinus
    1718  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
    1819  USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, &
    … …  
    2526  include "ener.h"
    2627  include "description.h"
    27   include "logic.h"
    2828  include "iniprint.h"
    2929!===============================================================================

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

    r2601 r2603  
    1616                         nivsig,nivsigs
    1717  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     18  USE logic_mod, ONLY: fxyhypb, ysinus
    1819  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    1920                       taux,tauy
    … …  
    2526  include "comgeom.h"
    2627  include "ener.h"
    27   include "logic.h"
    2828  include "description.h"
    2929  include "iniprint.h"

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

    r2601 r2603  
    2222#endif
    2323  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
    2425  USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
    2526                       itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end, &
    … …  
    6162  include "comdissnew.h"
    6263  include "comgeom.h"
    63   include "logic.h"
    6464  include "ener.h"
    6565  include "description.h"
    … …  
    453453
    454454  !!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
    455   !$OMP PARALLEL DEFAULT(SHARED) COPYIN(/logici/,/logicl/) &
     455  !$OMP PARALLEL DEFAULT(SHARED) &
    456456  !     Copy all threadprivate variables in temps_mod
    457457  !$OMP COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end) &
    458   !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend)
     458  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend) &
     459  !     Copy all threadprivate variables from logic_mod
     460  !$OMP COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq) &
     461  !$OMP COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide) &
     462  !$OMP COPYIN(ok_strato,ok_gradsfile,ok_limit,ok_etat0) &
     463  !$OMP COPYIN(iflag_phys,iflag_trac)
    459464  CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,time_0)
    460465  !$OMP END PARALLEL

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

    r2601 r2603  
    1919  USE Write_Field
    2020  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
     21  USE logic_mod, ONLY: iflag_phys, read_start
    2122  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2223  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
    … …  
    3738  include "ener.h"
    3839  include "iniprint.h"
    39   include "logic.h"
    4040
    4141  !   Arguments:

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

    r2601 r2603  
    4949      include "comgeom.h"
    5050      include "ener.h"
    51       include "logic.h"
    5251      include "description.h"
    5352      include "iniprint.h"

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

    r2601 r2603  
    5050      include "comgeom.h"
    5151      include "ener.h"
    52       include "logic.h"
    5352      include "description.h"
    5453      include "iniprint.h"

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

    r2601 r2603  
    4848      include "comgeom.h"
    4949      include "ener.h"
    50       include "logic.h"
    5150      include "description.h"
    5251      include "iniprint.h"

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

    r2601 r2603  
    1313      USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
    1414      USE comconst_mod, ONLY: pi
     15      USE logic_mod, ONLY: leapf
    1516      USE comvert_mod, ONLY: ap, bp
    1617      USE temps_mod, ONLY: dt
    … …  
    3738      include "paramet.h"
    3839      include "comgeom.h"
    39       include "logic.h"
    4040      include "iniprint.h"
    4141

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

    r2601 r2603  
    3434       USE comconst_mod, ONLY: cpp, dtvr, ihf
    3535       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
    3638       USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
    3739     &                        day_ref,start_time,dt
    … …  
    7476      include "comdissnew.h"
    7577      include "comgeom.h"
    76       include "logic.h"
    7778      include "ener.h"
    7879      include "description.h"

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

    r2600 r2603  
    22! $Id: $
    33!
    4 !
    5 ! NB: keep items of different kinds in seperate common blocs to avoid
    6 !     "misaligned commons" issues
    7 !-----------------------------------------------------------------------
    8 ! INCLUDE 'logic.h'
     4MODULE logic_mod
    95
    10       COMMON/logicl/ purmats,forward,leapf,apphys,                      &
    11      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
    12      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
    13      &  ,ok_limit,ok_etat0,hybrid
     6IMPLICIT NONE
    147
    15       COMMON/logici/ iflag_phys,iflag_trac
    16      
    17       LOGICAL purmats,forward,leapf,apphys,statcl,conser,               &
    18      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
    19      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
    20      &  ,ok_limit,ok_etat0
    21      
    22       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
    23                      ! (only used if disvert_type==2)
     8  LOGICAL purmats ! true if time stepping is purely Matsuno scheme
     9                  ! false implies Matsuno-Leapfrog time stepping scheme
     10  LOGICAL forward ! true if during forward phase of Matsuno step
     11  LOGICAL leapf ! true if during a leapfrog time stepping step
     12  LOGICAL apphys ! true if during a time step when physics will be called
     13  LOGICAL statcl
     14  LOGICAL conser
     15  LOGICAL apdiss ! true if during a time step when dissipation will be called
     16  LOGICAL apdelq
     17  LOGICAL saison
     18  LOGICAL ecripar
     19  LOGICAL fxyhypb ! true if using hyperbolic function discretization
     20                  ! for latitudinal grid
     21  LOGICAL ysinus ! true if using sine function discretiation
     22                 ! for latitudinal grid
     23  LOGICAL read_start ! true if reading a start.nc file to initialize fields
     24  LOGICAL ok_guide ! true if nudging
     25  LOGICAL ok_strato
     26  LOGICAL ok_gradsfile
     27  LOGICAL ok_limit
     28  LOGICAL ok_etat0
     29  LOGICAL hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
     30                 ! (only used if disvert_type==2)
     31  INTEGER iflag_phys ! type of physics to call: 0 none, 1: phy*** package,
     32                     ! 2: Held & Suarez, 101-200: aquaplanets & terraplanets
     33  INTEGER iflag_trac
    2434
    25       integer iflag_phys,iflag_trac
    26 !$OMP THREADPRIVATE(/logicl/)
    27 !$OMP THREADPRIVATE(/logici/)
    28 !-----------------------------------------------------------------------
     35!$OMP THREADPRIVATE(purmats,forward,leapf,apphys,statcl,conser, &
     36!$OMP     apdiss,apdelq,saison,ecripar,fxyhypb,ysinus, &
     37!$OMP     read_start,ok_guide,ok_strato,ok_gradsfile, &
     38!$OMP     ok_limit,ok_etat0,hybrid)
     39!$OMP THREADPRIVATE(iflag_phys,iflag_trac)
     40
     41!WARNING: when adding a threadprivate variable in this module
     42!        do not forget to add it to the copyin clause when opening an OpenMP
     43!        parallel section. e.g. in gcm before call leapfrog_loc
     44
     45END MODULE logic_mod

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

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

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

    r2600 r2603  
    1919      include "dimensions.h"
    2020      include "paramet.h"
    21       include "logic.h"
    2221c
    2322c
    … …  
    420419      include "dimensions.h"
    421420      include "paramet.h"
    422       include "logic.h"
    423421      include "comgeom.h"
    424422c
    … …  
    874872      include "dimensions.h"
    875873      include "paramet.h"
    876       include "logic.h"
    877874c
    878875c

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

    r2600 r2603  
    3737      include "dimensions.h"
    3838      include "paramet.h"
    39       include "logic.h"
    4039
    4140c

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

    r2600 r2603  
    1414      include "dimensions.h"
    1515      include "paramet.h"
    16       include "logic.h"
    1716c
    1817c
    … …  
    423422      include "dimensions.h"
    424423      include "paramet.h"
    425       include "logic.h"
    426424      include "comgeom.h"
    427425c

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

    r2601 r2603  
    4848      include "comgeom.h"
    4949      include "ener.h"
    50       include "logic.h"
    5150      include "description.h"
    5251      include "iniprint.h"

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

    r2601 r2603  
    4848      include "comgeom.h"
    4949      include "ener.h"
    50       include "logic.h"
    5150      include "description.h"
    5251      include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F

    r2600 r2603  
    77      USE write_field_p
    88      USE comconst_mod, ONLY: daysec
     9      USE logic_mod, ONLY: conser
     10     
    911      IMPLICIT NONE
    1012c=======================================================================
    … …  
    3032#include "paramet.h"
    3133#include "comgeom.h"
    32 #include "logic.h"
    3334#include "ener.h"
    3435
    … …  
    116117                 
    117118           uav(ij,l)=0.25*(ucov(ij,l)+ucov(ij-iip1,l))
    118      .               +0.25*(ucov(ij+iip1,l)+ucov(ij,l))
     119     .                     +0.25*(ucov(ij+iip1,l)+ucov(ij,l))
    119120         ENDDO
    120121         
    … …  
    249250      DO l=1,llm
    250251        DO ij=ijb,ije-1
    251           du(ij,l)=du(ij,l)+du2(ij,l)-du1(ij,l)
    252         ENDDO
     252          du(ij,l)=du(ij,l)+du2(ij,l)-du1(ij,l)
     253        ENDDO
    253254
    254255        DO   ij   = ijb+iip1-1, ije, iip1
    … …  
    265266      DO l=1,llm
    266267        DO ij=ijb,ije
    267           dv(ij,l)=dv(ij,l)+dv2(ij,l)-dv1(ij,l)
    268         ENDDO
     268          dv(ij,l)=dv(ij,l)+dv2(ij,l)-dv1(ij,l)
     269        ENDDO
    269270      ENDDO
    270271c$OMP END DO NOWAIT     
    … …  
    275276      DO l=1,llm
    276277        DO ij=ijb,ije
    277           dteta(ij,l)=dteta(ij,l)+dteta2(ij,l)-dteta1(ij,l)
    278         ENDDO
     278          dteta(ij,l)=dteta(ij,l)+dteta2(ij,l)-dteta1(ij,l)
     279        ENDDO
    279280      ENDDO
    280281c$OMP END DO NOWAIT     

  • LMDZ5/trunk/libf/dyn3dpar/advect_p.F

    r2600 r2603  
    66      USE write_field_p
    77      USE comconst_mod, ONLY: daysec
     8      USE logic_mod, ONLY: conser
     9     
    810      IMPLICIT NONE
    911c=======================================================================
    … …  
    2931#include "paramet.h"
    3032#include "comgeom.h"
    31 #include "logic.h"
    3233#include "ener.h"
    3334

  • LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90

    r2601 r2603  
    2626  include "comdissip.h"
    2727  include "comgeom2.h"
    28   include "logic.h"
    2928  include "ener.h"
    3029  include "description.h"

  • LMDZ5/trunk/libf/dyn3dpar/bernoui_p.F

    r1907 r2603  
    2525#include "dimensions.h"
    2626#include "paramet.h"
    27 #include "logic.h"
    2827c
    2928c   Arguments:

  • LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90

    r2601 r2603  
    1919                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    2020                          ngroup
     21  USE logic_mod, ONLY: fxyhypb, iflag_phys, ok_etat0, ok_gradsfile, &
     22                       ok_guide, ok_limit, ok_strato, purmats, read_start, &
     23                       ysinus
    2124  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
    2225                       alphax,alphay,taux,tauy
    … …  
    4043  include "dimensions.h"
    4144  include "paramet.h"
    42   include "logic.h"
    4345  include "comdissnew.h"
    4446  include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3dpar/convmas1_p.F

    r2600 r2603  
    3232#include "dimensions.h"
    3333#include "paramet.h"
    34 #include "logic.h"
    3534
    3635      REAL pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm )

  • LMDZ5/trunk/libf/dyn3dpar/convmas2_p.F

    r2600 r2603  
    3232#include "dimensions.h"
    3333#include "paramet.h"
    34 #include "logic.h"
    3534
    3635      REAL pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm )

  • LMDZ5/trunk/libf/dyn3dpar/convmas_p.F

    r2600 r2603  
    3232#include "dimensions.h"
    3333#include "paramet.h"
    34 #include "logic.h"
    3534
    3635      REAL pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm )

  • LMDZ5/trunk/libf/dyn3dpar/divgrad_p.F

    r1907 r2603  
    2323#include "comgeom.h"
    2424#include "comdissipn.h"
    25 #include "logic.h"
    2625c
    2726      INTEGER klevel

  • LMDZ5/trunk/libf/dyn3dpar/dteta1_p.F

    r1907 r2603  
    2222#include "dimensions.h"
    2323#include "paramet.h"
    24 #include "logic.h"
    2524
    2625      REAL teta( ip1jmp1,llm ),pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm)

  • LMDZ5/trunk/libf/dyn3dpar/dynetat0.F

    r2601 r2603  
    1212      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa,
    1313     &                        lllm, omeg, rad
    14 
     14      USE logic_mod, ONLY: fxyhypb, ysinus
    1515      USE serre_mod, ONLY: clon,clat,grossismx,grossismy
    1616      USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,
    … …  
    4040#include "netcdf.inc"
    4141#include "description.h"
    42 #include "logic.h"
    4342#include "iniprint.h"
    4443

  • LMDZ5/trunk/libf/dyn3dpar/dynredem.F

    r2601 r2603  
    1212     &                        nivsig,nivsigs
    1313      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     14      USE logic_mod, ONLY: fxyhypb, ysinus
    1415      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
    1516     &                     taux,tauy
    … …  
    2728#include "comgeom2.h"
    2829#include "ener.h"
    29 #include "logic.h"
    3030#include "netcdf.inc"
    3131#include "description.h"

  • LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F

    r2601 r2603  
    1313     &                        nivsig,nivsigs
    1414      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     15      USE logic_mod, ONLY: fxyhypb, ysinus
    1516      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
    1617     &                     taux,tauy
    … …  
    2829#include "comgeom2.h"
    2930#include "ener.h"
    30 #include "logic.h"
    3131#include "netcdf.inc"
    3232#include "description.h"

  • LMDZ5/trunk/libf/dyn3dpar/gcm.F

    r2601 r2603  
    3333#endif
    3434      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
     35      USE logic_mod ! all of it, because of copyin clause when calling leapfrog
    3536      USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref,
    3637     &                itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end,
    … …  
    7273#include "comdissnew.h"
    7374#include "comgeom.h"
    74 #include "logic.h"
    7575#include "ener.h"
    7676#include "description.h"
    … …  
    501501
    502502!c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
    503 c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/logici/,/logicl/)
     503c$OMP PARALLEL DEFAULT(SHARED)
    504504c        Copy all threadprivate variables from temps_mod
    505505c$OMP1 COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end)
    506506c$OMP1 COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend)
     507c       Copy all threadprivate variables from logic_mod
     508c$OMP1 COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq)
     509c$OMP1 COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide)
     510c$OMP1 COPYIN(ok_strato,ok_gradsfile,ok_limit,ok_etat0)
     511c$OMP1 COPYIN(iflag_phys,iflag_trac)
    507512      CALL leapfrog_p(ucov,vcov,teta,ps,masse,phis,q,time_0)
    508513c$OMP END PARALLEL

  • LMDZ5/trunk/libf/dyn3dpar/gradiv_p.F

    r1907 r2603  
    2121#include "paramet.h"
    2222#include "comdissipn.h"
    23 #include "logic.h"
    2423
    2524      INTEGER klevel

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

    r2601 r2603  
    1717  use exner_milieu_m, only: exner_milieu
    1818  USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
     19  USE logic_mod, ONLY: iflag_phys, read_start
    1920  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2021  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
    … …  
    3536  include "ener.h"
    3637  include "iniprint.h"
    37   include "logic.h"
    3838
    3939  !   Arguments:

  • LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F

    r2601 r2603  
    4848#include "comgeom.h"
    4949#include "ener.h"
    50 #include "logic.h"
    5150#include "description.h"
    5251#include "iniprint.h"

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

    r2601 r2603  
    5050#include "comgeom.h"
    5151#include "ener.h"
    52 #include "logic.h"
    5352#include "description.h"
    5453#include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3dpar/inithist_p.F

    r2601 r2603  
    5050#include "comgeom.h"
    5151#include "ener.h"
    52 #include "logic.h"
    5352#include "description.h"
    5453#include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3dpar/integrd_p.F

    r2601 r2603  
    88      USE control_mod, only : planet_type
    99      USE comconst_mod, ONLY: pi
     10      USE logic_mod, ONLY: leapf
    1011      USE comvert_mod, ONLY: ap, bp
    1112      USE temps_mod, ONLY: dt
    … …  
    3233#include "paramet.h"
    3334#include "comgeom.h"
    34 #include "logic.h"
    3535#include "iniprint.h"
    3636

  • LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

    r2601 r2603  
    3030       USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs
    3131       USE comconst_mod, ONLY: cpp, dtvr, ihf, dtphys, pi, jmp1
     32       USE logic_mod, ONLY: iflag_phys,ok_guide,forward,leapf,apphys,
     33     &                      statcl,conser,apdiss,purmats,ok_strato
    3234       USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
    3335     &                        day_ref,start_time,dt
    … …  
    7072#include "comdissnew.h"
    7173#include "comgeom.h"
    72 #include "logic.h"
    7374#include "ener.h"
    7475#include "description.h"

  • LMDZ5/trunk/libf/dyn3dpar/logic_mod.F90

    r2600 r2603  
    22! $Id$
    33!
    4 !
    5 ! NB: keep items of different kinds in seperate common blocs to avoid
    6 !     "misaligned commons" issues
    7 !-----------------------------------------------------------------------
    8 ! INCLUDE 'logic.h'
     4MODULE logic_mod
    95
    10       COMMON/logicl/ purmats,forward,leapf,apphys,                      &
    11      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
    12      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
    13      &  ,ok_limit,ok_etat0,hybrid
     6IMPLICIT NONE
    147
    15       COMMON/logici/ iflag_phys,iflag_trac
    16      
    17       LOGICAL purmats,forward,leapf,apphys,statcl,conser,               &
    18      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
    19      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
    20      &  ,ok_limit,ok_etat0
     8  LOGICAL purmats ! true if time stepping is purely Matsuno scheme
     9                  ! false implies Matsuno-Leapfrog time stepping scheme
     10  LOGICAL forward ! true if during forward phase of Matsuno step
     11  LOGICAL leapf ! true if during a leapfrog time stepping step
     12  LOGICAL apphys ! true if during a time step when physics will be called
     13  LOGICAL statcl
     14  LOGICAL conser
     15  LOGICAL apdiss ! true if during a time step when dissipation will be called
     16  LOGICAL apdelq
     17  LOGICAL saison
     18  LOGICAL ecripar
     19  LOGICAL fxyhypb ! true if using hyperbolic function discretization
     20                  ! for latitudinal grid
     21  LOGICAL ysinus ! true if using sine function discretiation
     22                 ! for latitudinal grid
     23  LOGICAL read_start ! true if reading a start.nc file to initialize fields
     24  LOGICAL ok_guide ! true if nudging
     25  LOGICAL ok_strato
     26  LOGICAL ok_gradsfile
     27  LOGICAL ok_limit
     28  LOGICAL ok_etat0
     29  LOGICAL hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
     30                 ! (only used if disvert_type==2)
     31  INTEGER iflag_phys ! type of physics to call: 0 none, 1: phy*** package,
     32                     ! 2: Held & Suarez, 101-200: aquaplanets & terraplanets
     33  INTEGER iflag_trac
    2134
    22       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
    23                      ! (only used if disvert_type==2)
     35!$OMP THREADPRIVATE(purmats,forward,leapf,apphys,statcl,conser, &
     36!$OMP     apdiss,apdelq,saison,ecripar,fxyhypb,ysinus, &
     37!$OMP     read_start,ok_guide,ok_strato,ok_gradsfile, &
     38!$OMP     ok_limit,ok_etat0,hybrid)
     39!$OMP THREADPRIVATE(iflag_phys,iflag_trac)
    2440
    25       integer iflag_phys,iflag_trac
    26 !$OMP THREADPRIVATE(/logicl/)
    27 !$OMP THREADPRIVATE(/logici/)
    28 !-----------------------------------------------------------------------
     41!WARNING: when adding a threadprivate variable in this module
     42!        do not forget to add it to the copyin clause when opening an OpenMP
     43!        parallel section. e.g. in gcm before call leapfrog_loc
     44
     45END MODULE logic_mod

  • LMDZ5/trunk/libf/dyn3dpar/nxgrarot_p.F

    r1907 r2603  
    2222#include "paramet.h"
    2323#include "comdissipn.h"
    24 #include "logic.h"
    2524c
    2625      INTEGER klevel

  • LMDZ5/trunk/libf/dyn3dpar/tourpot_p.F

    r1907 r2603  
    2323#include "paramet.h"
    2424#include "comgeom.h"
    25 #include "logic.h"
    2625
    2726      REAL  rot( ip1jm,llm )

  • LMDZ5/trunk/libf/dyn3dpar/vlsplt_p.F

    r2600 r2603  
    2525#include "dimensions.h"
    2626#include "paramet.h"
    27 #include "logic.h"
    2827
    2928c
    … …  
    206205#include "dimensions.h"
    207206#include "paramet.h"
    208 #include "logic.h"
    209207c
    210208c
    … …  
    540538#include "dimensions.h"
    541539#include "paramet.h"
    542 #include "logic.h"
    543540#include "comgeom.h"
    544541c
    … …  
    927924#include "dimensions.h"
    928925#include "paramet.h"
    929 #include "logic.h"
    930926c
    931927c

  • LMDZ5/trunk/libf/dyn3dpar/vlspltgen_p.F

    r2600 r2603  
    3333#include "dimensions.h"
    3434#include "paramet.h"
    35 #include "logic.h"
    3635
    3736c

  • LMDZ5/trunk/libf/dyn3dpar/vlspltqs_p.F

    r2600 r2603  
    3131#include "dimensions.h"
    3232#include "paramet.h"
    33 #include "logic.h"
    3433
    3534c
    … …  
    235234#include "dimensions.h"
    236235#include "paramet.h"
    237 #include "logic.h"
    238236c
    239237c
    … …  
    586584#include "dimensions.h"
    587585#include "paramet.h"
    588 #include "logic.h"
    589586#include "comgeom.h"
    590587c

  • LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F

    r2601 r2603  
    4747#include "comgeom.h"
    4848#include "ener.h"
    49 #include "logic.h"
    5049#include "description.h"
    5150#include "iniprint.h"

  • LMDZ5/trunk/libf/dyn3dpar/writehist_p.F

    r2601 r2603  
    4747#include "comgeom.h"
    4848#include "ener.h"
    49 #include "logic.h"
    5049#include "description.h"
    5150#include "iniprint.h"

  • LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90

    r2601 r2603  
    3636  USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, kappa, omeg, r, rad, &
    3737                          pi, jmp1
     38  USE logic_mod, ONLY: iflag_phys, ok_etat0, ok_limit
    3839  USE comvert_mod, ONLY: pa, preff, pressure_exner
    3940  USE temps_mod, ONLY: calend, day_ini, dt
    … …  
    4748  include "comgeom2.h"
    4849  include "iniprint.h"
    49   include "logic.h"
    5050  REAL               :: masque(iip1,jjp1)             !--- CONTINENTAL MASK
    5151  REAL               :: phis  (iip1,jjp1)             !--- GROUND GEOPOTENTIAL

  • LMDZ5/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

    r2597 r2603  
    6767                  NF90_DEF_DIM, NF90_DEF_VAR, NF90_PUT_VAR, NF90_PUT_ATT,      &
    6868                  NF90_NOERR,   NF90_NOWRITE, NF90_DOUBLE,  NF90_GLOBAL,       &
    69                   NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT
     69                  NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT
    7070  USE inter_barxy_m,      ONLY: inter_barxy
    7171  USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
    … …  
    8282!-------------------------------------------------------------------------------
    8383! Local variables:
    84   include "logic.h"
    8584  include "comgeom2.h"
    8685

  • LMDZ5/trunk/libf/filtrez/filtreg_mod.F90

    r2598 r2603  
    1515#endif
    1616  USE serre_mod, ONLY: alphax
     17  USE logic_mod, ONLY: fxyhypb, ysinus
    1718    !    ... H. Upadhyaya, O.Sharma   ...
    1819    !
    … …  
    2829    include "comgeom.h"
    2930    include "coefils.h"
    30     include "logic.h"
    3131
    3232    REAL  dlonu(iim),dlatu(jjm)

  • LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h

    r2601 r2603  
    436436      use control_mod
    437437      USE comconst_mod, ONLY: im, jm, lllm
     438      USE logic_mod, ONLY: fxyhypb, ysinus
    438439      USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn
    439440
    … …  
    446447      include "dimensions.h"
    447448!!#include "control.h"
    448       include "logic.h"
    449449      include "netcdf.inc"
    450450
    … …  
    580580      use control_mod
    581581      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     582      USE logic_mod, ONLY: fxyhypb, ysinus
    582583      USE temps_mod, ONLY: annee_ref,day_end,day_ref,itau_dyn,itaufin
    583584
    … …  
    590591      include "dimensions.h"
    591592!!#include "control.h"
    592       include "logic.h"
    593593      include "netcdf.inc"
    594594
Note: See TracChangeset for help on using the changeset viewer.