Changeset 2622


Ignore:
Timestamp:
Sep 4, 2016, 8:12:02 AM (8 years ago)
Author:
Ehouarn Millour
Message:

Some code tidying: turn ener.h into ener_mod.F90
EM

Location:
LMDZ5/trunk/libf
Files:
1 deleted
42 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r2603 r2622  
    66      USE comconst_mod, ONLY: daysec
    77      USE logic_mod, ONLY: conser
     8      USE ener_mod, ONLY: gtot
    89     
    910      IMPLICIT NONE
    … …  
    3031      include "paramet.h"
    3132      include "comgeom.h"
    32       include "ener.h"
    3333
    3434c   Arguments:

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

    r2603 r2622  
    1919  include "comdissip.h"
    2020  include "comgeom2.h"
    21   include "ener.h"
    2221  include "description.h"
    2322  include "iniprint.h"

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

    r2603 r2622  
    1616  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
    1717  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
     18  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    1819
    1920  IMPLICIT NONE
    … …  
    2122  include "paramet.h"
    2223  include "comgeom2.h"
    23   include "ener.h"
    2424  include "description.h"
    2525  include "iniprint.h"

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

    r2603 r2622  
    1818                              taux,tauy
    1919  USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itaufin, start_time
     20  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2021 
    2122  IMPLICIT NONE
    … …  
    2324  include "paramet.h"
    2425  include "comgeom2.h"
    25   include "ener.h"
    2626  include "description.h"
    2727  include "iniprint.h"

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

    r2603 r2622  
    7373  include "comdissnew.h"
    7474  include "comgeom.h"
    75   include "ener.h"
    7675  include "description.h"
    7776  include "iniprint.h"

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

    r2603 r2622  
    2020  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2121  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
     22  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2223
    2324  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    3435  include "comgeom.h"
    3536  include "academic.h"
    36   include "ener.h"
    3737  include "iniprint.h"
    3838

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

    r2603 r2622  
    6464      include "comdissnew.h"
    6565      include "comgeom.h"
    66       include "ener.h"
    6766      include "description.h"
    6867      include "iniprint.h"

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

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

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

    r2619 r2622  
    22! $Id$
    33!
    4 !  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
    5 !                 veillez à n'utiliser que des ! pour les commentaires
    6 !                 et à bien positionner les & des lignes de continuation
    7 !                 (les placer en colonne 6 et en colonne 73)
    8 !
    9 ! INCLUDE 'ener.h'
     4MODULE ener_mod
    105
    11       COMMON/ener/ang0,etot0,ptot0,ztot0,stot0,                         &
    12      &            ang,etot,ptot,ztot,stot,rmsdpdt ,                     &
    13      &            rmsv,gtot(llmm1)
     6IMPLICIT NONE 
    147
    15       REAL ang0,etot0,ptot0,ztot0,stot0,                                &
    16      &     ang,etot,ptot,ztot,stot,rmsdpdt,rmsv,gtot
     8include "dimensions.h"
     9include "paramet.h"
    1710
    18 !-----------------------------------------------------------------------
     11      REAL ang0,etot0,ptot0,ztot0,stot0,                        &
     12                ang,etot,ptot,ztot,stot,rmsdpdt,rmsv,gtot(llmm1)
     13
     14
     15END MODULE ener_mod

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

    r2603 r2622  
    3939  include "paramet.h"
    4040  include "comgeom.h"
    41   include "ener.h"
    4241  include "description.h"
    4342  include "iniprint.h"

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

    r2603 r2622  
    4545      include "paramet.h"
    4646      include "comgeom.h"
    47       include "ener.h"
    4847      include "description.h"
    4948      include "iniprint.h"

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

    r2603 r2622  
    4444      include "paramet.h"
    4545      include "comgeom.h"
    46       include "ener.h"
    4746      include "description.h"
    4847      include "iniprint.h"

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

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

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

    r2603 r2622  
    99      USE comconst_mod, ONLY: dtvr, daysec, g, rad, omeg
    1010      USE logic_mod, ONLY: read_start
    11      
     11      USE ener_mod, ONLY: etot,ptot,ztot,stot,ang,
     12     &                    etot0,ptot0,ztot0,stot0,ang0,
     13     &                    rmsdpdt,rmsv
    1214      IMPLICIT NONE
    1315
    … …  
    3133      INCLUDE "paramet.h"
    3234      INCLUDE "comgeom.h"
    33       INCLUDE "ener.h"
    3435      INCLUDE "iniprint.h"
    3536

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

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

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

    r2603 r2622  
    3434  include "paramet.h"
    3535  include "comgeom.h"
    36   include "ener.h"
    3736  include "description.h"
    3837  include "iniprint.h"

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

    r2603 r2622  
    3838      include "paramet.h"
    3939      include "comgeom.h"
    40       include "ener.h"
    4140      include "description.h"
    4241      include "iniprint.h"

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

    r2616 r2622  
    3333      include "paramet.h"
    3434      include "comgeom.h"
    35       include "ener.h"
    3635
    3736c   Arguments:

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

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

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

    r2615 r2622  
    1919  USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, &
    2020                       start_time,day_ini,hour_ini
     21  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2122 
    2223  IMPLICIT NONE
    … …  
    2425  include "paramet.h"
    2526  include "comgeom.h"
    26   include "ener.h"
    2727  include "description.h"
    2828  include "iniprint.h"

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

    r2603 r2622  
    2020                       taux,tauy
    2121  USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itaufin, start_time
     22  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2223
    2324  IMPLICIT NONE
    … …  
    2526  include "paramet.h"
    2627  include "comgeom.h"
    27   include "ener.h"
    2828  include "description.h"
    2929  include "iniprint.h"

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

    r2603 r2622  
    6262  include "comdissnew.h"
    6363  include "comgeom.h"
    64   include "ener.h"
    6564  include "description.h"
    6665  include "iniprint.h"

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

    r2603 r2622  
    2222  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2323  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
     24  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     25
    2426
    2527  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    3638  include "comgeom.h"
    3739  include "academic.h"
    38   include "ener.h"
    3940  include "iniprint.h"
    4041

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

    r2603 r2622  
    4848      include "paramet.h"
    4949      include "comgeom.h"
    50       include "ener.h"
    5150      include "description.h"
    5251      include "iniprint.h"

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

    r2603 r2622  
    4949      include "paramet.h"
    5050      include "comgeom.h"
    51       include "ener.h"
    5251      include "description.h"
    5352      include "iniprint.h"

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

    r2603 r2622  
    4747      include "paramet.h"
    4848      include "comgeom.h"
    49       include "ener.h"
    5049      include "description.h"
    5150      include "iniprint.h"

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

    r2616 r2622  
    7676      include "comdissnew.h"
    7777      include "comgeom.h"
    78       include "ener.h"
    7978      include "description.h"
    8079      include "iniprint.h"

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

    r2603 r2622  
    4747      include "paramet.h"
    4848      include "comgeom.h"
    49       include "ener.h"
    5049      include "description.h"
    5150      include "iniprint.h"

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

    r2603 r2622  
    4747      include "paramet.h"
    4848      include "comgeom.h"
    49       include "ener.h"
    5049      include "description.h"
    5150      include "iniprint.h"

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

    r2603 r2622  
    3232#include "paramet.h"
    3333#include "comgeom.h"
    34 #include "ener.h"
    3534
    3635c   Arguments:

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

    r2603 r2622  
    3131#include "paramet.h"
    3232#include "comgeom.h"
    33 #include "ener.h"
    3433
    3534c   Arguments:

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

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

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

    r2603 r2622  
    1616      USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,
    1717     &                     start_time,day_ini,hour_ini
     18      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    1819
    1920      IMPLICIT NONE
    … …  
    3738#include "paramet.h"
    3839#include "comgeom2.h"
    39 #include "ener.h"
    4040#include "netcdf.inc"
    4141#include "description.h"

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

    r2603 r2622  
    1717      USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,itaufin,
    1818     &                        start_time,hour_ini
     19      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    1920 
    2021      IMPLICIT NONE
    … …  
    2728#include "paramet.h"
    2829#include "comgeom2.h"
    29 #include "ener.h"
    3030#include "netcdf.inc"
    3131#include "description.h"

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

    r2603 r2622  
    1818      USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,itaufin,
    1919     &                        start_time,hour_ini
     20      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2021 
    2122      IMPLICIT NONE
    … …  
    2829#include "paramet.h"
    2930#include "comgeom2.h"
    30 #include "ener.h"
    3131#include "netcdf.inc"
    3232#include "description.h"

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

    r2603 r2622  
    7373#include "comdissnew.h"
    7474#include "comgeom.h"
    75 #include "ener.h"
    7675#include "description.h"
    7776!#include "com_io_dyn.h"

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

    r2603 r2622  
    2020  USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
    2121  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
     22  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
    2223
    2324  !   Author:    Frederic Hourdin      original: 15/01/93
    … …  
    3435  include "comgeom.h"
    3536  include "academic.h"
    36   include "ener.h"
    3737  include "iniprint.h"
    3838

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

    r2603 r2622  
    4747#include "paramet.h"
    4848#include "comgeom.h"
    49 #include "ener.h"
    5049#include "description.h"
    5150#include "iniprint.h"

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

    r2603 r2622  
    4949#include "paramet.h"
    5050#include "comgeom.h"
    51 #include "ener.h"
    5251#include "description.h"
    5352#include "iniprint.h"

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

    r2603 r2622  
    4949#include "paramet.h"
    5050#include "comgeom.h"
    51 #include "ener.h"
    5251#include "description.h"
    5352#include "iniprint.h"

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

    r2603 r2622  
    7272#include "comdissnew.h"
    7373#include "comgeom.h"
    74 #include "ener.h"
    7574#include "description.h"
    7675!#include "com_io_dyn.h"

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

    r2603 r2622  
    4646#include "paramet.h"
    4747#include "comgeom.h"
    48 #include "ener.h"
    4948#include "description.h"
    5049#include "iniprint.h"

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

    r2603 r2622  
    4646#include "paramet.h"
    4747#include "comgeom.h"
    48 #include "ener.h"
    4948#include "description.h"
    5049#include "iniprint.h"
Note: See TracChangeset for help on using the changeset viewer.