Changeset 1902 for trunk/LMDZ.TITAN/libf

Timestamp:

Jan 29, 2018, 12:10:20 PM (7 years ago)

Author:

jvatant

Message:

r1901 was still bugged with mufi tendencies multiplied
2 times by ptimestep !
+ Pass ptimestep to calmufi in order to have tendencies
in X.s-1 in output of the routine.
As YAMMS spits integrated tendencies it's the
only way to rectify the things.
--JVO

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• calmufi.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (3 diffs)

trunk/LMDZ.TITAN/libf/phytitan/calmufi.F90

@@ -1 +1 @@
 
 
-SUBROUTINE calmufi(plev, zlev, play, zlay, temp, pq, zdq)
+SUBROUTINE calmufi(dt, plev, zlev, play, zlay, temp, pq, zdq)
   !! Interface subroutine to YAMMS model for Titan LMDZ GCM.
   !!
@@ -22 +22 @@
   IMPLICIT NONE
 
+  REAL(kind=8), INTENT(IN) :: dt  !! Physics timestep (s).
+  
   REAL(kind=8), DIMENSION(:,:), INTENT(IN) :: plev  !! Pressure levels (Pa).
   REAL(kind=8), DIMENSION(:,:), INTENT(IN) :: zlev  !! Altitude levels (m).
@@ -151 +153 @@
   END DO ! loop on ilon
 
+  ! YAMMS gives a tendency which is integrated for all the timestep but in the GCM 
+  ! we want to have routines spitting tendencies in s-1 -> let's divide !
+  zdq(:,:,:) = zdq(:,:,:) / dt
+
 END SUBROUTINE calmufi

trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90

@@ -403 +403 @@
     !   Or one can put calmufi in MMP_GCM module (in muphytitan).
     INTERFACE
-      SUBROUTINE calmufi(plev, zlev, play, zlay, temp, pq, zdq)
+      SUBROUTINE calmufi(dt, plev, zlev, play, zlay, temp, pq, zdq)
+        REAL(kind=8), INTENT(IN)                 :: dt    !! Physics timestep (s).
         REAL(kind=8), DIMENSION(:,:), INTENT(IN) :: plev  !! Pressure levels (Pa).
         REAL(kind=8), DIMENSION(:,:), INTENT(IN) :: zlev  !! Altitude levels (m).
@@ -1142 +1143 @@
 #ifdef USE_QTEST
                if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
-                  call calmufi(pplev,zzlev,pplay,zzlay,pt,tpq,zdqmufi)
+                  call calmufi(ptimestep,pplev,zzlev,pplay,zzlay,pt,tpq,zdqmufi)
                else
-                  call calmufi(zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,tpq,zdqmufi)
+                  call calmufi(ptimestep,zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,tpq,zdqmufi)
                endif
-               tpq(:,:,:) = tpq(:,:,:) + zdqmufi(1:ngrid,1:nlayer,1:nq)
+               tpq(:,:,:) = tpq(:,:,:) + zdqmufi(1:ngrid,1:nlayer,1:nq)*ptimestep ! only manipulation of tpq->*ptimesep here
 #else
             ! Inside this routine we will split 2D->1D, intensive->extensive and separate different types of tracers
@@ -1152 +1153 @@
 
                if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
-                  call calmufi(pplev,zzlev,pplay,zzlay,pt,pq,zdqmufi)
+                  call calmufi(ptimestep,pplev,zzlev,pplay,zzlay,pt,pq,zdqmufi)
                else
-                  call calmufi(zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,pq,zdqmufi)
+                  call calmufi(ptimestep,zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,pq,zdqmufi)
                endif
 
             pdq(1:ngrid,1:nlayer,1:nq) = pdq(1:ngrid,1:nlayer,1:nq) + zdqmufi(1:ngrid,1:nlayer,1:nq)
-            ! We don't re-multiply by timestep, it is already taken into account in zdqmufi,
-            ! since inimufi has initialized YAMMS with a given ts.
 #endif
          endif ! end of 'callmufi'