Index: LMDZ5/trunk/libf/dyn3d/advect.F =================================================================== --- LMDZ5/trunk/libf/dyn3d/advect.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/advect.F (revision 2622) @@ -6,4 +6,5 @@ USE comconst_mod, ONLY: daysec USE logic_mod, ONLY: conser + USE ener_mod, ONLY: gtot IMPLICIT NONE @@ -30,5 +31,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" c Arguments: Index: LMDZ5/trunk/libf/dyn3d/advtrac.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d/advtrac.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/advtrac.F90 (revision 2622) @@ -19,5 +19,4 @@ include "comdissip.h" include "comgeom2.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d/dynetat0.f90 =================================================================== --- LMDZ5/trunk/libf/dyn3d/dynetat0.f90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/dynetat0.f90 (revision 2622) @@ -16,4 +16,5 @@ USE serre_mod, ONLY: clon, clat, grossismx, grossismy USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -21,5 +22,4 @@ include "paramet.h" include "comgeom2.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d/dynredem.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d/dynredem.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/dynredem.F90 (revision 2622) @@ -18,4 +18,5 @@ taux,tauy USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itaufin, start_time + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -23,5 +24,4 @@ include "paramet.h" include "comgeom2.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d/gcm.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d/gcm.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/gcm.F90 (revision 2622) @@ -73,5 +73,4 @@ include "comdissnew.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d/iniacademic.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d/iniacademic.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/iniacademic.F90 (revision 2622) @@ -20,4 +20,5 @@ USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner USE temps_mod, ONLY: annee_ref, day_ini, day_ref + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 ! Author: Frederic Hourdin original: 15/01/93 @@ -34,5 +35,4 @@ include "comgeom.h" include "academic.h" - include "ener.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d/leapfrog.F =================================================================== --- LMDZ5/trunk/libf/dyn3d/leapfrog.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d/leapfrog.F (revision 2622) @@ -64,5 +64,4 @@ include "comdissnew.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d_common/adaptdt.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/adaptdt.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/adaptdt.F (revision 2622) @@ -12,5 +12,4 @@ include "comdissip.h" include "comgeom2.h" - include "ener.h" include "description.h" Index: LMDZ5/trunk/libf/dyn3d_common/ener.h =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/ener.h (revision 2621) +++ (revision ) @@ -1,18 +1,0 @@ -! -! $Id$ -! -! ATTENTION!!!!: ce fichier include est compatible format fixe/format libre -! veillez à n'utiliser que des ! pour les commentaires -! et à bien positionner les & des lignes de continuation -! (les placer en colonne 6 et en colonne 73) -! -! INCLUDE 'ener.h' - - COMMON/ener/ang0,etot0,ptot0,ztot0,stot0, & - & ang,etot,ptot,ztot,stot,rmsdpdt , & - & rmsv,gtot(llmm1) - - REAL ang0,etot0,ptot0,ztot0,stot0, & - & ang,etot,ptot,ztot,stot,rmsdpdt,rmsv,gtot - -!----------------------------------------------------------------------- Index: LMDZ5/trunk/libf/dyn3d_common/ener_mod.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/ener_mod.F90 (revision 2622) +++ LMDZ5/trunk/libf/dyn3d_common/ener_mod.F90 (revision 2622) @@ -0,0 +1,15 @@ +! +! $Id$ +! +MODULE ener_mod + +IMPLICIT NONE + +include "dimensions.h" +include "paramet.h" + + REAL ang0,etot0,ptot0,ztot0,stot0, & + ang,etot,ptot,ztot,stot,rmsdpdt,rmsv,gtot(llmm1) + + +END MODULE ener_mod Index: LMDZ5/trunk/libf/dyn3d_common/initdynav.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/initdynav.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/initdynav.F90 (revision 2622) @@ -39,5 +39,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F (revision 2622) @@ -45,5 +45,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d_common/inithist.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/inithist.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/inithist.F (revision 2622) @@ -44,5 +44,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d_common/interpre.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/interpre.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/interpre.F (revision 2622) @@ -15,5 +15,4 @@ include "comdissip.h" include "comgeom2.h" - include "ener.h" include "description.h" Index: LMDZ5/trunk/libf/dyn3d_common/sortvarc.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/sortvarc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/sortvarc.F (revision 2622) @@ -9,5 +9,7 @@ USE comconst_mod, ONLY: dtvr, daysec, g, rad, omeg USE logic_mod, ONLY: read_start - + USE ener_mod, ONLY: etot,ptot,ztot,stot,ang, + & etot0,ptot0,ztot0,stot0,ang0, + & rmsdpdt,rmsv IMPLICIT NONE @@ -31,5 +33,4 @@ INCLUDE "paramet.h" INCLUDE "comgeom.h" - INCLUDE "ener.h" INCLUDE "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d_common/traceurpole.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/traceurpole.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/traceurpole.F (revision 2622) @@ -10,5 +10,4 @@ include "comdissip.h" include "comgeom2.h" - include "ener.h" include "description.h" Index: LMDZ5/trunk/libf/dyn3d_common/writedynav.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/writedynav.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/writedynav.F90 (revision 2622) @@ -34,5 +34,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3d_common/writehist.F =================================================================== --- LMDZ5/trunk/libf/dyn3d_common/writehist.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3d_common/writehist.F (revision 2622) @@ -38,5 +38,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F (revision 2622) @@ -33,5 +33,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" c Arguments: Index: LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F (revision 2622) @@ -34,5 +34,4 @@ include "comdissip.h" include "comgeom2.h" - include "ener.h" include "description.h" Index: LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90 =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90 (revision 2622) @@ -19,4 +19,5 @@ USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, & start_time,day_ini,hour_ini + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -24,5 +25,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90 (revision 2622) @@ -20,4 +20,5 @@ taux,tauy USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itaufin, start_time + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -25,5 +26,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/gcm.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/gcm.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/gcm.F90 (revision 2622) @@ -62,5 +62,4 @@ include "comdissnew.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90 (revision 2622) @@ -22,4 +22,6 @@ USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner USE temps_mod, ONLY: annee_ref, day_ini, day_ref + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 + ! Author: Frederic Hourdin original: 15/01/93 @@ -36,5 +38,4 @@ include "comgeom.h" include "academic.h" - include "ener.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F (revision 2622) @@ -48,5 +48,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F (revision 2622) @@ -49,5 +49,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F (revision 2622) @@ -47,5 +47,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F (revision 2622) @@ -76,5 +76,4 @@ include "comdissnew.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F (revision 2622) @@ -47,5 +47,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F =================================================================== --- LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F (revision 2622) @@ -47,5 +47,4 @@ include "paramet.h" include "comgeom.h" - include "ener.h" include "description.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/advect_new_p.F (revision 2622) @@ -32,5 +32,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" c Arguments: Index: LMDZ5/trunk/libf/dyn3dpar/advect_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/advect_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/advect_p.F (revision 2622) @@ -31,5 +31,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" c Arguments: Index: LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90 (revision 2622) @@ -26,5 +26,4 @@ include "comdissip.h" include "comgeom2.h" - include "ener.h" include "description.h" Index: LMDZ5/trunk/libf/dyn3dpar/dynetat0.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/dynetat0.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/dynetat0.F (revision 2622) @@ -16,4 +16,5 @@ USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, & start_time,day_ini,hour_ini + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -37,5 +38,4 @@ #include "paramet.h" #include "comgeom2.h" -#include "ener.h" #include "netcdf.inc" #include "description.h" Index: LMDZ5/trunk/libf/dyn3dpar/dynredem.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/dynredem.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/dynredem.F (revision 2622) @@ -17,4 +17,5 @@ USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,itaufin, & start_time,hour_ini + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -27,5 +28,4 @@ #include "paramet.h" #include "comgeom2.h" -#include "ener.h" #include "netcdf.inc" #include "description.h" Index: LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F (revision 2622) @@ -18,4 +18,5 @@ USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,itaufin, & start_time,hour_ini + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 IMPLICIT NONE @@ -28,5 +29,4 @@ #include "paramet.h" #include "comgeom2.h" -#include "ener.h" #include "netcdf.inc" #include "description.h" Index: LMDZ5/trunk/libf/dyn3dpar/gcm.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/gcm.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/gcm.F (revision 2622) @@ -73,5 +73,4 @@ #include "comdissnew.h" #include "comgeom.h" -#include "ener.h" #include "description.h" !#include "com_io_dyn.h" Index: LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90 =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90 (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90 (revision 2622) @@ -20,4 +20,5 @@ USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner USE temps_mod, ONLY: annee_ref, day_ini, day_ref + USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 ! Author: Frederic Hourdin original: 15/01/93 @@ -34,5 +35,4 @@ include "comgeom.h" include "academic.h" - include "ener.h" include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F (revision 2622) @@ -47,5 +47,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" #include "description.h" #include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F (revision 2622) @@ -49,5 +49,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" #include "description.h" #include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dpar/inithist_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/inithist_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/inithist_p.F (revision 2622) @@ -49,5 +49,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" #include "description.h" #include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F (revision 2622) @@ -72,5 +72,4 @@ #include "comdissnew.h" #include "comgeom.h" -#include "ener.h" #include "description.h" !#include "com_io_dyn.h" Index: LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F (revision 2622) @@ -46,5 +46,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" #include "description.h" #include "iniprint.h" Index: LMDZ5/trunk/libf/dyn3dpar/writehist_p.F =================================================================== --- LMDZ5/trunk/libf/dyn3dpar/writehist_p.F (revision 2621) +++ LMDZ5/trunk/libf/dyn3dpar/writehist_p.F (revision 2622) @@ -46,5 +46,4 @@ #include "paramet.h" #include "comgeom.h" -#include "ener.h" #include "description.h" #include "iniprint.h" Index: LMDZ5/trunk/libf/phylmd/dyn1d/ener.h =================================================================== --- LMDZ5/trunk/libf/phylmd/dyn1d/ener.h (revision 2621) +++ (revision ) @@ -1,1 +1,0 @@ -link ../../dyn3d_common/ener.h