Changeset 420 for trunk/LMDZ.MARS/libf/phymars/aeropacity.F

Timestamp:

Nov 24, 2011, 9:54:55 AM (13 years ago)

Author:

tnavarro

Message:

24/11/11 == TN

corrected minor bug in updatereffrad.F : reffdust was not saved

ccn_factor as not correctly used in sedimentation.

It is now initialized in inifis.F, declared in tracer.h and
used in both simpleclouds.F & callsedim.F to update ice radius.

Commented diagfi outputs in aeropacity.F & improvedclouds.F for non scavenging users.

File:

• trunk/LMDZ.MARS/libf/phymars/aeropacity.F (modified) (2 diffs)

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

@@ -442 +442 @@
       
 c output for debug
-        IF (ngrid.NE.1) THEN
-             CALL WRITEDIAGFI(ngridmx,'taudusttmp','virtual tau dust',
-     &      '#',2,taudusttmp)
-             CALL WRITEDIAGFI(ngridmx,'tausca','tauscaling',
-     &      '#',2,tauscaling)
-        ELSE
-             CALL WRITEDIAGFI(ngridmx,'taudusttmp','virtual tau dust',
-     &      '#',0,taudusttmp)
-             CALL WRITEDIAGFI(ngridmx,'tausca','tauscaling',
-     &      '#',0,tauscaling)
-        ENDIF
+c        IF (ngrid.NE.1) THEN
+c             CALL WRITEDIAGFI(ngridmx,'taudusttmp','virtual tau dust',
+c     &      '#',2,taudusttmp)
+c             CALL WRITEDIAGFI(ngridmx,'tausca','tauscaling',
+c     &      '#',2,tauscaling)
+c        ELSE
+c             CALL WRITEDIAGFI(ngridmx,'taudusttmp','virtual tau dust',
+c     &      '#',0,taudusttmp)
+c             CALL WRITEDIAGFI(ngridmx,'tausca','tauscaling',
+c     &      '#',0,tauscaling)
+c        ENDIF
 c -----------------------------------------------------------------
 c Column integrated visible optical depth in each point
@@ -466 +466 @@
 c Density scaled opacity and column opacity output
 c -----------------------------------------------------------------
-      dsodust(1:ngrid,1:nlayer) = 0.
-      DO iaer=1,naerdust
-        DO l=1,nlayermx
-          DO ig=1,ngrid
-            dsodust(ig,l) = dsodust(ig,l) +
-     &                      aerosol(ig,l,iaerdust(iaer)) * g /
-     &                      (pplev(ig,l) - pplev(ig,l+1))
-          ENDDO
-        ENDDO
-        IF (ngrid.NE.1) THEN
-          write(txt2,'(i1.1)') iaer
-          call WRITEDIAGFI(ngridmx,'taudust'//txt2,
-     &                    'Dust col opacity',
-     &                    ' ',2,tau(1,iaerdust(iaer)))
-          IF (callstats) THEN
-            CALL wstats(ngridmx,'taudust'//txt2,
-     &                 'Dust col opacity',
-     &                 ' ',2,tau(1,iaerdust(iaer)))
-          ENDIF
-        ENDIF
-      ENDDO
-
-      IF (ngrid.NE.1) THEN
+c      dsodust(1:ngrid,1:nlayer) = 0.
+c      DO iaer=1,naerdust
+c        DO l=1,nlayermx
+c          DO ig=1,ngrid
+c            dsodust(ig,l) = dsodust(ig,l) +
+c     &                      aerosol(ig,l,iaerdust(iaer)) * g /
+c     &                      (pplev(ig,l) - pplev(ig,l+1))
+c          ENDDO
+c        ENDDO
+c        IF (ngrid.NE.1) THEN
+c          write(txt2,'(i1.1)') iaer
+c          call WRITEDIAGFI(ngridmx,'taudust'//txt2,
+c     &                    'Dust col opacity',
+c     &                    ' ',2,tau(1,iaerdust(iaer)))
+c          IF (callstats) THEN
+c            CALL wstats(ngridmx,'taudust'//txt2,
+c     &                 'Dust col opacity',
+c     &                 ' ',2,tau(1,iaerdust(iaer)))
+c          ENDIF
+c        ENDIF
+c      ENDDO
+
+c      IF (ngrid.NE.1) THEN
 c       CALL WRITEDIAGFI(ngridmx,'dsodust','tau*g/dp',
 c    &                    'm2.kg-1',3,dsodust)
-        IF (callstats) THEN
-          CALL wstats(ngridmx,'dsodust',
-     &               'tau*g/dp',
-     &               'm2.kg-1',3,dsodust)
-        ENDIF
-      ELSE
-        CALL WRITEDIAGFI(ngrid,"dsodust","dsodust","m2.kg-1",1,
-     &                   dsodust)
-      ENDIF ! of IF (ngrid.NE.1)
+c        IF (callstats) THEN
+c          CALL wstats(ngridmx,'dsodust',
+c     &               'tau*g/dp',
+c     &               'm2.kg-1',3,dsodust)
+c        ENDIF
+c      ELSE
+c        CALL WRITEDIAGFI(ngrid,"dsodust","dsodust","m2.kg-1",1,
+c     &                   dsodust)
+c      ENDIF ! of IF (ngrid.NE.1)
 c -----------------------------------------------------------------
       return