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

Timestamp:

Dec 9, 2011, 8:52:27 AM (13 years ago)

Author:

emillour

Message:

Mars GCM: more updates for photochemistry from FL: improved aeronomars/surfacearea.F, along with a change in arguments.
EM

File:

• trunk/LMDZ.MARS/libf/phymars/physiq.F (modified) (4 diffs)

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

@@ -308 +308 @@
       real rho(ngridmx,nlayermx)  ! density
       real vmr(ngridmx,nlayermx)  ! volume mixing ratio
-      !real colden(ngridmx,nqmx)   ! vertical column                      !FL
+      REAL colden(ngridmx,nqmx)   ! vertical column of tracers
       REAL mtot(ngridmx)          ! Total mass of water vapor (kg/m2)
       REAL icetot(ngridmx)        ! Total mass of water ice (kg/m2)
@@ -1088 +1088 @@
 
 !           dust and ice surface area
-            call surfacearea(ngrid, nlayer, pplay, zzlay, pt, pq, nq, 
+            call surfacearea(ngrid, nlayer, ptimestep, pplay, zzlay, 
+     $                       pt, pq, pdq, nq, 
      $                       rdust, rice, tau, tauscaling, 
      $                       surfdust, surfice)
@@ -1487 +1488 @@
              if (thermochem.or.photochem) then
                 do iq=1,nq
-                   if ((noms(iq).eq."o").or.(noms(iq).eq."co2").or.
-     .                (noms(iq).eq."co").or.(noms(iq).eq."n2").or.
-     .                (noms(iq).eq."h2").or.
-     .                (noms(iq).eq."o3")) then
-                        do l=1,nlayer
-                          do ig=1,ngrid
-                            vmr(ig,l)=zq(ig,l,iq)*mmean(ig,l)/mmol(iq)
-                          end do
-                        end do
-                        call wstats(ngrid,"vmr_"//trim(noms(iq)),
-     .                     "Volume mixing ratio","mol/mol",3,vmr)
-                   endif
-!                   do ig = 1,ngrid
-!                      colden(ig,iq) = 0.                             !FL
-!                   end do
-!                   do l=1,nlayer                                     !FL
-!                      do ig=1,ngrid                                  !FL
-!                         colden(ig,iq) = colden(ig,iq) + zq(ig,l,iq) !FL
-!     $                                  *(pplev(ig,l)-pplev(ig,l+1)) !FL
-!     $                                  *6.022e22/(mmol(iq)*g)       !FL
-!                      end do                                         !FL
-!                   end do                                            !FL
-!                   call wstats(ngrid,"c_"//trim(noms(iq)),           !FL
-!     $                         "column","mol cm-2",2,colden(1,iq))   !FL
+                   if (noms(iq) .ne. "dust_mass" .and.
+     $                 noms(iq) .ne. "dust_number" .and.
+     $                 noms(iq) .ne. "ccn_mass" .and.
+     $                 noms(iq) .ne. "ccn_number") then
+                   do l=1,nlayer
+                      do ig=1,ngrid
+                         vmr(ig,l)=zq(ig,l,iq)*mmean(ig,l)/mmol(iq)
+                      end do
+                   end do
+                   call wstats(ngrid,"vmr_"//trim(noms(iq)),
+     $                         "Volume mixing ratio","mol/mol",3,vmr)
+                   if ((noms(iq).eq."o") .or. (noms(iq).eq."co2").or.
+     $                 (noms(iq).eq."o3")) then                     
+                      call writediagfi(ngrid,"vmr_"//trim(noms(iq)), 
+     $                         "Volume mixing ratio","mol/mol",3,vmr)
+                   end if
+                   do ig = 1,ngrid
+                      colden(ig,iq) = 0.                           
+                   end do
+                   do l=1,nlayer                                    
+                      do ig=1,ngrid                                  
+                         colden(ig,iq) = colden(ig,iq) + zq(ig,l,iq)
+     $                                  *(pplev(ig,l)-pplev(ig,l+1)) 
+     $                                  *6.022e22/(mmol(iq)*g)       
+                      end do                                        
+                   end do                                          
+                   call wstats(ngrid,"c_"//trim(noms(iq)),           
+     $                         "column","mol cm-2",2,colden(1,iq))  
+                   call writediagfi(ngrid,"c_"//trim(noms(iq)),  
+     $                             "column","mol cm-2",2,colden(1,iq))
+                   end if
                 end do
              end if ! of if (thermochem.or.photochem)
@@ -1635 +1643 @@
          call WRITEDIAGFI(ngrid,"co2col","CO2 column","kg.m-2",2,
      &                  co2col)
-!!!!! FL
-!            do iq = 1,nq
-!               if (noms(iq) .ne. "dust_mass" .and.
-!     $             noms(iq) .ne. "dust_number") then
-!               call writediagfi(ngrid,"c_"//trim(noms(iq)),         
-!     $                         "column","mol cm-2",2,colden(1,iq))
-!               end if
-!            end do
-!!!!! FL
          endif ! of if (tracer.and.(igcm_co2.ne.0))