Changeset 2598 for LMDZ5/trunk


Ignore:
Timestamp:
Jul 22, 2016, 11:28:39 AM (8 years ago)
Author:
Ehouarn Millour
Message:

Cleanup in the dynamics: turn serre.h into module serre_mod.F90
EM

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

Legend:

Unmodified
Added
Removed

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

    r2597 r2598  
    4949      include "paramet.h"
    5050      include "comgeom.h"
    51       include "serre.h"
    5251c
    5352c    Arguments :

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

    r2597 r2598  
    1616                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    1717                          ngroup
     18  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     19                       alphax,alphay,taux,tauy
    1820
    1921  IMPLICIT NONE
    … …  
    3537  include "paramet.h"
    3638  include "logic.h"
    37   include "serre.h"
    3839  include "comdissnew.h"
    3940  include "temps.h"
    … …  
    4344  !   ------
    4445
    45   CHARACTER ch1*72,ch2*72,ch3*72,ch4*12
    4646  REAL clonn,clatt,grossismxx,grossismyy
    4747  REAL dzoomxx,dzoomyy, tauxx,tauyy
    4848  LOGICAL  fxyhypbb, ysinuss
    49   INTEGER i
    5049
    5150  !  -------------------------------------------------------------------

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

    r2597 r2598  
    1212  USE assert_eq_m, ONLY: assert_eq
    1313  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
     14  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
    1415  IMPLICIT NONE
    1516  include "dimensions.h"
    … …  
    2021  include "ener.h"
    2122  include "description.h"
    22   include "serre.h"
    2323  include "logic.h"
    2424  include "iniprint.h"

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

    r2597 r2598  
    1212  USE dynredem_mod, ONLY: cre_var, put_var1, put_var2, err, modname, fil
    1313  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     14  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     15                        taux,tauy
    1416  IMPLICIT NONE
    1517  include "dimensions.h"
    … …  
    2123  include "logic.h"
    2224  include "description.h"
    23   include "serre.h"
    2425  include "iniprint.h"
    2526!===============================================================================

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

    r2597 r2598  
    7575  include "ener.h"
    7676  include "description.h"
    77   include "serre.h"
    78   !include "com_io_dyn.h"
    7977  include "iniprint.h"
    8078  include "tracstoke.h"

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

    r2597 r2598  
    6363  SUBROUTINE guide_init
    6464
    65     USE control_mod
     65    USE control_mod, ONLY: day_step
     66    USE serre_mod, ONLY: grossismx
    6667
    6768    IMPLICIT NONE
    … …  
    7071    INCLUDE "paramet.h"
    7172    INCLUDE "netcdf.inc"
    72 
    73     ! For grossismx:
    74     include "serre.h"
    7573
    7674    INTEGER                :: error,ncidpl,rid,rcod
    … …  
    857855
    858856    use comconst_mod, only: pi
     857    use serre_mod, only: clon, clat, grossismx, grossismy
    859858   
    860859    implicit none
    … …  
    863862    include "paramet.h"
    864863    include "comgeom2.h"
    865     include "serre.h"
    866864
    867865! input arguments :

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

    r2597 r2598  
    3434      include "logic.h"
    3535      include "temps.h"
    36       include "serre.h"
    3736      include "iniprint.h"
    3837

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

    r2597 r2598  
    6464      include "ener.h"
    6565      include "description.h"
    66       include "serre.h"
    6766      include "iniprint.h"
    6867      include "academic.h"

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

    r2597 r2598  
    1818      INTEGER i,j
    1919
    20 #include "dimensions.h"
    21 #include "paramet.h"
    22 #include "comgeom.h"
    23 #include "serre.h"
     20      include "dimensions.h"
     21      include "paramet.h"
     22      include "comgeom.h"
    2423
    2524      real zlon,zlat

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

    r2597 r2598  
    4040    include "comgeom.h"
    4141    include "comvert.h"
    42     include "serre.h"
    4342
    4443    INTEGER  ngrid

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

    r2597 r2598  
    3737    include "comgeom.h"
    3838    include "comvert.h"
    39     include "serre.h"
    4039
    4140    INTEGER  ngrid

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

    r2228 r2598  
    2222    use nrtype, only: pi, pi_d, twopi, twopi_d, k8
    2323    use principal_cshift_m, only: principal_cshift
     24    use serre_mod, only: clon, grossismx, dzoomx, taux
    2425
    2526    include "dimensions.h"
    2627    ! for iim
    27 
    28     include "serre.h"
    29     ! for clon, grossismx, dzoomx, taux
    3028
    3129    REAL, intent(out):: xprimm025(:), rlonv(:), xprimv(:) ! (iim + 1)

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

    r2597 r2598  
    77
    88      USE comconst_mod, ONLY: pi
     9      USE serre_mod, ONLY: pxo,pyo,alphax,alphay,transx,transy
     10
    911      IMPLICIT NONE
    1012
    … …  
    1517c
    1618c
    17 #include "dimensions.h"
    18 #include "paramet.h"
    19 #include "serre.h"
     19      include "dimensions.h"
     20      include "paramet.h"
    2021
    2122       INTEGER i,j

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

    r2228 r2598  
    1818    use coefpoly_m, only: coefpoly
    1919    use nrtype, only: k8
     20    use serre_mod, only: clat, grossismy, dzoomy, tauy
    2021
    2122    include "dimensions.h"
    2223    ! for jjm
    23 
    24     include "serre.h"
    25     ! for clat, grossismy, dzoomy, tauy
    2624
    2725    REAL, intent(out):: rlatu(jjm + 1), yyprimu(jjm + 1)

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

    r2597 r2598  
    1717  INCLUDE "comvert.h"
    1818  INCLUDE "netcdf.inc"
    19   INCLUDE "serre.h"
    2019
    2120

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

    r2597 r2598  
    1919      use fyhyp_m, only: fyhyp
    2020      USE comconst_mod, ONLY: pi, g, omeg, rad
     21      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
     22     &          alphax,alphay,taux,tauy,transx,transy,pxo,pyo
    2123      IMPLICIT NONE
    2224c
    … …  
    2426      include "paramet.h"
    2527      include "comgeom2.h"
    26       include "serre.h"
    2728      include "logic.h"
    2829      include "comdissnew.h"

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

    r2597 r2598  
    4141  include "logic.h"
    4242  include "description.h"
    43   include "serre.h"
    4443  include "iniprint.h"
    4544

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

    r2597 r2598  
    4747      include "logic.h"
    4848      include "description.h"
    49       include "serre.h"
    5049      include "iniprint.h"
    5150

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

    r2597 r2598  
    4646      include "logic.h"
    4747      include "description.h"
    48       include "serre.h"
    4948      include "iniprint.h"
    5049

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

    r2228 r2598  
    1111    use coefpoly_m, only: coefpoly
    1212    use nrtype, only: pi, pi_d, twopi_d, k8
     13    use serre_mod, only: clon
    1314
    1415    include "dimensions.h"
    1516    ! for iim
    16 
    17     include "serre.h"
    18     ! for clon
    1917
    2018    REAL(K8), intent(in):: Xf(0:), xtild(0:), Xprimt(0:) ! (0:2 * nmax)

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

    r2218 r2598  
    1212
    1313    use nrtype, only: twopi
     14    use serre_mod, only: clon
    1415
    1516    include "dimensions.h"
    1617    ! for iim
    17 
    18     include "serre.h"
    19     ! for clon
    2018
    2119    integer, intent(in):: is2

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

    r2597 r2598  
    11!
    2 ! $Header$
     2! $Id$
    33!
    4 !c
    5 !c
    6 !c..include serre.h
    7 !c
    8        REAL clon,clat,transx,transy,alphax,alphay,pxo,pyo,              &
    9      &  grossismx, grossismy, dzoomx, dzoomy,taux,tauy
    10        COMMON/serre/clon,clat,transx,transy,alphax,alphay,pxo,pyo ,     &
    11      &  grossismx, grossismy, dzoomx, dzoomy,taux,tauy
     4MODULE serre_mod
     5
     6IMPLICIT NONE 
     7
     8      REAL clon,clat,transx,transy,alphax,alphay,pxo,pyo,              &
     9        grossismx, grossismy, dzoomx, dzoomy,taux,tauy
     10
     11END MODULE serre_mod

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

    r2597 r2598  
    3838  include "logic.h"
    3939  include "description.h"
    40   include "serre.h"
    4140  include "iniprint.h"
    4241

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

    r2597 r2598  
    4141      include "logic.h"
    4242      include "description.h"
    43       include "serre.h"
    4443      include "iniprint.h"
    4544

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

    r2597 r2598  
    4949      include "paramet.h"
    5050      include "comgeom.h"
    51       include "serre.h"
    5251c
    5352c    Arguments :

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

    r2597 r2598  
    2020                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    2121                          ngroup
     22  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     23                       alphax,alphay,taux,tauy
    2224
    2325  IMPLICIT NONE
    … …  
    3941  include "paramet.h"
    4042  include "logic.h"
    41   include "serre.h"
    4243  include "comdissnew.h"
    4344  include "temps.h"

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

    r2597 r2598  
    1414  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
    1515                          omeg, rad
     16  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
     17 
    1618  IMPLICIT NONE
    1719  include "dimensions.h"
    … …  
    2224  include "ener.h"
    2325  include "description.h"
    24   include "serre.h"
    2526  include "logic.h"
    2627  include "iniprint.h"

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

    r2597 r2598  
    1414  USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
    1515  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     16  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     17                       taux,tauy
     18
    1619  IMPLICIT NONE
    1720  include "dimensions.h"
    … …  
    2326  include "logic.h"
    2427  include "description.h"
    25   include "serre.h"
    2628  include "iniprint.h"
    2729!===============================================================================

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

    r2597 r2598  
    4242    include "comgeom.h"
    4343    include "comvert.h"
    44     include "serre.h"
    4544
    4645    INTEGER  ngrid

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

    r2597 r2598  
    3838    include "comgeom.h"
    3939    include "comvert.h"
    40     include "serre.h"
    4140
    4241    INTEGER  ngrid

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

    r2597 r2598  
    6262  include "ener.h"
    6363  include "description.h"
    64   include "serre.h"
    65   !include "com_io_dyn.h"
    6664  include "iniprint.h"
    6765  include "tracstoke.h"

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

    r2597 r2598  
    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
    … …  
    13731371
    13741372    use comconst_mod, only: pi
     1373    use serre_mod, only: clat, clon, grossismx, grossismy
    13751374   
    13761375    implicit none
    … …  
    13791378    include "paramet.h"
    13801379    include "comgeom2.h"
    1381     include "serre.h"
    13821380
    13831381! input arguments :

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

    r2597 r2598  
    5050      include "logic.h"
    5151      include "description.h"
    52       include "serre.h"
    5352      include "iniprint.h"
    5453

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

    r2597 r2598  
    5252      include "logic.h"
    5353      include "description.h"
    54       include "serre.h"
    5554      include "iniprint.h"
    5655

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

    r2597 r2598  
    4949      include "logic.h"
    5050      include "description.h"
    51       include "serre.h"
    5251      include "iniprint.h"
    5352

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

    r2597 r2598  
    3737      include "logic.h"
    3838      include "temps.h"
    39       include "serre.h"
    4039      include "iniprint.h"
    4140

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

    r2597 r2598  
    7575      include "ener.h"
    7676      include "description.h"
    77       include "serre.h"
    7877      include "iniprint.h"
    7978      include "academic.h"

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

    r2597 r2598  
    5050      include "logic.h"
    5151      include "description.h"
    52       include "serre.h"
    5352      include "iniprint.h"
    5453

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

    r2597 r2598  
    5050      include "logic.h"
    5151      include "description.h"
    52       include "serre.h"
    5352      include "iniprint.h"
    5453

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

    r2597 r2598  
    4949#include "paramet.h"
    5050#include "comgeom.h"
    51 #include "serre.h"
    5251c
    5352c    Arguments :

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

    r2597 r2598  
    1919                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    2020                          ngroup
     21  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
     22                       alphax,alphay,taux,tauy
    2123
    2224  IMPLICIT NONE
    … …  
    3840  include "paramet.h"
    3941  include "logic.h"
    40   include "serre.h"
    4142  include "comdissnew.h"
    4243  include "temps.h"

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

    r2597 r2598  
    1111      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa,
    1212     &                        lllm, omeg, rad
     13      USE serre_mod, ONLY: clon,clat,grossismx,grossismy
    1314
    1415      IMPLICIT NONE
    … …  
    3738#include "netcdf.inc"
    3839#include "description.h"
    39 #include "serre.h"
    4040#include "logic.h"
    4141#include "iniprint.h"

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

    r2597 r2598  
    1010      use netcdf95, only: NF95_PUT_VAR
    1111      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     12      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
     13     &                     taux,tauy
    1214 
    1315      IMPLICIT NONE
    … …  
    2628#include "netcdf.inc"
    2729#include "description.h"
    28 #include "serre.h"
    2930#include "iniprint.h"
    3031

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

    r2597 r2598  
    1111      use netcdf95, only: NF95_PUT_VAR
    1212      USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
     13      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
     14     &                     taux,tauy
    1315 
    1416      IMPLICIT NONE
    … …  
    2729#include "netcdf.inc"
    2830#include "description.h"
    29 #include "serre.h"
    3031
    3132c   Arguments:

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

    r2597 r2598  
    3939    include "comgeom.h"
    4040    include "comvert.h"
    41     include "serre.h"
    4241
    4342    INTEGER  ngrid

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

    r2597 r2598  
    3636    include "comgeom.h"
    3737    include "comvert.h"
    38     include "serre.h"
    3938
    4039    INTEGER  ngrid

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

    r2597 r2598  
    7474#include "ener.h"
    7575#include "description.h"
    76 #include "serre.h"
    7776!#include "com_io_dyn.h"
    7877#include "iniprint.h"

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

    r2597 r2598  
    6868  SUBROUTINE guide_init
    6969
    70     USE control_mod
     70    USE control_mod, ONLY: day_step
     71    USE serre_mod, ONLY: grossismx
    7172
    7273    IMPLICIT NONE
    … …  
    7576    INCLUDE "paramet.h"
    7677    INCLUDE "netcdf.inc"
    77 
    78     ! For grossismx:
    79     include "serre.h"
    8078
    8179    INTEGER                :: error,ncidpl,rid,rcod
    … …  
    11011099
    11021100    use comconst_mod, only: pi
     1101    use serre_mod, only: clat, clon, grossismx, grossismy
    11031102   
    11041103    implicit none
    … …  
    11071106    include "paramet.h"
    11081107    include "comgeom2.h"
    1109     include "serre.h"
    11101108
    11111109! input arguments :

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

    r2597 r2598  
    5050#include "logic.h"
    5151#include "description.h"
    52 #include "serre.h"
    5352#include "iniprint.h"
    5453

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

    r2597 r2598  
    5252#include "logic.h"
    5353#include "description.h"
    54 #include "serre.h"
    5554#include "iniprint.h"
    5655

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

    r2597 r2598  
    5252#include "logic.h"
    5353#include "description.h"
    54 #include "serre.h"
    5554#include "iniprint.h"
    5655

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

    r2597 r2598  
    3232#include "logic.h"
    3333#include "temps.h"
    34 #include "serre.h"
    3534#include "iniprint.h"
    3635

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

    r2597 r2598  
    7171#include "ener.h"
    7272#include "description.h"
    73 #include "serre.h"
    7473!#include "com_io_dyn.h"
    7574#include "iniprint.h"

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

    r2597 r2598  
    4949#include "logic.h"
    5050#include "description.h"
    51 #include "serre.h"
    5251#include "iniprint.h"
    5352

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

    r2597 r2598  
    4949#include "logic.h"
    5050#include "description.h"
    51 #include "serre.h"
    5251#include "iniprint.h"
    5352

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

    r2597 r2598  
    4949  include "temps.h"
    5050  include "comdissnew.h"
    51   include "serre.h"
    5251  REAL, SAVE :: deg2rad
    5352  INTEGER,            SAVE      :: iml_dyn, jml_dyn, llm_dyn, ttm_dyn, fid_dyn

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

    r1907 r2598  
    1414  USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
    1515#endif
     16  USE serre_mod, ONLY: alphax
    1617    !    ... H. Upadhyaya, O.Sharma   ...
    1718    !
    … …  
    2223    !     Correction  le 28/10/97    P. Le Van .
    2324    !  -------------------------------------------------------------------
    24 #include "dimensions.h"
    25 #include "paramet.h"
     25    include "dimensions.h"
     26    include "paramet.h"
    2627    !  -------------------------------------------------------------------
    27 #include "comgeom.h"
    28 #include "coefils.h"
    29 #include "logic.h"
    30 #include "serre.h"
     28    include "comgeom.h"
     29    include "coefils.h"
     30    include "logic.h"
    3131
    3232    REAL  dlonu(iim),dlatu(jjm)

  • LMDZ5/trunk/libf/filtrez/inifgn.F

    r1907 r2598  
    88      IMPLICIT NONE
    99c
    10 #include "dimensions.h"
    11 #include "paramet.h"
    12 #include "comgeom.h"
    13 #include "serre.h"
     10      include "dimensions.h"
     11      include "paramet.h"
     12      include "comgeom.h"
    1413
    1514c
    … …  
    2019      INTEGER i,j,k,imm1,nrot
    2120C
    22 #include "coefils.h"
     21      include "coefils.h"
    2322c
    2423      EXTERNAL SSUM, acc,eigen,jacobi
Note: See TracChangeset for help on using the changeset viewer.