Changeset 1508 for trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

Timestamp:

Jan 15, 2016, 8:27:16 AM (9 years ago)

Author:

emillour

Message:

Common dynamics:
Updates in the dynamics (seq and ) to keep up with updates
in LMDZ5 (up to LMDZ5 trunk, rev 2325):
IMPORTANT: Modifications for isotopes are only done in dyn3d, not in dyn3dpar

as in LMDZ5 these modifications were done in dyn3dmem.
Related LMDZ5 revisions are r2270 and r2281

• in dynlonlat_phylonlat:
• add module "grid_atob_m.F90" (a regridding utility so far only used by phylmd/ce0l.F90, used to be dyn3d_common/grid_atob.F)

• in misc:
• follow up updates on wxios.F (add missing_val module variable)

• in dyn3d_common:
• pression.F => pression.F90
• misc_mod.F90: moved from misc to dyn3d_common
• added new iso_verif_dyn.F
• covcont.F => covcont.F90
• infotrac.F90 : add handling of isotopes (reading of corresponding traceur.def for planets not implemented)
• dynetat0.F => dynetat0.F90 with some code factorization
• dynredem.F => dynredem.F90 with some code factorization
• added dynredem_mod.F90: routines used by dynredem
• iniacademic.F90 : added isotopes-related initialization for Earth case

• in dyn3d:
• added check_isotopes.F
• modified (isotopes) advtrac.F90, caladvtrac.F
• guide_mod.F90: ported updates
• leapfrog.F : (isotopes) updates (NB: call integrd with nqtot tracers)
• qminimium.F : adaptations for isotopes (copied over, except that #include comvert.h is not needed).
• vlsplt.F: adaptations for isotopes (copied over, except than #include logic.h, comvert.h not needed, and replace "include comconst.h" with use comconst_mod, ONLY: pi)
• vlspltqs.F : same as vlsplt.F, but also keeping added modification for CP(T)

• in dyn3dpar:
• leapfrog_p.F: remove unecessary #ifdef CPP_EARTH cpp flag. and call integrd_p with nqtot tracers (only important for Earth)
• dynredem_p.F => dynredem_p.F90 and some code factorization
• and no isotopes-relates changes in dyn3dpar (since these changes have been made in LMDZ5 dyn3dmem).

EM

File:

• trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

@@ -771 +771 @@
 !       CALL FTRACE_REGION_BEGIN("integrd")
 
-       CALL integrd_p ( 2,vcovm1,ucovm1,tetam1,psm1,massem1 ,
+       CALL integrd_p (nqtot,vcovm1,ucovm1,tetam1,psm1,massem1 ,
      $         dv,du,dteta,dq,dp,vcov,ucov,teta,q,ps,masse,phis )
 !     $              finvmaold                                    )
@@ -886 +886 @@
       IF (ip_ebil_dyn.ge.1 ) THEN 
           ztit='bil dyn'
-! Ehouarn: be careful, diagedyn is Earth-specific (includes ../phylmd/..)!
+! Ehouarn: be careful, diagedyn is Earth-specific!
            IF (planet_type.eq."earth") THEN
-#ifdef CPP_EARTH
             CALL diagedyn(ztit,2,1,1,dtphys
      &    , ucov    , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
-#endif
            ENDIF
       ENDIF