Changeset 645 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

May 3, 2012, 8:44:26 AM (13 years ago)

Author:

emillour

Message:

Mars GCM:

• Update of molecular diffusion routines (diffusion.h, moldiff_red.F90 and moldiffcoeff_red.F): optimized to run faster and diffuse only specific tracers (if they are present).
• bugs fixed in simpleclouds.F (extra arguments) and watercloud.F (wrong arguments in call to simpleclouds and rdust() should only be recomputed if dust_mass & dust_number tracers are available).

JYC+EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• simpleclouds.F (modified) (2 diffs)
• watercloud.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/simpleclouds.F

@@ -1 +1 @@
       subroutine simpleclouds(ngrid,nlay,ptimestep,
-     &             pplev,pplay,pzlay,pt,pdt,
+     &             pplay,pzlay,pt,pdt,
      &             pq,pdq,pdqcloud,pdtcloud,
      &             nq,tau,rice)
@@ -41 +41 @@
       integer nq                 ! nombre de traceurs
       REAL ptimestep             ! pas de temps physique (s)
-      REAL pplev(ngrid,nlay+1)   ! pression aux inter-couches (Pa)
+!      REAL pplev(ngrid,nlay+1)   ! pression aux inter-couches (Pa)
       REAL pplay(ngrid,nlay)     ! pression au milieu des couches (Pa)
       REAL pzlay(ngrid,nlay)     ! altitude at the middle of the layers

trunk/LMDZ.MARS/libf/phymars/watercloud.F

@@ -210 +210 @@
      &             pplay,pzlay,pt,subpdt,
      &             pq,subpdq,subpdqcloud,subpdtcloud,
-     &             nq,tau)
+     &             nq,tau,rice)
         ENDIF
 
@@ -360 +360 @@
         ENDDO
        ELSE
-        DO l=1,nlay
+        
+        if ((igcm_dust_mass.ne.0).and.(igcm_dust_number.ne.0)) then
+         ! recompute rdust(), if we have dust_mass & dust_number tracers
+         DO l=1,nlay
           DO ig=1,ngrid
-
-          rdust(ig,l)=
+           rdust(ig,l)=
      &      CBRT(r3n_q*(pq(ig,l,igcm_dust_mass)+
      &           (pdq(ig,l,igcm_dust_mass)
@@ -370 +372 @@
      &           (pdq(ig,l,igcm_dust_number)+
      &            pdqcloud(ig,l,igcm_dust_number)*ptimestep)))
-          rdust(ig,l)=min(max(rdust(ig,l),1.e-10),500.e-6)
-
+           rdust(ig,l)=min(max(rdust(ig,l),1.e-10),500.e-6)
+          ENDDO
+         ENDDO
+        endif ! of if ((igcm_dust_mass.ne.0).and.(igcm_dust_number.ne.0))
+        
+        DO l=1,nlay
+          DO ig=1,ngrid
             ccntyp = 
      &     1.3e+8*max(tau(ig,1),0.001)/0.1*exp(-pzlay(ig,l)/10000.)