Changeset 624 for trunk/LMDZ.MARS/libf

Timestamp:

Apr 17, 2012, 4:41:54 PM (13 years ago)

Author:

acolaitis

Message:

Thermals: corrected the problem with advection of momentum.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• calltherm_interface.F90 (modified) (6 diffs)
• thermcell_main_mars.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/calltherm_interface.F90

@@ -256 +256 @@
 
             d_t_the(:,:)=d_t_the(:,:)*ptimestep*fact
-!            d_u_the(:,:)=d_u_the(:,:)*fact
-!            d_v_the(:,:)=d_v_the(:,:)*fact
+            d_u_the(:,:)=d_u_the(:,:)*ptimestep*fact
+            d_v_the(:,:)=d_v_the(:,:)*ptimestep*fact
 !            dq2_the(:,:)=dq2_the(:,:)*fact
             if (ico2 .ne. 0) then
-               d_q_the(:,:,ico2)=d_q_the(:,:,ico2)*fact
+               d_q_the(:,:,ico2)=d_q_the(:,:,ico2)*ptimestep*fact
             endif
 
@@ -287 +287 @@
 !  accumulation de la tendance
 
-            d_t_ajs(:,:)=d_t_ajs(:,:)+d_t_the(:,:)
-!           d_u_ajs(:,:)=d_u_ajs(:,:)+d_u_the(:,:)
-!           d_v_ajs(:,:)=d_v_ajs(:,:)+d_v_the(:,:)
+           d_t_ajs(:,:)=d_t_ajs(:,:)+d_t_the(:,:)
+           d_u_ajs(:,:)=d_u_ajs(:,:)+d_u_the(:,:)
+           d_v_ajs(:,:)=d_v_ajs(:,:)+d_v_the(:,:)
             if (ico2 .ne. 0) then
                d_q_ajs(:,:,ico2)=d_q_ajs(:,:,ico2)+d_q_the(:,:,ico2)
@@ -297 +297 @@
 
             zt(:,:) = zt(:,:) + d_t_the(:,:)
-!            zu(:,:) = zu(:,:) + d_u_the(:,:)
-!            zv(:,:) = zv(:,:) + d_v_the(:,:)
+            zu(:,:) = zu(:,:) + d_u_the(:,:)
+            zv(:,:) = zv(:,:) + d_v_the(:,:)
             if (ico2 .ne. 0) then
              pq_therm(:,:,ico2) = &
-     &          pq_therm(:,:,ico2) + d_q_the(:,:,ico2)*ptimestep
+     &          pq_therm(:,:,ico2) + d_q_the(:,:,ico2)
             endif
 !            q2_therm(:,:) = q2_therm(:,:) + dq2_therm(:,:)
@@ -363 +363 @@
 ! **********************************************************************
 
-! Winds and tracers PDU, PDV, and PDQ are DERIVATIVES
-
-           pdu_th(:,:)=d_u_ajs(:,:)
-           pdv_th(:,:)=d_v_ajs(:,:)
+           pdu_th(:,:)=d_u_ajs(:,:)/ptimestep
+           pdv_th(:,:)=d_v_ajs(:,:)/ptimestep
 
            if(qtransport_thermals) then
               if(tracer) then
-                  pdq_th(:,:,:)=d_q_ajs(:,:,:)
+                  pdq_th(:,:,:)=d_q_ajs(:,:,:)/ptimestep
               endif
            endif
@@ -383 +381 @@
            ENDIF
 
-
-! Temperature PDT is a TENDANCY
            pdt_th(:,:)=d_t_ajs(:,:)/ptimestep
 
@@ -453 +449 @@
         call WRITEDIAGFI(ngridmx,'zmax',  &
      &         'pbl height','m',0,zmaxth)
+        call WRITEDIAGFI(ngridmx,'d_u_th',  &
+     &         'tendance moment','m/s',1,pdu_th)
       else
 

trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90

@@ -186 +186 @@
       detr(:,:)=0.
       fm(:,:)=0.
-!      zu(:,:)=pu(:,:)
-!      zv(:,:)=pv(:,:)
+      zu(:,:)=pu(:,:)
+      zv(:,:)=pv(:,:)
       zhc(:,:)=pt(:,:)/zpopsk(:,:)
 
@@ -1521 +1521 @@
       else
 
-!      modname='momentum'
-!      call thermcell_dqupdown(ngridmx,nlayermx,ptimestep,fm,entr,detr,  &
-!     &     masse,zu,pduadj,ztvd,fm_down,ztv,modname,lmax)
-!
-!      call thermcell_dqupdown(ngridmx,nlayermx,ptimestep,fm,entr,detr,  &
-!     &     masse,zv,pdvadj,ztvd,fm_down,ztv,modname,lmax)
+      call thermcell_dqup(ngridmx,nlayermx,ptimestep                &
+     &      ,fm,entr,  &
+     &     masse,zu,pduadj)
+
+      call thermcell_dqup(ngridmx,nlayermx,ptimestep    &
+     &       ,fm,entr,  &
+     &     masse,zv,pdvadj)
 
       endif