Index: LMDZ6/trunk/libf/dyn3d/addfi.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/addfi.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/addfi.f90 (revision 5272) @@ -9,4 +9,6 @@ USE control_mod, ONLY : planet_type USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -47,5 +49,4 @@ ! ------------------ ! - include "paramet.h" include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d/advect.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/advect.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/advect.f90 (revision 5272) @@ -7,4 +7,6 @@ USE ener_mod, ONLY: gtot USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !======================================================================= @@ -26,6 +28,4 @@ ! Declarations: ! ------------- - - include "paramet.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d/advtrac.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/advtrac.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/advtrac.f90 (revision 5272) @@ -15,8 +15,10 @@ USE strings_mod, ONLY: int2str USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comdissip.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d/bilan_dyn.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/bilan_dyn.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/bilan_dyn.f90 (revision 5272) @@ -16,8 +16,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d/caladvtrac.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/caladvtrac.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/caladvtrac.f90 (revision 5272) @@ -13,4 +13,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -26,5 +28,5 @@ - include "paramet.h" + ! Arguments: Index: LMDZ6/trunk/libf/dyn3d/caldyn.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/caldyn.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/caldyn.f90 (revision 5272) @@ -10,4 +10,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -29,5 +31,5 @@ - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d/conf_gcm.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/conf_gcm.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/conf_gcm.f90 (revision 5272) @@ -19,4 +19,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -35,5 +37,5 @@ ! -------------- - include "paramet.h" + include "comdissnew.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d/covnat.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/covnat.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/covnat.F90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE covnat (klevel,ucov, vcov, unat, vnat ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -19,7 +21,5 @@ ! !======================================================================= - -INCLUDE "paramet.h" -INCLUDE "comgeom.h" + INCLUDE "comgeom.h" INTEGER :: klevel Index: LMDZ6/trunk/libf/dyn3d/dissip.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dissip.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dissip.f90 (revision 5272) @@ -7,4 +7,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -29,5 +31,5 @@ - include "paramet.h" + include "comgeom.h" include "comdissnew.h" Index: LMDZ6/trunk/libf/dyn3d/dteta1.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dteta1.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dteta1.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE dteta1 ( teta, pbaru, pbarv, dteta) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -20,6 +22,4 @@ ! !======================================================================= - - include "paramet.h" REAL :: teta( ip1jmp1,llm ),pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm) Index: LMDZ6/trunk/libf/dyn3d/dudv1.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dudv1.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dudv1.F90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE dudv1 ( vorpot, pbaru, pbarv, du, dv ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -21,5 +23,5 @@ -INCLUDE "paramet.h" + REAL :: vorpot( ip1jm,llm ) ,pbaru( ip1jmp1,llm ) , & Index: LMDZ6/trunk/libf/dyn3d/dudv2.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dudv2.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dudv2.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE dudv2 ( teta, pkf, bern, du, dv ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -25,6 +27,4 @@ ! !======================================================================= - include "paramet.h" - REAL :: teta( ip1jmp1,llm ),pkf( ip1jmp1,llm ) ,bern( ip1jmp1,llm ), & du( ip1jmp1,llm ), dv( ip1jm,llm ) Index: LMDZ6/trunk/libf/dyn3d/dynetat0.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dynetat0.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dynetat0.f90 (revision 5272) @@ -25,7 +25,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3d/dynredem.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dynredem.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dynredem.f90 (revision 5272) @@ -20,7 +20,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" include "description.h" @@ -169,7 +171,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "description.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d/dynredem_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dynredem_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/dynredem_mod.f90 (revision 5272) @@ -2,8 +2,9 @@ USE netcdf USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm PRIVATE PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err PUBLIC :: cre_var, put_var1, put_var2, fil, modname, msg - include "paramet.h" CHARACTER(LEN=256), SAVE :: fil, modname INTEGER, SAVE :: nvarid Index: LMDZ6/trunk/libf/dyn3d/fluxstokenc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/fluxstokenc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/fluxstokenc.f90 (revision 5272) @@ -14,8 +14,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" include "tracstoke.h" Index: LMDZ6/trunk/libf/dyn3d/friction.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/friction.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/friction.f90 (revision 5272) @@ -8,5 +8,7 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm - IMPLICIT NONE + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE !======================================================================= @@ -22,5 +24,5 @@ !======================================================================= - include "paramet.h" + include "comgeom2.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d/gcm.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/gcm.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/gcm.f90 (revision 5272) @@ -23,4 +23,6 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -54,6 +56,4 @@ ! Declarations: ! ------------- - - include "paramet.h" include "comdissnew.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d/groupe.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/groupe.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/groupe.f90 (revision 5272) @@ -7,4 +7,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -21,5 +23,5 @@ - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d/groupeun.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/groupeun.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/groupeun.f90 (revision 5272) @@ -7,8 +7,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" @@ -142,8 +144,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d/guide_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/guide_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/guide_mod.f90 (revision 5272) @@ -20,19 +20,21 @@ nf90_64bit_offset, nf90_inq_dimid, nf90_inquire_dimension, nf90_put_var - IMPLICIT NONE + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE ! --------------------------------------------- -! Declarations des cles logiques et parametres +! Declarations des cles logiques et parametres ! --------------------------------------------- INTEGER, PRIVATE, SAVE :: iguide_read,iguide_int,iguide_sav INTEGER, PRIVATE, SAVE :: nlevnc, guide_plevs LOGICAL, PRIVATE, SAVE :: guide_u,guide_v,guide_T,guide_Q,guide_P - LOGICAL, PRIVATE, SAVE :: guide_hr,guide_teta - LOGICAL, PRIVATE, SAVE :: guide_BL,guide_reg,guide_add,gamma4,guide_zon + LOGICAL, PRIVATE, SAVE :: guide_hr,guide_teta + LOGICAL, PRIVATE, SAVE :: guide_BL,guide_reg,guide_add,gamma4,guide_zon LOGICAL, PRIVATE, SAVE :: invert_p,invert_y,ini_anal LOGICAL, PRIVATE, SAVE :: guide_2D,guide_sav,guide_modele !FC LOGICAL, PRIVATE, SAVE :: convert_Pa - + REAL, PRIVATE, SAVE :: tau_min_u,tau_max_u REAL, PRIVATE, SAVE :: tau_min_v,tau_max_v @@ -47,8 +49,8 @@ REAL, PRIVATE, SAVE :: plim_guide_BL - REAL, ALLOCATABLE, DIMENSION(:), PRIVATE, SAVE :: alpha_u,alpha_v - REAL, ALLOCATABLE, DIMENSION(:, :), PRIVATE, SAVE :: alpha_T,alpha_Q + REAL, ALLOCATABLE, DIMENSION(:), PRIVATE, SAVE :: alpha_u,alpha_v + REAL, ALLOCATABLE, DIMENSION(:, :), PRIVATE, SAVE :: alpha_T,alpha_Q REAL, ALLOCATABLE, DIMENSION(:), PRIVATE, SAVE :: alpha_P,alpha_pcor - + ! --------------------------------------------- ! Variables de guidage @@ -82,5 +84,5 @@ - INCLUDE "paramet.h" + INTEGER :: error,ncidpl,rid,rcod @@ -361,8 +363,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "iniprint.h" @@ -613,8 +617,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "comgeom.h" @@ -680,8 +686,10 @@ use comvert_mod, only: preff, pressure_exner, bp, ap USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" @@ -931,8 +939,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comgeom2.h" @@ -1102,8 +1112,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + INTEGER, INTENT(IN) :: timestep @@ -1403,8 +1415,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + INTEGER, INTENT(IN) :: timestep @@ -1668,8 +1682,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d/iniacademic.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/iniacademic.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/iniacademic.f90 (revision 5272) @@ -27,4 +27,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -33,5 +35,5 @@ - include "paramet.h" + include "comgeom.h" include "academic.h" Index: LMDZ6/trunk/libf/dyn3d/integrd.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/integrd.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/integrd.f90 (revision 5272) @@ -14,4 +14,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -33,5 +35,5 @@ - include "paramet.h" + include "comgeom.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d/leapfrog.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/leapfrog.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/leapfrog.F90 (revision 5272) @@ -25,4 +25,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -57,5 +59,4 @@ ! Declarations: ! ------------- - include "paramet.h" include "comdissnew.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d/paramet.h =================================================================== --- LMDZ6/trunk/libf/dyn3d/paramet.h (revision 5271) +++ (revision ) @@ -1,29 +1,0 @@ -! -! $Header$ -! -! -! 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 'paramet.h' - - INTEGER iip1,iip2,iip3,jjp1,llmp1,llmp2,llmm1 - INTEGER kftd,ip1jm,ip1jmp1,ip1jmi1,ijp1llm - INTEGER ijmllm,mvar - INTEGER jcfil,jcfllm - - PARAMETER( iip1= iim+1,iip2=iim+2,iip3=iim+3 & - & ,jjp1=jjm+1-1/jjm) - PARAMETER( llmp1 = llm+1, llmp2 = llm+2, llmm1 = llm-1 ) - PARAMETER( kftd = iim/2 -ndm ) - PARAMETER( ip1jm = iip1*jjm, ip1jmp1= iip1*jjp1 ) - PARAMETER( ip1jmi1= ip1jm - iip1 ) - PARAMETER( ijp1llm= ip1jmp1 * llm, ijmllm= ip1jm * llm ) - PARAMETER( mvar= ip1jmp1*( 2*llm+1) + ijmllm ) - PARAMETER( jcfil=jjm/2+5, jcfllm=jcfil*llm ) - -!----------------------------------------------------------------------- Index: LMDZ6/trunk/libf/dyn3d/paramet_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/paramet_mod_h.f90 (revision 5272) +++ LMDZ6/trunk/libf/dyn3d/paramet_mod_h.f90 (revision 5272) @@ -0,0 +1,21 @@ +MODULE paramet_mod_h + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + + IMPLICIT NONE; PRIVATE + PUBLIC iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + + INTEGER iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1 + INTEGER kftd, ip1jm, ip1jmp1, ip1jmi1, ijp1llm + INTEGER ijmllm, mvar + INTEGER jcfil, jcfllm + + PARAMETER(iip1 = iim + 1, iip2 = iim + 2, iip3 = iim + 3, jjp1 = jjm + 1 - 1 / jjm) + PARAMETER(llmp1 = llm + 1, llmp2 = llm + 2, llmm1 = llm - 1) + PARAMETER(kftd = iim / 2 - ndm) + PARAMETER(ip1jm = iip1 * jjm, ip1jmp1 = iip1 * jjp1) + PARAMETER(ip1jmi1 = ip1jm - iip1) + PARAMETER(ijp1llm = ip1jmp1 * llm, ijmllm = ip1jm * llm) + PARAMETER(mvar = ip1jmp1 * (2 * llm + 1) + ijmllm) + PARAMETER(jcfil = jjm / 2 + 5, jcfllm = jcfil * llm) +END MODULE paramet_mod_h Index: LMDZ6/trunk/libf/dyn3d/qminimum.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/qminimum.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/qminimum.f90 (revision 5272) @@ -7,4 +7,6 @@ USE strings_mod, ONLY: strIdx USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT none ! @@ -13,5 +15,5 @@ ! - include "paramet.h" + ! INTEGER :: nqtot Index: LMDZ6/trunk/libf/dyn3d/replay3d.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/replay3d.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/replay3d.f90 (revision 5272) @@ -23,5 +23,6 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! USE dimensions_mod, ONLY: iim, jjm, llm, ndm - + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -55,5 +56,4 @@ ! Declarations: ! ------------- - include "paramet.h" include "comdissnew.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d/sw_case_williamson91_6.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/sw_case_williamson91_6.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/sw_case_williamson91_6.f90 (revision 5272) @@ -30,4 +30,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -36,5 +38,5 @@ - include "paramet.h" + include "comgeom.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d/tetaleveli1j.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/tetaleveli1j.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/tetaleveli1j.F90 (revision 5272) @@ -8,4 +8,6 @@ ! USE dimphy USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT none @@ -46,5 +48,5 @@ ! REAL ptop, pbot, aist(klon), aisb(klon) ! -INCLUDE "paramet.h" + ! INTEGER :: lt(ip1jm), lb(ip1jm) Index: LMDZ6/trunk/libf/dyn3d/tetaleveli1j1.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/tetaleveli1j1.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/tetaleveli1j1.F90 (revision 5272) @@ -8,4 +8,6 @@ ! USE dimphy USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT none @@ -46,5 +48,5 @@ ! REAL ptop, pbot, aist(klon), aisb(klon) ! -INCLUDE "paramet.h" + ! INTEGER :: lt(ip1jmp1), lb(ip1jmp1) Index: LMDZ6/trunk/libf/dyn3d/top_bound.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/top_bound.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/top_bound.F90 (revision 5272) @@ -9,8 +9,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d/vlsplt.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/vlsplt.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/vlsplt.F90 (revision 5272) @@ -20,8 +20,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + ! @@ -138,8 +140,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "iniprint.h" ! @@ -498,8 +502,10 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! @@ -861,8 +867,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + ! ! @@ -1048,5 +1056,6 @@ subroutine minmaxq(zq,qmin,qmax,comment) USE dimensions_mod, ONLY: iim, jjm, llm, ndm - INCLUDE "paramet.h" + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm character(len=20) :: comment Index: LMDZ6/trunk/libf/dyn3d/vlspltqs.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/vlspltqs.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d/vlspltqs.F90 (revision 5272) @@ -27,8 +27,10 @@ USE logic_mod, ONLY: adv_qsat_liq USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + ! @@ -192,8 +194,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + ! ! @@ -557,8 +561,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/adaptdt.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/adaptdt.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/adaptdt.f90 (revision 5272) @@ -7,8 +7,10 @@ USE comconst_mod, ONLY: dtvr USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comdissip.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/advn.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advn.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advn.F90 (revision 5272) @@ -16,8 +16,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" include "iniprint.h" @@ -146,8 +148,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "iniprint.h" ! @@ -264,8 +268,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "iniprint.h" ! @@ -361,8 +367,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "iniprint.h" ! @@ -484,8 +492,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "iniprint.h" ! @@ -750,8 +760,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INCLUDE "iniprint.h" @@ -882,8 +894,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INCLUDE "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d_common/advx.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advx.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advx.f90 (revision 5272) @@ -5,4 +5,6 @@ sx,sy,sz,lati,latf) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -25,5 +27,5 @@ ! - include "paramet.h" + ! Arguments : Index: LMDZ6/trunk/libf/dyn3d_common/advxp.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advxp.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advxp.f90 (revision 5272) @@ -5,4 +5,6 @@ ,SSXX,SSXY,SSXZ,SYY,SYZ,SZZ,ntra) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC @@ -15,5 +17,5 @@ ! - include "paramet.h" + INTEGER :: ntra Index: LMDZ6/trunk/libf/dyn3d_common/advy.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advy.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advy.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE advy(limit,dty,pbarv,sm,s0,sx,sy,sz) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -28,5 +30,5 @@ ! - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/advyp.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advyp.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advyp.f90 (revision 5272) @@ -5,4 +5,6 @@ ,SSXX,SSXY,SSXZ,SYY,SYZ,SZZ,ntra ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC @@ -30,5 +32,5 @@ ! - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/advz.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advz.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advz.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE advz(limit,dtz,w,sm,s0,sx,sy,sz) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -23,5 +25,5 @@ ! - include "paramet.h" + ! INCLUDE "traceur.h" Index: LMDZ6/trunk/libf/dyn3d_common/advzp.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/advzp.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/advzp.f90 (revision 5272) @@ -6,4 +6,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -33,5 +35,5 @@ ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/bernoui.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/bernoui.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/bernoui.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE bernoui (ngrid,nlay,pphi,pecin,pbern) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -27,5 +29,5 @@ ! - include "paramet.h" + ! ! Arguments: Index: LMDZ6/trunk/libf/dyn3d_common/caldyn0.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/caldyn0.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/caldyn0.f90 (revision 5272) @@ -9,7 +9,9 @@ USE comvert_mod, ONLY: ap, bp USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/convflu.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/convflu.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/convflu.f90 (revision 5272) @@ -19,8 +19,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + REAL :: xflu,yflu,convfl,convpn,convps INTEGER :: l,ij,nbniv Index: LMDZ6/trunk/libf/dyn3d_common/convmas.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/convmas.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/convmas.f90 (revision 5272) @@ -6,7 +6,9 @@ ! Purpose: Compute mass flux convergence at p levels. USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/coordij.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/coordij.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/coordij.f90 (revision 5272) @@ -14,4 +14,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE REAL :: lon,lat @@ -20,5 +22,5 @@ - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/covcont.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/covcont.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/covcont.f90 (revision 5272) @@ -7,7 +7,9 @@ !------------------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/diagedyn.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/diagedyn.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/diagedyn.f90 (revision 5272) @@ -56,8 +56,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INCLUDE "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d_common/disvert.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/disvert.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/disvert.f90 (revision 5272) @@ -11,8 +11,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.f90 (revision 5272) @@ -14,8 +14,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "iniprint.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/diverg.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/diverg.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/diverg.f90 (revision 5272) @@ -12,4 +12,6 @@ ! ********************************************************************* USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -24,5 +26,5 @@ ! --------------------------------------------------------------------- - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/diverg_gam.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/diverg_gam.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/diverg_gam.f90 (revision 5272) @@ -13,4 +13,6 @@ ! ********************************************************************* USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -25,5 +27,5 @@ ! --------------------------------------------------------------------- - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/divergf.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/divergf.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/divergf.f90 (revision 5272) @@ -12,4 +12,6 @@ ! ********************************************************************* USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -24,5 +26,5 @@ ! --------------------------------------------------------------------- - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/divergst.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/divergst.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/divergst.f90 (revision 5272) @@ -4,4 +4,7 @@ SUBROUTINE divergst(klevel,x,y,div) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + IMPLICIT NONE ! @@ -18,5 +21,4 @@ ! ------------------------------------------------------------------- ! - INCLUDE "paramet.h" INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/divgrad.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/divgrad.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/divgrad.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE divgrad (klevel,h, lh, divgra ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -22,5 +24,5 @@ ! - include "paramet.h" + include "comgeom.h" include "comdissipn.h" Index: LMDZ6/trunk/libf/dyn3d_common/divgrad2.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/divgrad2.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/divgrad2.f90 (revision 5272) @@ -14,8 +14,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom2.h" INCLUDE "comdissipn.h" Index: LMDZ6/trunk/libf/dyn3d_common/ener_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/ener_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/ener_mod.f90 (revision 5272) @@ -5,8 +5,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE -include "paramet.h" + REAL ang0,etot0,ptot0,ztot0,stot0, & Index: LMDZ6/trunk/libf/dyn3d_common/enercin.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/enercin.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/enercin.f90 (revision 5272) @@ -6,7 +6,9 @@ ! Purpose: Compute kinetic energy at sigma levels. USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/exner_hyb_m.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/exner_hyb_m.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/exner_hyb_m.f90 (revision 5272) @@ -37,8 +37,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/exner_milieu_m.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/exner_milieu_m.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/exner_milieu_m.f90 (revision 5272) @@ -34,8 +34,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/flumass.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/flumass.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/flumass.f90 (revision 5272) @@ -6,7 +6,9 @@ ! Purpose: Compute mass flux at s levels. USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/fxy.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/fxy.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/fxy.f90 (revision 5272) @@ -10,4 +10,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -19,5 +21,5 @@ ! - include "paramet.h" + INTEGER :: i,j Index: LMDZ6/trunk/libf/dyn3d_common/fxysinus.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/fxysinus.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/fxysinus.f90 (revision 5272) @@ -9,4 +9,6 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -18,5 +20,5 @@ ! - INCLUDE "paramet.h" + INTEGER :: i,j Index: LMDZ6/trunk/libf/dyn3d_common/geopot.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/geopot.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/geopot.f90 (revision 5272) @@ -4,4 +4,7 @@ SUBROUTINE geopot (ngrid, teta, pk, pks, phis, phi ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + IMPLICIT NONE @@ -27,7 +30,4 @@ ! Declarations: ! ------------- - - - include "paramet.h" ! Arguments: Index: LMDZ6/trunk/libf/dyn3d_common/gr_u_scal.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/gr_u_scal.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/gr_u_scal.f90 (revision 5272) @@ -26,4 +26,6 @@ !======================================================================= USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -32,5 +34,5 @@ - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/gr_v_scal.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/gr_v_scal.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/gr_v_scal.f90 (revision 5272) @@ -26,4 +26,6 @@ !======================================================================= USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -32,5 +34,5 @@ - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/grad.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/grad.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/grad.f90 (revision 5272) @@ -14,8 +14,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INTEGER :: klevel REAL :: pg( ip1jmp1,klevel ) Index: LMDZ6/trunk/libf/dyn3d_common/gradiv.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/gradiv.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/gradiv.f90 (revision 5272) @@ -18,8 +18,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comdissipn.h" Index: LMDZ6/trunk/libf/dyn3d_common/gradiv2.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/gradiv2.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/gradiv2.f90 (revision 5272) @@ -17,8 +17,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INCLUDE "comdissipn.h" Index: LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.f90 (revision 5272) @@ -18,8 +18,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/iniconst.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/iniconst.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/iniconst.f90 (revision 5272) @@ -12,4 +12,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -20,5 +22,5 @@ ! - include "paramet.h" + include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d_common/inidissip.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/inidissip.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/inidissip.f90 (revision 5272) @@ -17,7 +17,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comdissipn.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d_common/inigeom.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/inigeom.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/inigeom.f90 (revision 5272) @@ -23,8 +23,10 @@ alphax,alphay,taux,tauy,transx,transy,pxo,pyo USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom2.h" include "comdissnew.h" Index: LMDZ6/trunk/libf/dyn3d_common/initdynav.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/initdynav.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/initdynav.f90 (revision 5272) @@ -12,4 +12,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -36,5 +38,5 @@ - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3d_common/initfluxsto.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/initfluxsto.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/initfluxsto.f90 (revision 5272) @@ -12,4 +12,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -42,5 +44,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3d_common/inithist.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/inithist.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/inithist.f90 (revision 5272) @@ -13,4 +13,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -41,5 +43,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3d_common/inter_barxy_m.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/inter_barxy_m.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/inter_barxy_m.f90 (revision 5272) @@ -7,4 +7,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -22,5 +24,5 @@ ! (for "iim", "jjm") - include "paramet.h" + ! (for other included files) Index: LMDZ6/trunk/libf/dyn3d_common/interpost.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/interpost.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/interpost.f90 (revision 5272) @@ -5,9 +5,11 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/interpre.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/interpre.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/interpre.f90 (revision 5272) @@ -10,8 +10,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comdissip.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/laplacien.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/laplacien.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/laplacien.f90 (revision 5272) @@ -13,8 +13,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/laplacien_gam.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/laplacien_gam.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/laplacien_gam.f90 (revision 5272) @@ -15,8 +15,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/laplacien_rot.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/laplacien_rot.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/laplacien_rot.f90 (revision 5272) @@ -14,8 +14,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/laplacien_rotgam.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/laplacien_rotgam.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/laplacien_rotgam.f90 (revision 5272) @@ -13,8 +13,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/limx.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/limx.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/limx.f90 (revision 5272) @@ -14,8 +14,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/limy.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/limy.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/limy.f90 (revision 5272) @@ -16,8 +16,10 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/limz.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/limz.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/limz.f90 (revision 5272) @@ -14,8 +14,10 @@ ! -------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/massbar.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/massbar.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/massbar.f90 (revision 5272) @@ -7,7 +7,9 @@ ! See iniconst for more details. USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/massbarxy.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/massbarxy.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/massbarxy.f90 (revision 5272) @@ -7,7 +7,9 @@ ! See iniconst for more details. USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/massdair.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/massdair.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/massdair.f90 (revision 5272) @@ -17,8 +17,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/nxgrad.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/nxgrad.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/nxgrad.f90 (revision 5272) @@ -13,8 +13,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INTEGER :: klevel Index: LMDZ6/trunk/libf/dyn3d_common/nxgrad_gam.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/nxgrad_gam.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/nxgrad_gam.f90 (revision 5272) @@ -13,8 +13,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INTEGER :: klevel Index: LMDZ6/trunk/libf/dyn3d_common/nxgradst.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/nxgradst.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/nxgradst.f90 (revision 5272) @@ -3,6 +3,7 @@ ! SUBROUTINE nxgradst (klevel,rot, x, y ) - ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! Auteur : P. Le Van @@ -15,5 +16,4 @@ ! - INCLUDE "paramet.h" INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/nxgraro2.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/nxgraro2.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/nxgraro2.f90 (revision 5272) @@ -16,8 +16,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comdissipn.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/nxgrarot.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/nxgrarot.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/nxgrarot.f90 (revision 5272) @@ -17,9 +17,11 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! ! - include "paramet.h" + include "comdissipn.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/pbar.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/pbar.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/pbar.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE pbar ( pext, pbarx, pbary, pbarxy ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -75,8 +77,4 @@ !======================================================================= - - - INCLUDE "paramet.h" - INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/pentes_ini.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/pentes_ini.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/pentes_ini.f90 (revision 5272) @@ -3,8 +3,8 @@ ! SUBROUTINE pentes_ini (q,w,masse,pbaru,pbarv,mode) - USE comconst_mod, ONLY: pi, dtvr - USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -24,8 +24,4 @@ ! !======================================================================= - - - - include "paramet.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/prather.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/prather.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/prather.f90 (revision 5272) @@ -3,8 +3,8 @@ ! SUBROUTINE prather (q,w,masse,pbaru,pbarv,nt,dt) - USE comconst_mod, ONLY: pi - USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -21,8 +21,4 @@ ! !======================================================================= - - - - include "paramet.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/pression.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/pression.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/pression.f90 (revision 5272) @@ -9,7 +9,9 @@ !------------------------------------------------------------------------------- USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + !=============================================================================== ! Arguments: Index: LMDZ6/trunk/libf/dyn3d_common/psextbar.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/psextbar.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/psextbar.f90 (revision 5272) @@ -4,4 +4,6 @@ SUBROUTINE psextbar ( ps, psexbarxy ) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -74,8 +76,4 @@ ! !======================================================================= - - - - INCLUDE "paramet.h" INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3d_common/rotat.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/rotat.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/rotat.f90 (revision 5272) @@ -14,8 +14,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/rotat_nfil.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/rotat_nfil.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/rotat_nfil.f90 (revision 5272) @@ -14,8 +14,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/rotatf.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/rotatf.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/rotatf.f90 (revision 5272) @@ -15,8 +15,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3d_common/rotatst.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/rotatst.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/rotatst.f90 (revision 5272) @@ -14,9 +14,11 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! INTEGER :: klevel - INCLUDE "paramet.h" + REAL :: rot( ip1jm,klevel ) Index: LMDZ6/trunk/libf/dyn3d_common/sortvarc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/sortvarc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/sortvarc.f90 (revision 5272) @@ -13,4 +13,6 @@ rmsdpdt,rmsv USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -32,5 +34,5 @@ - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INCLUDE "iniprint.h" Index: LMDZ6/trunk/libf/dyn3d_common/test_period.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/test_period.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/test_period.f90 (revision 5272) @@ -10,10 +10,8 @@ ! USE infotrac, ONLY : nqtot - ! - ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE dimensions_mod, ONLY: iim, llm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - ! - - INCLUDE "paramet.h" ! ! ...... Arguments ...... Index: LMDZ6/trunk/libf/dyn3d_common/tourpot.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/tourpot.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/tourpot.f90 (revision 5272) @@ -6,7 +6,9 @@ ! Purpose: Compute potential vorticity. USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3d_common/traceurpole.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/traceurpole.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/traceurpole.f90 (revision 5272) @@ -5,8 +5,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comdissip.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/ugeostr.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/ugeostr.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/ugeostr.f90 (revision 5272) @@ -14,8 +14,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3d_common/vitvert.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/vitvert.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/vitvert.f90 (revision 5272) @@ -7,7 +7,9 @@ USE comvert_mod, ONLY: bp USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + !=============================================================================== ! Arguments: Index: LMDZ6/trunk/libf/dyn3d_common/writedynav.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/writedynav.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/writedynav.f90 (revision 5272) @@ -9,4 +9,6 @@ USE temps_mod, ONLY: itau_dyn USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -30,5 +32,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3d_common/writehist.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/writehist.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3d_common/writehist.f90 (revision 5272) @@ -8,4 +8,6 @@ USE temps_mod, ONLY: itau_dyn USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -32,5 +34,5 @@ ! ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/addfi_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/addfi_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/addfi_loc.f90 (revision 5272) @@ -9,4 +9,6 @@ USE control_mod, ONLY : planet_type USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -46,6 +48,4 @@ ! 0. Declarations : ! ------------------ - ! - include "paramet.h" include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/advect_new_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/advect_new_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/advect_new_loc.f90 (revision 5272) @@ -11,4 +11,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !======================================================================= @@ -30,7 +32,4 @@ ! Declarations: ! ------------- - - - include "paramet.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/advect_new_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/advect_new_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/advect_new_mod.f90 (revision 5272) @@ -17,5 +17,6 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90 (revision 5272) @@ -22,8 +22,10 @@ USE strings_mod, ONLY: int2str USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comdissip.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3dmem/advtrac_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/advtrac_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/advtrac_mod.f90 (revision 5272) @@ -11,7 +11,9 @@ USE vlspltgen_mod USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/allocate_field_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/allocate_field_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/allocate_field_mod.f90 (revision 5272) @@ -1,3 +1,10 @@ MODULE allocate_field_mod + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + + IMPLICIT NONE; PRIVATE + PUBLIC allocate_u, switch_u, switch_v, allocate_v, allocate2d_u, allocate2d_v, & + switch2d_u, switch2d_v, init_nan INTERFACE allocate_u @@ -158,5 +165,5 @@ SUBROUTINE allocate1d_u2d(field,d) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + IMPLICIT NONE REAL,POINTER :: field(:,:) TYPE(distrib),INTENT(IN) :: d @@ -174,5 +181,6 @@ SUBROUTINE allocate2d_u2d(field,dim1,d) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:) INTEGER :: dim1 @@ -190,5 +198,6 @@ SUBROUTINE allocate3d_u2d(field,dim1,dim2,d) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:,:) INTEGER :: dim1,dim2 @@ -208,5 +217,6 @@ SUBROUTINE allocate1d_v2d(field,d) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:) TYPE(distrib),INTENT(IN) :: d @@ -224,5 +234,6 @@ SUBROUTINE allocate2d_v2d(field,dim1,d) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:) INTEGER :: dim1 @@ -240,5 +251,6 @@ SUBROUTINE allocate3d_v2d(field,dim1,dim2,d) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:,:) INTEGER :: dim1,dim2 @@ -505,5 +517,6 @@ USE parallel_lmdz USE mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:) TYPE(distrib),INTENT(IN) :: old_dist @@ -541,5 +554,6 @@ USE parallel_lmdz USE mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:) TYPE(distrib),INTENT(IN) :: old_dist @@ -577,5 +591,6 @@ USE parallel_lmdz USE mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:,:) TYPE(distrib),INTENT(IN) :: old_dist @@ -616,5 +631,6 @@ USE parallel_lmdz USE mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:) TYPE(distrib),INTENT(IN) :: old_dist @@ -652,5 +668,6 @@ USE parallel_lmdz USE mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:) TYPE(distrib),INTENT(IN) :: old_dist @@ -688,5 +705,6 @@ USE parallel_lmdz USE mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + + IMPLICIT NONE REAL,POINTER :: field(:,:,:,:) TYPE(distrib),INTENT(IN) :: old_dist Index: LMDZ6/trunk/libf/dyn3dmem/bernoui_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/bernoui_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/bernoui_loc.f90 (revision 5272) @@ -3,4 +3,6 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -26,5 +28,5 @@ ! - include "paramet.h" + ! ! Arguments: Index: LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.f90 (revision 5272) @@ -20,8 +20,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3dmem/caladvtrac_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/caladvtrac_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/caladvtrac_loc.f90 (revision 5272) @@ -18,4 +18,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -31,5 +33,5 @@ - include "paramet.h" + ! Arguments: Index: LMDZ6/trunk/libf/dyn3dmem/caladvtrac_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/caladvtrac_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/caladvtrac_mod.f90 (revision 5272) @@ -35,7 +35,9 @@ USE groupe_mod USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/caldyn_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/caldyn_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/caldyn_loc.f90 (revision 5272) @@ -9,4 +9,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -28,5 +30,5 @@ - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/caldyn_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/caldyn_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/caldyn_mod.f90 (revision 5272) @@ -15,5 +15,5 @@ - + CONTAINS @@ -22,5 +22,8 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE advect_new_mod,ONLY : advect_new_allocate + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE advect_new_mod, ONLY : advect_new_allocate IMPLICIT NONE TYPE(distrib),POINTER :: d @@ -40,9 +43,9 @@ CALL allocate_v(massebxy,llm,d) CALL allocate_u(convm,llm,d) - + CALL advect_new_allocate - + END SUBROUTINE caldyn_allocate - + SUBROUTINE caldyn_switch_caldyn(dist) USE allocate_field_mod @@ -65,10 +68,10 @@ CALL switch_v(massebxy,distrib_caldyn,dist) CALL switch_u(convm,distrib_caldyn,dist) - + CALL advect_new_switch_caldyn(dist) - + END SUBROUTINE caldyn_switch_caldyn - - -END MODULE caldyn_mod + + +END MODULE caldyn_mod Index: LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90 (revision 5272) @@ -36,5 +36,8 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE infotrac, ONLY: nqtot + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE infotrac, ONLY: nqtot IMPLICIT NONE TYPE(distrib),POINTER :: d @@ -71,5 +74,8 @@ SUBROUTINE call_calfis(itau,lafin,ucov_dyn,vcov_dyn,teta_dyn,masse_dyn,ps_dyn, & phis_dyn,q_dyn,flxw_dyn) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm use exner_hyb_loc_m, only: exner_hyb_loc + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE exner_hyb_loc_m, only: exner_hyb_loc use exner_milieu_loc_m, only: exner_milieu_loc USE parallel_lmdz Index: LMDZ6/trunk/libf/dyn3dmem/call_dissip_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/call_dissip_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/call_dissip_mod.f90 (revision 5272) @@ -24,5 +24,8 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE dissip_mod, ONLY : dissip_allocate + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE dissip_mod, ONLY : dissip_allocate IMPLICIT NONE TYPE(distrib),POINTER :: d @@ -79,5 +82,8 @@ SUBROUTINE call_dissip(ucov_dyn,vcov_dyn,teta_dyn,p_dyn,pk_dyn,ps_dyn) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE parallel_lmdz + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE parallel_lmdz USE times USE mod_hallo Index: LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90 (revision 5272) @@ -24,4 +24,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -40,5 +42,5 @@ ! -------------- - include "paramet.h" + include "comdissnew.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3dmem/convflu_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/convflu_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/convflu_loc.f90 (revision 5272) @@ -17,8 +17,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + REAL :: xflu,yflu,convfl,convpn,convps INTEGER :: l,ij,nbniv Index: LMDZ6/trunk/libf/dyn3dmem/convmas1_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/convmas1_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/convmas1_loc.f90 (revision 5272) @@ -9,7 +9,9 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/convmas2_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/convmas2_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/convmas2_loc.f90 (revision 5272) @@ -8,7 +8,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/convmas_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/convmas_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/convmas_loc.f90 (revision 5272) @@ -8,7 +8,9 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/covcont_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/covcont_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/covcont_loc.f90 (revision 5272) @@ -2,4 +2,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -17,7 +19,4 @@ ! !======================================================================= - - - INCLUDE "paramet.h" INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/covnat_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/covnat_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/covnat_loc.f90 (revision 5272) @@ -5,4 +5,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -20,7 +22,4 @@ ! !======================================================================= - - - INCLUDE "paramet.h" INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/dissip_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dissip_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dissip_loc.f90 (revision 5272) @@ -10,4 +10,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -32,5 +34,5 @@ - include "paramet.h" + include "comgeom.h" include "comdissnew.h" Index: LMDZ6/trunk/libf/dyn3dmem/dissip_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dissip_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dissip_mod.f90 (revision 5272) @@ -9,5 +9,6 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE gradiv2_mod, ONLY : gradiv2_allocate + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE gradiv2_mod, ONLY : gradiv2_allocate USE nxgraro2_mod, ONLY : nxgraro2_allocate USE divgrad2_mod, ONLY : divgrad2_allocate Index: LMDZ6/trunk/libf/dyn3dmem/diverg_gam_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/diverg_gam_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/diverg_gam_loc.f90 (revision 5272) @@ -11,4 +11,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -23,5 +25,5 @@ ! --------------------------------------------------------------------- - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/diverg_p.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/diverg_p.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/diverg_p.f90 (revision 5272) @@ -10,4 +10,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -22,5 +24,5 @@ ! --------------------------------------------------------------------- - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/divergf_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/divergf_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/divergf_loc.f90 (revision 5272) @@ -11,4 +11,6 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -23,5 +25,5 @@ ! --------------------------------------------------------------------- - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/divgrad2_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/divgrad2_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/divgrad2_loc.f90 (revision 5272) @@ -15,8 +15,10 @@ USE divgrad2_mod USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom2.h" INCLUDE "comdissipn.h" Index: LMDZ6/trunk/libf/dyn3dmem/divgrad2_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/divgrad2_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/divgrad2_mod.f90 (revision 5272) @@ -9,5 +9,6 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),POINTER :: d d=>distrib_dissip Index: LMDZ6/trunk/libf/dyn3dmem/dteta1_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dteta1_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dteta1_loc.f90 (revision 5272) @@ -4,4 +4,6 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -20,9 +22,4 @@ ! !======================================================================= - - - - include "paramet.h" - REAL :: teta( ijb_u:ije_u,llm ) REAL :: pbaru( ijb_u:ije_u,llm ),pbarv( ijb_v:ije_v,llm) Index: LMDZ6/trunk/libf/dyn3dmem/dudv1_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dudv1_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dudv1_loc.f90 (revision 5272) @@ -2,4 +2,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -19,5 +21,5 @@ - INCLUDE "paramet.h" + REAL :: vorpot( ijb_v:ije_v,llm ) ,pbaru( ijb_u:ije_u,llm ) , & Index: LMDZ6/trunk/libf/dyn3dmem/dudv2_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dudv2_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dudv2_loc.f90 (revision 5272) @@ -2,4 +2,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -24,7 +26,4 @@ !======================================================================= ! - - include "paramet.h" - REAL :: teta( ijb_u:ije_u,llm ),pkf( ijb_u:ije_u,llm ) REAL :: bern( ijb_u:ije_u,llm ) Index: LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90 (revision 5272) @@ -25,7 +25,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.f90 (revision 5272) @@ -23,7 +23,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" include "description.h" @@ -178,7 +180,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "description.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/dynredem_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dynredem_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/dynredem_mod.f90 (revision 5272) @@ -1,5 +1,7 @@ MODULE dynredem_mod - - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE parallel_lmdz + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE parallel_lmdz USE mod_hallo USE netcdf @@ -9,5 +11,4 @@ CHARACTER(LEN=256), SAVE :: fil, modname INTEGER, SAVE :: nvarid - CONTAINS @@ -58,5 +59,5 @@ !$OMP END MASTER !$OMP BARRIER - + END SUBROUTINE dynredem_write_u ! @@ -108,5 +109,5 @@ !$OMP END MASTER !$OMP BARRIER - + END SUBROUTINE dynredem_write_v ! @@ -154,5 +155,5 @@ !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) DO l=1,ll; var(:,l)=var_tmp(:,l); END DO - + !$OMP BARRIER !$OMP MASTER @@ -160,6 +161,6 @@ !$OMP END MASTER !$OMP BARRIER - -END SUBROUTINE dynredem_read_u + +END SUBROUTINE dynredem_read_u ! !=============================================================================== @@ -265,6 +266,6 @@ !=============================================================================== -END MODULE dynredem_mod - - - +END MODULE dynredem_mod + + + Index: LMDZ6/trunk/libf/dyn3dmem/enercin_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/enercin_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/enercin_loc.f90 (revision 5272) @@ -7,7 +7,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/exner_hyb_loc_m.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/exner_hyb_loc_m.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/exner_hyb_loc_m.f90 (revision 5272) @@ -39,8 +39,10 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/exner_milieu_loc_m.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/exner_milieu_loc_m.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/exner_milieu_loc_m.f90 (revision 5272) @@ -35,8 +35,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/flumass_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/flumass_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/flumass_loc.f90 (revision 5272) @@ -7,7 +7,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/fluxstokenc_p.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/fluxstokenc_p.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/fluxstokenc_p.f90 (revision 5272) @@ -17,4 +17,6 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -29,5 +31,5 @@ - include "paramet.h" + include "tracstoke.h" Index: LMDZ6/trunk/libf/dyn3dmem/friction_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/friction_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/friction_loc.f90 (revision 5272) @@ -9,5 +9,7 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm - IMPLICIT NONE + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE !======================================================================= @@ -23,5 +25,5 @@ !======================================================================= - include "paramet.h" + include "comgeom2.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3dmem/gcm.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/gcm.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/gcm.F90 (revision 5272) @@ -26,7 +26,7 @@ USE mod_xios_dyn3dmem, ONLY: xios_dyn3dmem_init USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS - - USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -60,6 +60,4 @@ ! Declarations: ! ------------- - - include "paramet.h" include "comdissnew.h" include "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/geopot_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/geopot_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/geopot_loc.f90 (revision 5272) @@ -2,7 +2,7 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - - !======================================================================= ! @@ -24,9 +24,4 @@ !======================================================================= !----------------------------------------------------------------------- - ! Declarations: - ! ------------- - - - include "paramet.h" ! Arguments: Index: LMDZ6/trunk/libf/dyn3dmem/gr_u_scal_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/gr_u_scal_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/gr_u_scal_loc.f90 (revision 5272) @@ -27,4 +27,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -33,5 +35,5 @@ - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/gr_v_scal_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/gr_v_scal_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/gr_v_scal_loc.f90 (revision 5272) @@ -27,4 +27,6 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -33,5 +35,5 @@ - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/grad_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/grad_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/grad_loc.f90 (revision 5272) @@ -12,8 +12,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INTEGER :: klevel REAL :: pg( ijb_u:ije_u,klevel ) Index: LMDZ6/trunk/libf/dyn3dmem/grad_p.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/grad_p.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/grad_p.f90 (revision 5272) @@ -12,8 +12,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INTEGER :: klevel REAL :: pg( ip1jmp1,klevel ) Index: LMDZ6/trunk/libf/dyn3dmem/gradiv2_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/gradiv2_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/gradiv2_loc.f90 (revision 5272) @@ -20,8 +20,10 @@ USE gradiv2_mod USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INCLUDE "comdissipn.h" Index: LMDZ6/trunk/libf/dyn3dmem/gradiv2_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/gradiv2_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/gradiv2_mod.f90 (revision 5272) @@ -11,5 +11,6 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),POINTER :: d d=>distrib_dissip Index: LMDZ6/trunk/libf/dyn3dmem/groupe_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/groupe_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/groupe_loc.f90 (revision 5272) @@ -6,4 +6,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -20,5 +22,5 @@ - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3dmem/groupe_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/groupe_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/groupe_mod.f90 (revision 5272) @@ -13,7 +13,9 @@ USE advtrac_mod, ONLY : advtrac_allocate USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/groupeun_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/groupeun_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/groupeun_loc.f90 (revision 5272) @@ -4,8 +4,10 @@ USE comconst_mod, ONLY: ngroup USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" @@ -139,8 +141,10 @@ USE comconst_mod, ONLY: ngroup USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3dmem/guide_loc_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/guide_loc_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/guide_loc_mod.f90 (revision 5272) @@ -19,5 +19,7 @@ USE pres2lev_mod, only: pres2lev - IMPLICIT NONE + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE ! --------------------------------------------- @@ -84,5 +86,5 @@ - INCLUDE "paramet.h" + INTEGER :: error,ncidpl,rid,rcod @@ -371,8 +373,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + ! Variables entree @@ -732,7 +736,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + ! input variables @@ -756,7 +762,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + ! input variables @@ -782,8 +790,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "comgeom.h" @@ -855,8 +865,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "comgeom.h" @@ -928,8 +940,10 @@ USE comvert_mod, ONLY: preff, pressure_exner, bp, ap, disvert_type USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" @@ -1417,8 +1431,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comgeom2.h" @@ -1585,7 +1601,9 @@ USE netcdf, ONLY: nf90_put_var USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + INTEGER, INTENT(IN) :: timestep @@ -1903,7 +1921,9 @@ USE netcdf, ONLY: nf90_put_var USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + INTEGER, INTENT(IN) :: timestep @@ -2182,8 +2202,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INCLUDE "comgeom2.h" @@ -2405,7 +2427,9 @@ use mod_hallo USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none -include 'paramet.h' + CHARACTER (len=*) :: varname @@ -2436,7 +2460,9 @@ subroutine dumpall USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include "paramet.h" + include "comgeom.h" call barrier Index: LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.f90 (revision 5272) @@ -28,4 +28,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -34,5 +36,5 @@ - include "paramet.h" + include "comgeom.h" include "academic.h" Index: LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.f90 (revision 5272) @@ -18,4 +18,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -46,5 +48,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.f90 (revision 5272) @@ -17,4 +17,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -47,5 +49,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/inithist_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/inithist_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/inithist_loc.f90 (revision 5272) @@ -17,4 +17,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -44,5 +46,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/integrd_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/integrd_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/integrd_loc.f90 (revision 5272) @@ -17,4 +17,6 @@ USE strings_mod, ONLY: int2str USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -36,5 +38,5 @@ - include "paramet.h" + include "comgeom.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3dmem/integrd_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/integrd_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/integrd_mod.f90 (revision 5272) @@ -13,5 +13,8 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE advect_new_mod,ONLY : advect_new_allocate + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE advect_new_mod,ONLY : advect_new_allocate IMPLICIT NONE TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/laplacien_gam_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/laplacien_gam_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/laplacien_gam_loc.f90 (revision 5272) @@ -13,8 +13,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/laplacien_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/laplacien_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/laplacien_loc.f90 (revision 5272) @@ -12,8 +12,10 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/laplacien_rot_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/laplacien_rot_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/laplacien_rot_loc.f90 (revision 5272) @@ -13,8 +13,10 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/laplacien_rotgam_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/laplacien_rotgam_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/laplacien_rotgam_loc.f90 (revision 5272) @@ -11,8 +11,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" Index: LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90 (revision 5272) @@ -40,5 +40,7 @@ USE strings_mod, ONLY: int2str - USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -73,8 +75,5 @@ ! Declarations: ! ------------- - - - include "paramet.h" - include "comdissnew.h" + include "comdissnew.h" include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/leapfrog_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/leapfrog_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/leapfrog_mod.f90 (revision 5272) @@ -39,5 +39,8 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE infotrac + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE infotrac USE caldyn_mod,ONLY : caldyn_allocate USE integrd_mod,ONLY : integrd_allocate Index: LMDZ6/trunk/libf/dyn3dmem/massbar_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/massbar_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/massbar_loc.f90 (revision 5272) @@ -8,7 +8,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/massbarxy_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/massbarxy_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/massbarxy_loc.f90 (revision 5272) @@ -8,7 +8,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/massdair_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/massdair_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/massdair_loc.f90 (revision 5272) @@ -15,8 +15,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/mod_filtreg_p.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/mod_filtreg_p.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/mod_filtreg_p.F90 (revision 5272) @@ -14,4 +14,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -57,5 +59,5 @@ ! - INCLUDE "paramet.h" + INCLUDE "coefils.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/mod_hallo.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/mod_hallo.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/mod_hallo.f90 (revision 5272) @@ -68,5 +68,8 @@ subroutine Init_mod_hallo - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE IOIPSL + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE IOIPSL implicit none integer :: jj_nb_gather(0:mpi_size-1) @@ -214,5 +217,6 @@ subroutine Register_SendField(Field,ij,ll,offset,size,target,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + implicit none @@ -229,5 +233,6 @@ subroutine Register_RecvField(Field,ij,ll,offset,size,target,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + implicit none @@ -245,5 +250,8 @@ subroutine Register_SwapField(FieldS,FieldR,ij,ll,jj_Nb_New,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + implicit none @@ -292,5 +300,7 @@ subroutine Register_SwapFieldHallo(FieldS,FieldR,ij,ll,jj_Nb_New,Up,Down,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -345,5 +355,6 @@ SUBROUTINE Register_SwapField1d_u(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -369,5 +380,6 @@ SUBROUTINE Register_SwapField1d_u_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -395,5 +407,6 @@ SUBROUTINE Register_SwapField2d_u1d(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -422,5 +435,6 @@ SUBROUTINE Register_SwapField2d_u1d_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -451,5 +465,6 @@ SUBROUTINE Register_SwapField3d_u(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -478,5 +493,6 @@ SUBROUTINE Register_SwapField3d_u_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -618,5 +634,6 @@ SUBROUTINE Register_SwapField3d_u2d(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -645,5 +662,6 @@ SUBROUTINE Register_SwapField3d_u2d_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -679,5 +697,6 @@ SUBROUTINE Register_SwapField1d_v(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -703,5 +722,6 @@ SUBROUTINE Register_SwapField1d_v_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -729,5 +749,6 @@ SUBROUTINE Register_SwapField2d_v1d(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -756,5 +777,6 @@ SUBROUTINE Register_SwapField2d_v1d_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -786,5 +808,6 @@ SUBROUTINE Register_SwapField3d_v(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -813,5 +836,6 @@ SUBROUTINE Register_SwapField3d_v_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -844,5 +868,6 @@ SUBROUTINE Register_SwapField1d_v2d(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist !LF @@ -868,5 +893,6 @@ SUBROUTINE Register_SwapField1d_v2d_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist !LF @@ -894,5 +920,6 @@ SUBROUTINE Register_SwapField2d_v2d(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -921,5 +948,6 @@ SUBROUTINE Register_SwapField2d_v2d_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -950,5 +978,6 @@ SUBROUTINE Register_SwapField3d_v2d(FieldS,FieldR,new_dist,a_request,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -977,5 +1006,6 @@ SUBROUTINE Register_SwapField3d_v2d_bis(FieldS,FieldR,new_dist,a_request,old_dist,up,down) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),INTENT(IN) :: new_dist @@ -1006,6 +1036,9 @@ SUBROUTINE Register_SwapField_gen_u(FieldS,FieldR,ll,old_dist,new_dist,Up,Down,a_request) - USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE parallel_lmdz + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + IMPLICIT NONE INTEGER :: ll,Up,Down @@ -1059,5 +1092,8 @@ SUBROUTINE Register_SwapField_gen_v(FieldS,FieldR,ll,old_dist,new_dist,Up,Down,a_request) USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + IMPLICIT NONE INTEGER :: ll,Up,Down @@ -1117,5 +1153,6 @@ subroutine Register_Hallo(Field,ij,ll,RUp,Rdown,SUp,SDown,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE lmdz_mpi + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE lmdz_mpi implicit none @@ -1181,5 +1218,6 @@ subroutine Register_Hallo_u(Field,ll,RUp,Rdown,SUp,SDown,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE lmdz_mpi + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE lmdz_mpi implicit none INTEGER :: ll @@ -1243,5 +1281,6 @@ subroutine Register_Hallo_v(Field,ll,RUp,Rdown,SUp,SDown,a_request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE lmdz_mpi + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE lmdz_mpi implicit none INTEGER :: ll @@ -1305,5 +1344,8 @@ subroutine SendRequest(a_Request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE lmdz_mpi + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE lmdz_mpi implicit none @@ -1422,5 +1464,8 @@ subroutine WaitRequest(a_Request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE lmdz_mpi + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE lmdz_mpi implicit none @@ -1507,5 +1552,6 @@ subroutine WaitSendRequest(a_Request) USE lmdz_mpi - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + implicit none type(request),target :: a_request @@ -1553,5 +1599,8 @@ subroutine WaitRecvRequest(a_Request) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE lmdz_mpi + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + USE lmdz_mpi implicit none type(request),target :: a_request @@ -1624,4 +1673,6 @@ subroutine CopyField(FieldS,FieldR,ij,ll,jj_Nb_New) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -1660,5 +1711,7 @@ subroutine CopyFieldHallo(FieldS,FieldR,ij,ll,jj_Nb_New,Up,Down) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -1699,5 +1752,8 @@ subroutine Gather_field_u(field_loc,field_glo,ll) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + implicit none integer :: ll real :: field_loc(ijb_u:ije_u,ll) @@ -1721,5 +1777,8 @@ subroutine Gather_field_v(field_loc,field_glo,ll) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + implicit none integer :: ll real :: field_loc(ijb_v:ije_v,ll) @@ -1748,5 +1807,8 @@ subroutine Scatter_field_u(field_glo,field_loc,ll) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + implicit none integer :: ll real :: field_glo(ip1jmp1,ll) @@ -1781,5 +1843,8 @@ subroutine Scatter_field_v(field_glo,field_loc,ll) - USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + implicit none integer :: ll real :: field_glo(ip1jmp1,ll) Index: LMDZ6/trunk/libf/dyn3dmem/mod_xios_dyn3dmem.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/mod_xios_dyn3dmem.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/mod_xios_dyn3dmem.f90 (revision 5272) @@ -41,8 +41,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm -IMPLICIT NONE - - - INCLUDE "paramet.h" +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE + + + INCLUDE 'comgeom.h' @@ -135,7 +137,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm -IMPLICIT NONE - - include 'paramet.h' +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE + + CHARACTER(LEN=*) :: name REAL, DIMENSION(ij_begin:ij_end) :: Field @@ -157,7 +161,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm -IMPLICIT NONE - - include 'paramet.h' +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE + + CHARACTER(LEN=*) :: name REAL, DIMENSION(ij_begin:ij_end,llm) :: Field @@ -191,7 +197,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm -IMPLICIT NONE - - include 'paramet.h' +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE + + CHARACTER(LEN=*) :: name REAL, DIMENSION(ij_begin:ij_end) :: Field @@ -222,7 +230,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm -IMPLICIT NONE - - include 'paramet.h' +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +IMPLICIT NONE + + CHARACTER(LEN=*) :: name REAL, DIMENSION(ij_begin:ij_end,llm) :: Field Index: LMDZ6/trunk/libf/dyn3dmem/nxgrad_gam_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/nxgrad_gam_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/nxgrad_gam_loc.f90 (revision 5272) @@ -12,8 +12,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INTEGER :: klevel Index: LMDZ6/trunk/libf/dyn3dmem/nxgrad_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/nxgrad_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/nxgrad_loc.f90 (revision 5272) @@ -11,8 +11,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" INTEGER :: klevel Index: LMDZ6/trunk/libf/dyn3dmem/nxgraro2_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/nxgraro2_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/nxgraro2_loc.f90 (revision 5272) @@ -19,8 +19,10 @@ USE nxgraro2_mod USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comdissipn.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/nxgraro2_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/nxgraro2_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/nxgraro2_mod.f90 (revision 5272) @@ -11,5 +11,6 @@ USE allocate_field_mod USE parallel_lmdz - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),POINTER :: d d=>distrib_dissip Index: LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90 (revision 5272) @@ -86,7 +86,9 @@ USE lmdz_mpi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + INCLUDE "iniprint.h" @@ -246,7 +248,9 @@ SUBROUTINE create_distrib(jj_nb_new,d) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + INTEGER,INTENT(IN) :: jj_Nb_New(0:MPI_Size-1) @@ -298,8 +302,10 @@ SUBROUTINE Set_Distrib(d) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),INTENT(IN) :: d @@ -335,8 +341,10 @@ SUBROUTINE copy_distrib(dist,new_dist) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),INTENT(INOUT) :: dist TYPE(distrib),INTENT(IN) :: new_dist @@ -373,8 +381,10 @@ SUBROUTINE get_current_distrib(d) USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),INTENT(OUT) :: d @@ -389,4 +399,6 @@ USE control_mod, only : ok_dyn_xios USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm #ifdef CPP_COUPLE @@ -406,7 +418,4 @@ #endif ! #endif of #ifdef CPP_EARTH - - include "paramet.h" - integer :: ierr integer :: i @@ -453,8 +462,10 @@ subroutine Pack_Data(Field,ij,ll,row,Buffer) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + integer, intent(in) :: ij,ll,row @@ -477,8 +488,10 @@ subroutine Unpack_Data(Field,ij,ll,row,Buffer) USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + integer, intent(in) :: ij,ll,row @@ -517,7 +530,9 @@ USE Vampir USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + INTEGER :: ij,ll REAL, dimension(ij,ll) :: Field @@ -635,7 +650,9 @@ USE lmdz_mpi USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + INCLUDE "iniprint.h" INTEGER :: ij,ll,rank @@ -716,7 +733,9 @@ USE lmdz_mpi USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + INTEGER :: ij,ll REAL, dimension(ij,ll) :: Field @@ -735,7 +754,9 @@ USE lmdz_mpi USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + INTEGER :: ij,ll REAL, dimension(ij,ll) :: Field @@ -756,7 +777,9 @@ ! USE lmdz_mpi ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm -implicit none +! USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & +! ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm +!implicit none ! -! INCLUDE "paramet.h" +! ! ! INTEGER :: ij,ll Index: LMDZ6/trunk/libf/dyn3dmem/paramet.h =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/paramet.h (revision 5271) +++ (revision ) @@ -1,29 +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 'paramet.h' - - INTEGER iip1,iip2,iip3,jjp1,llmp1,llmp2,llmm1 - INTEGER kftd,ip1jm,ip1jmp1,ip1jmi1,ijp1llm - INTEGER ijmllm,mvar - INTEGER jcfil,jcfllm - - PARAMETER( iip1= iim+1-1/iim,iip2=iim+2,iip3=iim+3 & - & ,jjp1=jjm+1-1/jjm) - PARAMETER( llmp1 = llm+1, llmp2 = llm+2, llmm1 = llm-1 ) - PARAMETER( kftd = iim/2 -ndm ) - PARAMETER( ip1jm = iip1*jjm, ip1jmp1= iip1*jjp1 ) - PARAMETER( ip1jmi1= ip1jm - iip1 ) - PARAMETER( ijp1llm= ip1jmp1 * llm, ijmllm= ip1jm * llm ) - PARAMETER( mvar= ip1jmp1*( 2*llm+1) + ijmllm ) - PARAMETER( jcfil=jjm/2+5, jcfllm=jcfil*llm ) - -!----------------------------------------------------------------------- Index: LMDZ6/trunk/libf/dyn3dmem/paramet_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/paramet_mod_h.f90 (revision 5272) +++ LMDZ6/trunk/libf/dyn3dmem/paramet_mod_h.f90 (revision 5272) @@ -0,0 +1,21 @@ +MODULE paramet_mod_h + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + + IMPLICIT NONE; PRIVATE + PUBLIC iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm + + INTEGER iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1 + INTEGER kftd, ip1jm, ip1jmp1, ip1jmi1, ijp1llm + INTEGER ijmllm, mvar + INTEGER jcfil, jcfllm + + PARAMETER(iip1 = iim + 1 - 1 / iim, iip2 = iim + 2, iip3 = iim + 3, jjp1 = jjm + 1 - 1 / jjm) + PARAMETER(llmp1 = llm + 1, llmp2 = llm + 2, llmm1 = llm - 1) + PARAMETER(kftd = iim / 2 - ndm) + PARAMETER(ip1jm = iip1 * jjm, ip1jmp1 = iip1 * jjp1) + PARAMETER(ip1jmi1 = ip1jm - iip1) + PARAMETER(ijp1llm = ip1jmp1 * llm, ijmllm = ip1jm * llm) + PARAMETER(mvar = ip1jmp1 * (2 * llm + 1) + ijmllm) + PARAMETER(jcfil = jjm / 2 + 5, jcfllm = jcfil * llm) +END MODULE paramet_mod_h Index: LMDZ6/trunk/libf/dyn3dmem/pression_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/pression_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/pression_loc.f90 (revision 5272) @@ -13,8 +13,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + ! INTEGER,INTENT(IN) :: ngrid ! not used Index: LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.f90 (revision 5272) @@ -8,4 +8,6 @@ USE strings_mod, ONLY: strIdx USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT none ! @@ -14,5 +16,5 @@ ! - include "paramet.h" + include "iniprint.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/rotat_nfil_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/rotat_nfil_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/rotat_nfil_loc.f90 (revision 5272) @@ -12,8 +12,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/rotat_p.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/rotat_p.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/rotat_p.f90 (revision 5272) @@ -12,8 +12,10 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/rotatf_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/rotatf_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/rotatf_loc.f90 (revision 5272) @@ -13,8 +13,10 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + INCLUDE "comgeom.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.f90 (revision 5272) @@ -31,4 +31,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !----------------------------------------------------------------------- @@ -37,5 +39,5 @@ - include "paramet.h" + include "comgeom.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3dmem/times.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/times.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/times.f90 (revision 5272) @@ -27,7 +27,9 @@ USE parallel_lmdz USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - INCLUDE "paramet.h" + max_size=jjm+1 Index: LMDZ6/trunk/libf/dyn3dmem/top_bound_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/top_bound_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/top_bound_loc.f90 (revision 5272) @@ -9,8 +9,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom2.h" Index: LMDZ6/trunk/libf/dyn3dmem/tourpot_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/tourpot_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/tourpot_loc.f90 (revision 5272) @@ -8,7 +8,9 @@ USE mod_filtreg_p USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom.h" !=============================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/vitvert_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/vitvert_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/vitvert_loc.f90 (revision 5272) @@ -9,7 +9,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + !=============================================================================== ! Arguments: Index: LMDZ6/trunk/libf/dyn3dmem/vlsplt_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/vlsplt_loc.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/vlsplt_loc.F90 (revision 5272) @@ -17,8 +17,10 @@ min_qParent,min_qMass,min_ratio ! MVals et CRisi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "iniprint.h" ! @@ -420,8 +422,10 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" ! @@ -889,8 +893,10 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "iniprint.h" ! Index: LMDZ6/trunk/libf/dyn3dmem/vlspltgen_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/vlspltgen_loc.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/vlspltgen_loc.F90 (revision 5272) @@ -35,9 +35,11 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + ! Index: LMDZ6/trunk/libf/dyn3dmem/vlspltgen_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/vlspltgen_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/vlspltgen_mod.f90 (revision 5272) @@ -17,7 +17,9 @@ USE vlz_mod,ONLY : vlz_allocate USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/vlspltqs_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/vlspltqs_loc.F90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/vlspltqs_loc.F90 (revision 5272) @@ -15,8 +15,10 @@ min_qParent,min_qMass,min_ratio ! MVals et CRisi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + ! ! @@ -425,8 +427,10 @@ USE comconst_mod, ONLY: pi USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dyn3dmem/vlz_mod.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/vlz_mod.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/vlz_mod.f90 (revision 5272) @@ -15,5 +15,6 @@ USE parallel_lmdz USE infotrac - USE dimensions_mod, ONLY: iim, jjm, llm, ndm IMPLICIT NONE + USE dimensions_mod, ONLY: iim, jjm, llm, ndm + IMPLICIT NONE TYPE(distrib),POINTER :: d Index: LMDZ6/trunk/libf/dyn3dmem/write_field_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/write_field_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/write_field_loc.f90 (revision 5272) @@ -38,7 +38,9 @@ USE mod_hallo USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include 'paramet.h' + character(len=*) :: name @@ -104,7 +106,9 @@ USE mod_hallo USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none - include 'paramet.h' + character(len=*) :: name Index: LMDZ6/trunk/libf/dyn3dmem/writedyn_xios.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/writedyn_xios.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/writedyn_xios.f90 (revision 5272) @@ -15,4 +15,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none ! @@ -36,5 +38,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.f90 (revision 5272) @@ -16,4 +16,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -45,5 +47,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dyn3dmem/writehist_loc.f90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/writehist_loc.f90 (revision 5271) +++ LMDZ6/trunk/libf/dyn3dmem/writehist_loc.f90 (revision 5272) @@ -16,4 +16,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -45,5 +47,5 @@ ! Declarations - include "paramet.h" + include "comgeom.h" include "description.h" Index: LMDZ6/trunk/libf/dynphy_lonlat/calfis.f90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/calfis.f90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/calfis.f90 (revision 5272) @@ -36,4 +36,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !======================================================================= @@ -89,7 +91,4 @@ ! 0. Declarations : ! ------------------ - - include "paramet.h" - INTEGER :: ngridmx PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm ) Index: LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F90 (revision 5272) @@ -52,4 +52,6 @@ #ifdef CPP_PARA USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !======================================================================= @@ -106,6 +108,4 @@ ! 0. Declarations : ! ------------------ - include "paramet.h" - INTEGER :: ngridmx PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm ) Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90 (revision 5272) @@ -47,4 +47,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -52,5 +54,5 @@ ! Local variables: - include "paramet.h" + include "comgeom2.h" include "iniprint.h" Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90 (revision 5272) @@ -42,4 +42,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -49,5 +51,5 @@ include "iniprint.h" - include "paramet.h" + include "comgeom2.h" include "comdissnew.h" Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90 (revision 5272) @@ -54,9 +54,10 @@ USE comconst_mod, ONLY: pi, dtvr USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm PRIVATE PUBLIC :: etat0phys_netcdf include "iniprint.h" - include "paramet.h" include "comgeom2.h" include "dimsoil.h" Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (revision 5272) @@ -43,4 +43,6 @@ USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -51,5 +53,5 @@ - include "paramet.h" + include "iniprint.h" include "tracstoke.h" Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.f90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.f90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.f90 (revision 5272) @@ -13,4 +13,6 @@ USE surface_data, ONLY: landice_opt USE dimensions_mod, ONLY: iim, jjm, llm, ndm + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm CHARACTER(LEN=256), PARAMETER :: icefname="landiceref.nc", icevar="landice" @@ -18,5 +20,4 @@ PUBLIC :: start_init_subsurf include "iniprint.h" - include "paramet.h" include "comgeom2.h" Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90 (revision 5271) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90 (revision 5272) @@ -82,4 +82,6 @@ USE lmdz_cppkeys_wrapper, ONLY: nf90_format USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !------------------------------------------------------------------------------- @@ -87,5 +89,5 @@ include "iniprint.h" - include "paramet.h" + REAL, DIMENSION(iip1,jjp1), INTENT(INOUT) :: masque ! land mask REAL, DIMENSION(iip1,jjp1), INTENT(INOUT) :: phis ! ground geopotential @@ -332,7 +334,9 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + include "comgeom2.h" !----------------------------------------------------------------------------- Index: LMDZ6/trunk/libf/filtrez/filtreg.F90 =================================================================== --- LMDZ6/trunk/libf/filtrez/filtreg.F90 (revision 5271) +++ LMDZ6/trunk/libf/filtrez/filtreg.F90 (revision 5272) @@ -8,4 +8,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE !======================================================================= @@ -48,5 +50,5 @@ ! - INCLUDE "paramet.h" + INCLUDE "coefils.h" Index: LMDZ6/trunk/libf/filtrez/filtreg_mod.F90 =================================================================== --- LMDZ6/trunk/libf/filtrez/filtreg_mod.F90 (revision 5271) +++ LMDZ6/trunk/libf/filtrez/filtreg_mod.F90 (revision 5272) @@ -21,4 +21,6 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! @@ -28,5 +30,5 @@ ! ------------------------------------------------------------------- - include "paramet.h" + ! ------------------------------------------------------------------- include "comgeom.h" Index: LMDZ6/trunk/libf/filtrez/inifgn.F90 =================================================================== --- LMDZ6/trunk/libf/filtrez/inifgn.F90 (revision 5271) +++ LMDZ6/trunk/libf/filtrez/inifgn.F90 (revision 5272) @@ -7,8 +7,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - include "paramet.h" + include "comgeom.h" Index: LMDZ6/trunk/libf/phylmd/Dust/blcloud_scav.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/blcloud_scav.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/blcloud_scav.f90 (revision 5272) @@ -9,4 +9,6 @@ USE infotrac USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -14,5 +16,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================= INPUT =================================== Index: LMDZ6/trunk/libf/phylmd/Dust/blcloud_scav_lsc.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/blcloud_scav_lsc.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/blcloud_scav_lsc.f90 (revision 5272) @@ -9,4 +9,6 @@ USE infotrac USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -14,5 +16,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================= INPUT =================================== Index: LMDZ6/trunk/libf/phylmd/Dust/coarsemission.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/coarsemission.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/coarsemission.f90 (revision 5272) @@ -32,4 +32,6 @@ ! USE phytracr_spl_mod, ONLY : nbreg_dust, nbreg_ind, nbreg_bb USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -38,5 +40,5 @@ INCLUDE "chem_spla.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================== INPUT ================================== Index: LMDZ6/trunk/libf/phylmd/Dust/deposition.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/deposition.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/deposition.f90 (revision 5272) @@ -11,4 +11,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -16,5 +18,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !----------------------------- INPUT ----------------------------------- Index: LMDZ6/trunk/libf/phylmd/Dust/finemission.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/finemission.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/finemission.f90 (revision 5272) @@ -16,4 +16,6 @@ ! USE phytracr_spl_mod, ONLY : nbreg_dust, nbreg_ind, nbreg_bb USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -21,5 +23,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + INTEGER :: i, k, kminbc, kmaxbc Index: LMDZ6/trunk/libf/phylmd/Dust/incloud_scav.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/incloud_scav.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/incloud_scav.f90 (revision 5272) @@ -10,4 +10,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -15,5 +17,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================= INPUT =================================== Index: LMDZ6/trunk/libf/phylmd/Dust/incloud_scav_lsc.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/incloud_scav_lsc.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/incloud_scav_lsc.f90 (revision 5272) @@ -10,4 +10,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -15,5 +17,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================= INPUT =================================== Index: LMDZ6/trunk/libf/phylmd/Dust/phytracr_spl_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/phytracr_spl_mod.F90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/phytracr_spl_mod.F90 (revision 5272) @@ -808,5 +808,6 @@ mth_cur, phys_cal_update USE dimensions_mod, ONLY: iim, jjm, llm, ndm -! + USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT none ! @@ -827,5 +828,4 @@ INCLUDE "YOMCST.h" INCLUDE "YOETHF.h" - INCLUDE "paramet.h" INCLUDE "alpale.h" Index: LMDZ6/trunk/libf/phylmd/Dust/precuremission.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/precuremission.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/precuremission.f90 (revision 5272) @@ -21,4 +21,6 @@ ! USE phytracr_spl_mod, ONLY : nbreg_dust, nbreg_ind, nbreg_bb USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -27,5 +29,5 @@ INCLUDE "chem_spla.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================= INPUT =================================== Index: LMDZ6/trunk/libf/phylmd/Dust/read_dust.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/read_dust.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/read_dust.f90 (revision 5272) @@ -5,8 +5,10 @@ USE netcdf, ONLY: nf90_get_var, nf90_nowrite, nf90_open, nf90_inq_varid USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! - INCLUDE "paramet.h" + ! INTEGER :: step, nbjour Index: LMDZ6/trunk/libf/phylmd/Dust/read_newemissions.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/read_newemissions.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/read_newemissions.f90 (revision 5272) @@ -24,4 +24,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -29,5 +31,5 @@ ! INCLUDE 'dimphy.h' - INCLUDE 'paramet.h' + INCLUDE 'chem.h' INCLUDE 'chem_spla.h' Index: LMDZ6/trunk/libf/phylmd/Dust/read_surface.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/read_surface.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/read_surface.f90 (revision 5272) @@ -12,7 +12,9 @@ USE netcdf, ONLY: nf90_inq_varid,nf90_noerr,nf90_get_var,nf90_nowrite,nf90_inq_varid,nf90_open USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - INCLUDE "paramet.h" + character*10 name Index: LMDZ6/trunk/libf/phylmd/Dust/read_vent.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/read_vent.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/read_vent.f90 (revision 5272) @@ -6,8 +6,10 @@ ! USE write_field_phy USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE ! INCLUDE "dimphy.h" - INCLUDE "paramet.h" + ! INTEGER :: step, nbjour Index: LMDZ6/trunk/libf/phylmd/Dust/trconvect.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/trconvect.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/Dust/trconvect.f90 (revision 5272) @@ -9,4 +9,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE @@ -14,5 +16,5 @@ INCLUDE "chem.h" INCLUDE "YOMCST.h" - INCLUDE "paramet.h" + !============================= INPUT =================================== Index: LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.f90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.f90 (revision 5272) @@ -12,9 +12,11 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE INCLUDE "clesphys.h" - INCLUDE "paramet.h" + INCLUDE "iniprint.h" Index: LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h =================================================================== --- LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h (revision 5271) +++ LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h (revision 5272) @@ -1,3 +1,3 @@ -INCLUDE "conf_gcm.f90" +#include "conf_gcm.f90" ! @@ -18,9 +18,9 @@ ! -------------- -INCLUDE "compar1d.h" -INCLUDE "flux_arp.h" -INCLUDE "tsoilnudge.h" -INCLUDE "fcg_gcssold.h" -INCLUDE "fcg_racmo.h" +#include "compar1d.h" +#include "flux_arp.h" +#include "tsoilnudge.h" +#include "fcg_gcssold.h" +#include "fcg_racmo.h" ! ! @@ -29,5 +29,5 @@ ! CHARACTER ch1*72,ch2*72,ch3*72,ch4*12 - + ! ! ------------------------------------------------------------------- @@ -42,5 +42,5 @@ !Config Desc = unite de fichier pour les impressions !Config Def = 6 -!Config Help = unite de fichier pour les impressions +!Config Help = unite de fichier pour les impressions !Config (defaut sortie standard = 6) lunout=6 @@ -74,26 +74,26 @@ !!Config Help = 0 ==> forcing_les = .true. ! initial profiles from file prof.inp.001 -! no forcing by LS convergence ; +! no forcing by LS convergence ; ! surface temperature imposed ; ! radiative cooling may be imposed (iflag_radia=0 in physiq.def) ! = 1 ==> forcing_radconv = .true. -! idem forcing_type = 0, but the imposed radiative cooling -! is set to 0 (hence, if iflag_radia=0 in physiq.def, +! idem forcing_type = 0, but the imposed radiative cooling +! is set to 0 (hence, if iflag_radia=0 in physiq.def, ! then there is no radiative cooling at all) ! = 2 ==> forcing_toga = .true. -! initial profiles from TOGA-COARE IFA files -! LS convergence and SST imposed from TOGA-COARE IFA files +! initial profiles from TOGA-COARE IFA files +! LS convergence and SST imposed from TOGA-COARE IFA files ! = 3 ==> forcing_GCM2SCM = .true. ! initial profiles from the GCM output ! LS convergence imposed from the GCM output ! = 4 ==> forcing_twpi = .true. -! initial profiles from TWPICE nc files -! LS convergence and SST imposed from TWPICE nc files +! initial profiles from TWPICE nc files +! LS convergence and SST imposed from TWPICE nc files ! = 5 ==> forcing_rico = .true. ! initial profiles from RICO idealized -! LS convergence imposed from RICO (cst) +! LS convergence imposed from RICO (cst) ! = 6 ==> forcing_amma = .true. ! = 10 ==> forcing_case = .true. -! initial profiles from case.nc file +! initial profiles from case.nc file ! = 40 ==> forcing_GCSSold = .true. ! initial profile from GCSS file @@ -105,23 +105,23 @@ ! Radiation has to be computed interactively ! = 60 ==> forcing_astex = .true. -! initial profiles from file: see prof.inp.001 +! initial profiles from file: see prof.inp.001 ! SST,divergence,ug,vg,ufa,vfa varying with time : see ifa_astex.txt file ! Radiation has to be computed interactively ! = 61 ==> forcing_armcu = .true. -! initial profiles from file: see prof.inp.001 +! initial profiles from file: see prof.inp.001 ! sensible and latent heat flux imposed: see ifa_arm_cu_1.txt ! large scale advective forcing & radiative tendencies applied below 1000m: see ifa_arm_cu_2.txt -! use geostrophic wind ug=10m/s vg=0m/s. Duration of the case 53100s +! use geostrophic wind ug=10m/s vg=0m/s. Duration of the case 53100s ! Radiation to be switched off ! > 100 ==> forcing_case = .true. or forcing_case2 = .true. -! initial profiles from case.nc file +! initial profiles from case.nc file ! forcing_type = 0 CALL getin('forcing_type',forcing_type) imp_fcg_gcssold = .false. - ts_fcg_gcssold = .false. - Tp_fcg_gcssold = .false. - Tp_ini_gcssold = .false. - xTurb_fcg_gcssold = .false. + ts_fcg_gcssold = .false. + Tp_fcg_gcssold = .false. + Tp_ini_gcssold = .false. + xTurb_fcg_gcssold = .false. IF (forcing_type .eq.40) THEN CALL getin('imp_fcg',imp_fcg_gcssold) @@ -261,5 +261,5 @@ !Config Desc = meaningless in this case !Config Def = 0. -!Config Help = +!Config Help = time_ini = 0. CALL getin('time_ini',time_ini) @@ -277,5 +277,5 @@ !Config Desc = Grid cell area !Config Def = 1.e11 -!Config Help = +!Config Help = airefi = 1.e11 CALL getin('airephy',airefi) @@ -298,5 +298,5 @@ !Config Desc = surface pressure !Config Def = 102400. -!Config Help = +!Config Help = psurf = 102400. CALL getin('psurf',psurf) @@ -305,8 +305,8 @@ !Config Desc = surface altitude !Config Def = 0. -!Config Help = +!Config Help = zsurf = 0. CALL getin('zsurf',zsurf) -! EV pour accord avec format standard +! EV pour accord avec format standard CALL getin('zorog',zsurf) @@ -340,5 +340,5 @@ !Config Desc = ??? !Config Def = 0.0 0.0 -!Config Help = +!Config Help = wtsurf = 0.0 wqsurf = 0.0 @@ -349,5 +349,5 @@ !Config Desc = albedo !Config Def = 0.09 -!Config Help = +!Config Help = albedo = 0.09 CALL getin('albedo',albedo) @@ -356,5 +356,5 @@ !Config Desc = age de la neige !Config Def = 30.0 -!Config Help = +!Config Help = xagesno = 30.0 CALL getin('agesno',xagesno) @@ -363,5 +363,5 @@ !Config Desc = age de la neige !Config Def = 30.0 -!Config Help = +!Config Help = restart_runoff = 0.0 CALL getin('restart_runoff',restart_runoff) @@ -370,5 +370,5 @@ !Config Desc = initial bucket water content (kg/m2) when land (5std) !Config Def = 30.0 -!Config Help = +!Config Help = qsolinp = 1. CALL getin('qsolinp',qsolinp) @@ -379,7 +379,7 @@ !Config Desc = beta for actual evaporation when prescribed !Config Def = 1.0 -!Config Help = +!Config Help = betaevap = 1. - CALL getin('betaevap',betaevap) + CALL getin('betaevap',betaevap) !Config Key = zpicinp @@ -689,5 +689,5 @@ real :: q(klon,klev,nqtot),omega2(klon,klev) ! real :: ug(klev),vg(klev),fcoriolis - real :: phis(klon) + real :: phis(klon) ! Variables locales pour NetCDF: @@ -719,5 +719,5 @@ ! CALL get_var("controle",tab_cntrl) - + im = tab_cntrl(1) @@ -755,5 +755,5 @@ fxyhypb = .false. ysinus = .false. - IF( tab_cntrl(27).EQ.1. ) ysinus =.true. + IF( tab_cntrl(27).EQ.1. ) ysinus =.true. ENDIF @@ -837,5 +837,5 @@ real :: omega2(klon,klev),rho(klon,klev+1) ! real :: ug(klev),vg(klev),fcoriolis - real :: phis(klon) + real :: phis(klon) ! Variables locales pour NetCDF: @@ -893,5 +893,5 @@ ! tab_cntrl(19) = preff ! -! ..... parametres pour le zoom ...... +! ..... parametres pour le zoom ...... ! tab_cntrl(20) = clon @@ -957,19 +957,19 @@ ! passage d'un champ de la grille scalaire a la grille physique !======================================================================= - + !----------------------------------------------------------------------- ! declarations: ! ------------- - + INTEGER im,jm,ngrid,nfield REAL pdyn(im,jm,nfield) REAL pfi(ngrid,nfield) - + INTEGER i,j,ifield,ig - + !----------------------------------------------------------------------- ! calcul: ! ------- - + DO ifield=1,nfield ! traitement des poles @@ -978,5 +978,5 @@ pdyn(i,jm,ifield)=pfi(ngrid,ifield) ENDDO - + ! traitement des point normaux DO j=2,jm-1 @@ -986,12 +986,12 @@ ENDDO ENDDO - + RETURN END - - + + SUBROUTINE abort_gcm(modname, message, ierr) - + USE IOIPSL ! @@ -1002,9 +1002,9 @@ ! message = stuff to print ! ierr = severity of situation ( = 0 normal ) - + character(len=*) modname integer ierr character(len=*) message - + write(*,*) 'in abort_gcm' call histclo @@ -1084,5 +1084,5 @@ RETURN END - + SUBROUTINE gr_dyn_fi(nfield,im,jm,ngrid,pdyn,pfi) IMPLICIT NONE @@ -1090,19 +1090,19 @@ ! passage d'un champ de la grille scalaire a la grille physique !======================================================================= - + !----------------------------------------------------------------------- ! declarations: ! ------------- - + INTEGER im,jm,ngrid,nfield REAL pdyn(im,jm,nfield) REAL pfi(ngrid,nfield) - + INTEGER j,ifield,ig - + !----------------------------------------------------------------------- ! calcul: ! ------- - + IF(ngrid.NE.2+(jm-2)*(im-1).AND.ngrid.NE.1) & & STOP 'probleme de dim' @@ -1110,5 +1110,5 @@ CALL SCOPY(nfield,pdyn,im*jm,pfi,ngrid) CALL SCOPY(nfield,pdyn(1,jm,1),im*jm,pfi(ngrid,1),ngrid) - + ! traitement des point normaux DO ifield=1,nfield @@ -1118,10 +1118,10 @@ ENDDO ENDDO - + RETURN END - + SUBROUTINE disvert0(pa,preff,ap,bp,dpres,presnivs,nivsigs,nivsig) - + ! Ancienne version disvert dont on a modifie nom pour utiliser ! le disvert de dyn3d (qui permet d'utiliser grille avec ab,bp imposes) @@ -1131,8 +1131,10 @@ ! USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm IMPLICIT NONE - include "paramet.h" + ! !======================================================================= @@ -1160,18 +1162,18 @@ INTEGER np,ierr REAL pi,x - + !----------------------------------------------------------------------- ! pi=2.*ASIN(1.) - + OPEN(99,file='sigma.def',status='old',form='formatted', & & iostat=ierr) - + !----------------------------------------------------------------------- ! cas 1 on lit les options dans sigma.def: ! ---------------------------------------- - + IF (ierr.eq.0) THEN - + print*,'WARNING!!! on lit les options dans sigma.def' READ(99,*) deltaz @@ -1184,5 +1186,5 @@ alpha=deltaz/(llm*h) ! - + DO 1 l = 1, llm dsig(l) = (alpha+(1.-alpha)*exp(-beta*(llm-l)))* & @@ -1190,5 +1192,5 @@ & (1.-l/FLOAT(llm))*delta ) 1 CONTINUE - + sig(1)=1. DO 101 l=1,llm-1 @@ -1196,17 +1198,17 @@ 101 CONTINUE sig(llm+1)=0. - + DO 2 l = 1, llm dsig(l) = sig(l)-sig(l+1) 2 CONTINUE ! - + ELSE !----------------------------------------------------------------------- ! cas 2 ancienne discretisation (LMD5...): ! ---------------------------------------- - + PRINT*,'WARNING!!! Ancienne discretisation verticale' - + h=7. snorm = 0. @@ -1224,16 +1226,16 @@ sig(l) = sig(l+1) + dsig(l) ENDDO - + ENDIF - - + + DO l=1,llm nivsigs(l) = FLOAT(l) ENDDO - + DO l=1,llmp1 nivsig(l)= FLOAT(l) ENDDO - + ! ! .... Calculs de ap(l) et de bp(l) .... @@ -1243,12 +1245,12 @@ ! ..... pa et preff sont lus sur les fichiers start par lectba ..... ! - + bp(llmp1) = 0. - + DO l = 1, llm !c !cc ap(l) = 0. !cc bp(l) = sig(l) - + bp(l) = EXP( 1. -1./( sig(l)*sig(l)) ) ap(l) = pa * ( sig(l) - bp(l) ) @@ -1256,18 +1258,18 @@ ENDDO ap(llmp1) = pa * ( sig(llmp1) - bp(llmp1) ) - + PRINT *,' BP ' PRINT *, bp PRINT *,' AP ' PRINT *, ap - + DO l = 1, llm dpres(l) = bp(l) - bp(l+1) presnivs(l) = 0.5 *( ap(l)+bp(l)*preff + ap(l+1)+bp(l+1)*preff ) ENDDO - + PRINT *,' PRESNIVS ' PRINT *,presnivs - + RETURN END @@ -1299,5 +1301,5 @@ ! Schema amont pour l'advection verticale en 1D ! w est la vitesse verticale dp/dt en Pa/s -! Traitement en volumes finis +! Traitement en volumes finis ! d / dt ( zm q ) = delta_z ( omega q ) ! d / dt ( zm ) = delta_z ( omega ) @@ -1327,5 +1329,5 @@ zwq(llm+1)=0. zw(llm+1)=0. - + do l=1,llm qold=q(l) @@ -1334,5 +1336,5 @@ enddo - + return end @@ -1343,11 +1345,11 @@ SUBROUTINE advect_va(llm,omega,d_t_va,d_q_va,d_u_va,d_v_va, & & q,temp,u,v,play) -!itlmd +!itlmd !---------------------------------------------------------------------- -! Calcul de l'advection verticale (ascendance et subsidence) de +! Calcul de l'advection verticale (ascendance et subsidence) de ! temperature et d'humidite. Hypothese : ce qui rentre de l'exterieur -! a les memes caracteristiques que l'air de la colonne 1D (WTG) ou -! sans WTG rajouter une advection horizontale -!---------------------------------------------------------------------- +! a les memes caracteristiques que l'air de la colonne 1D (WTG) ou +! sans WTG rajouter une advection horizontale +!---------------------------------------------------------------------- implicit none INCLUDE "YOMCST.h" @@ -1371,10 +1373,10 @@ & /(play(l)-play(l+1)) - d_q_va(l,:)= -omgdown*(q(l,:)-q(l+1,:))/(play(l)-play(l+1)) - - d_u_va(l)= -omgdown*(u(l)-u(l+1))/(play(l)-play(l+1)) - d_v_va(l)= -omgdown*(v(l)-v(l+1))/(play(l)-play(l+1)) - - + d_q_va(l,:)= -omgdown*(q(l,:)-q(l+1,:))/(play(l)-play(l+1)) + + d_u_va(l)= -omgdown*(u(l)-u(l+1))/(play(l)-play(l+1)) + d_v_va(l)= -omgdown*(v(l)-v(l+1))/(play(l)-play(l+1)) + + elseif(l.eq.llm) then omgup=min(omega(l),0.0) @@ -1387,5 +1389,5 @@ d_u_va(l)= -omgup*(u(l-1)-u(l))/(play(l-1)-play(l)) d_v_va(l)= -omgup*(v(l-1)-v(l))/(play(l-1)-play(l)) - + else omgup=min(omega(l),0.0) @@ -1400,14 +1402,14 @@ d_q_va(l,:)= -omgdown*(q(l,:)-q(l+1,:)) & & /(play(l)-play(l+1))- & - & omgup*(q(l-1,:)-q(l,:))/(play(l-1)-play(l)) + & omgup*(q(l-1,:)-q(l,:))/(play(l-1)-play(l)) d_u_va(l)= -omgdown*(u(l)-u(l+1)) & & /(play(l)-play(l+1))- & - & omgup*(u(l-1)-u(l))/(play(l-1)-play(l)) + & omgup*(u(l-1)-u(l))/(play(l-1)-play(l)) d_v_va(l)= -omgdown*(v(l)-v(l+1)) & & /(play(l)-play(l+1))- & & omgup*(v(l-1)-v(l))/(play(l-1)-play(l)) - + endif - + enddo !fin itlmd @@ -1417,11 +1419,11 @@ SUBROUTINE lstendH(llm,nqtot,omega,d_t_va,d_q_va, & & q,temp,u,v,play) -!itlmd +!itlmd !---------------------------------------------------------------------- -! Calcul de l'advection verticale (ascendance et subsidence) de +! Calcul de l'advection verticale (ascendance et subsidence) de ! temperature et d'humidite. Hypothese : ce qui rentre de l'exterieur -! a les memes caracteristiques que l'air de la colonne 1D (WTG) ou -! sans WTG rajouter une advection horizontale -!---------------------------------------------------------------------- +! a les memes caracteristiques que l'air de la colonne 1D (WTG) ou +! sans WTG rajouter une advection horizontale +!---------------------------------------------------------------------- implicit none INCLUDE "YOMCST.h" @@ -1648,5 +1650,5 @@ !jyg< ! Formule pour q : -! d_q = (1/tau) [rh_targ*qsat(T_new) - q] +! d_q = (1/tau) [rh_targ*qsat(T_new) - q] ! ! Cette formule remplace d_q = (1/tau) [rh_targ - rh] qsat(T_new) @@ -1743,5 +1745,5 @@ & ,dt_mod_cas,ht_mod_cas,vt_mod_cas,dtrad_mod_cas,dq_mod_cas,hq_mod_cas,vq_mod_cas & & ,dth_mod_cas,hth_mod_cas,vth_mod_cas,mxcalc) - + USE dimensions_mod, ONLY: iim, jjm, llm, ndm implicit none Index: LMDZ6/trunk/libf/phylmd/dyn1d/lmdz1d.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/dyn1d/lmdz1d.F90 (revision 5271) +++ LMDZ6/trunk/libf/phylmd/dyn1d/lmdz1d.F90 (revision 5272) @@ -26,6 +26,6 @@ -INCLUDE "1DUTILS.h" -INCLUDE "1Dconv.h" +#include "1DUTILS.h" +#include "1Dconv.h" !#endif Index: LMDZ6/trunk/libf/phylmd/dyn1d/paramet.h =================================================================== --- LMDZ6/trunk/libf/phylmd/dyn1d/paramet.h (revision 5271) +++ (revision ) @@ -1,1 +1,0 @@ -link ../../dyn3d/paramet.h Index: LMDZ6/trunk/libf/phylmd/dyn1d/paramet_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/dyn1d/paramet_mod_h.f90 (revision 5272) +++ LMDZ6/trunk/libf/phylmd/dyn1d/paramet_mod_h.f90 (revision 5272) @@ -0,0 +1,1 @@ +link ../../dyn3d/paramet_mod_h.f90 Index: LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90 (revision 5271) +++ LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90 (revision 5272) @@ -14458,4 +14458,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm +USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, & + ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm implicit none @@ -14464,5 +14466,5 @@ INCLUDE "YOMCST.h" ! -!INCLUDE "paramet.h" +! ! inputs