Changeset 1999 for LMDZ5/branches/testing/libf/phylmd/thermcell_dq.F90

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/thermcell_dq.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/phylmd/thermcell_dq.F90

@@ -40 +40 @@
 
 ! Old explicite scheme
-      if (impl==-1) then
-         call thermcell_dq_o(ngrid,nlay,ptimestep,fm,entr,  &
+      if (impl<=-1) then
+         call thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
      &           masse,q,dq,qa,lev_out)
          return
@@ -53 +53 @@
             cfl=max(cfl,fm(ig,k)/zzm)
             if (entr(ig,k).gt.zzm) then
-               print*,'entr dt > m ',entr(ig,k)*ptimestep,masse(ig,k)
-               abort_message = ''
+               print*,'entr*dt>m,1',k,entr(ig,k)*ptimestep,masse(ig,k)
+               abort_message = 'entr dt > m, 1st'
                CALL abort_gcm (modname,abort_message,1)
             endif
@@ -124 +124 @@
    else
       do k=nlay-1,1,-1
-         q(:,k)=(masse(:,k)*q(:,k)/ptimestep+fqa(:,k)-fqa(:,k+1)+fm(:,k+1)*q(:,k+1)) &
-     &               /(fm(:,k)+masse(:,k)/ptimestep)
+! FH debut de modif : le calcul ci dessous modifiait numériquement
+! la concentration quand le flux de masse etait nul car on divisait
+! puis multipliait par masse/ptimestep.
+!        q(:,k)=(masse(:,k)*q(:,k)/ptimestep+fqa(:,k)-fqa(:,k+1)+fm(:,k+1)*q(:,k+1)) &
+!    &               /(fm(:,k)+masse(:,k)/ptimestep)
+         q(:,k)=(q(:,k)+ptimestep/masse(:,k)*(fqa(:,k)-fqa(:,k+1)+fm(:,k+1)*q(:,k+1))) &
+      &               /(1.+fm(:,k)*ptimestep/masse(:,k))
+! FH fin de modif.
       enddo
    endif
@@ -144 +150 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      subroutine thermcell_dq_o(ngrid,nlay,ptimestep,fm,entr,  &
+      subroutine thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
      &           masse,q,dq,qa,lev_out)
       implicit none
@@ -157 +163 @@
 !=======================================================================
 
-      integer ngrid,nlay
+      integer ngrid,nlay,impl
 
       real ptimestep
@@ -188 +194 @@
             cfl=max(cfl,fm(ig,k)/zzm)
             if (entr(ig,k).gt.zzm) then
-               print*,'entr dt > m ',entr(ig,k)*ptimestep,masse(ig,k)
-               abort_message = ''
+               print*,'entr*dt>m,2',k,entr(ig,k)*ptimestep,masse(ig,k)
+               abort_message = 'entr dt > m, 2nd'
                CALL abort_gcm (modname,abort_message,1)
             endif