Changeset 1508 for trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.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/dyn3d/leapfrog.F (modified) (12 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -12 +12 @@
       use IOIPSL
 #endif
-      USE infotrac, ONLY: nqtot
+      USE infotrac, ONLY: nqtot,ok_iso_verif
       USE guide_mod, ONLY : guide_main
       USE write_field, ONLY: writefield
@@ -305 +305 @@
       jH_cur = jH_cur - int(jH_cur)
 
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 321')
+        endif !if (ok_iso_verif) then
 
 #ifdef CPP_IOIPSL
@@ -337 +340 @@
 !      CALL SCOPY   ( ijp1llm,   masse, 1, finvmaold,     1 )
 !      CALL filtreg ( finvmaold ,jjp1, llm, -2,2, .TRUE., 1 )
+
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 400')
+        endif !if (ok_iso_verif) then
 
    2  CONTINUE ! Matsuno backward or leapfrog step begins here
@@ -381 +388 @@
 #endif
 
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 589')
+        endif !if (ok_iso_verif) then
+
 c-----------------------------------------------------------------------
 c   calcul des tendances dynamiques:
@@ -419 +430 @@
 c   -------------------------------------------------------------
 
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,
+     &           'leapfrog 686: avant caladvtrac')
+        endif !if (ok_iso_verif) then
+
       IF( forward. OR . leapf )  THEN
 ! Ehouarn: NB: fields sent to advtrac are those at the beginning of the time step
@@ -443 +459 @@
 c   ----------------------------------
 
-
-       CALL integrd ( 2,vcovm1,ucovm1,tetam1,psm1,massem1 ,
+        if (ok_iso_verif) then
+           write(*,*) 'leapfrog 720' 
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 756')
+        endif !if (ok_iso_verif) then
+        
+       CALL integrd ( nqtot,vcovm1,ucovm1,tetam1,psm1,massem1 ,
      $         dv,du,dteta,dq,dp,vcov,ucov,teta,q,ps,masse,phis )
 !     $              finvmaold                                    )
+
+       if (ok_iso_verif) then
+          write(*,*) 'leapfrog 724'
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 762')
+        endif !if (ok_iso_verif) then
 
        IF ((planet_type.eq."titan").and.(tidal)) then
@@ -519 +544 @@
          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
             CALL diagedyn(ztit,2,1,1,dtphys
@@ -619 +644 @@
         CALL massdair(p,masse)
 
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 1196')
+        endif !if (ok_iso_verif) then
+
 c-----------------------------------------------------------------------
 c   dissipation horizontale et verticale  des petites echelles:
@@ -717 +746 @@
 c   preparation du pas d'integration suivant  ......
 
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 1509')
+        endif !if (ok_iso_verif) then
+
       IF ( .NOT.purmats ) THEN
 c       ........................................................
@@ -776 +809 @@
 
             ENDIF ! of IF((MOD(itau,iperiod).EQ.0).OR.(itau.EQ.itaufin))
+
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 1584')
+        endif !if (ok_iso_verif) then
 
 c-----------------------------------------------------------------------
@@ -858 +895 @@
       ELSE ! of IF (.not.purmats)
 
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 1664')
+        endif !if (ok_iso_verif) then
+
 c       ........................................................
 c       ..............       schema  matsuno        ...............
@@ -880 +921 @@
 
             ELSE ! of IF(forward) i.e. backward step
+
+        if (ok_iso_verif) then
+           call check_isotopes_seq(q,ip1jmp1,'leapfrog 1698')
+        endif !if (ok_iso_verif) then  
 
               IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin) THEN