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

Timestamp:

Jan 5, 2018, 4:45:21 PM (7 years ago)

Author:

emillour

Message:

Mars GCM:

• fix in co2cloud.F: use "co2cloudfrac" instead of "cloudfrac" to avoid output naming collisions with the water cycle.

EM

File:

• trunk/LMDZ.MARS/libf/phymars/co2cloud.F (modified) (9 diffs)

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

@@ -173 +173 @@
       REAL ::  zteff(ngrid, nlay)! effective temperature in the cloud,neb
       REAL ::  pqeff(ngrid, nlay, nq)! effective tracers quantities in the cloud
-      REAL ::  cloudfrac(ngrid,nlay) ! cloud fraction
+      REAL ::  co2cloudfrac(ngrid,nlay) ! cloud fraction
       REAL ::  mincloud ! min cloud frac
       DOUBLE PRECISION:: rho,zu,NN,gradT !For Saturation Index computation
@@ -287 +287 @@
         print*,'   i, rad_cldco2(i), Qext1bins(i)'
         do i=1,nbinco2_cld
-          write(*,'(i3,3x,3(e12.6,4x))') i, rad_cldco2(i),
+          write(*,'(i3,3x,3(e13.6,4x))') i, rad_cldco2(i),
      &    Qext1bins(i)
         enddo
@@ -337 +337 @@
 
          spant=spantCO2         ! delta T for the temprature distribution
-         mincloud=0.1           ! min cloudfrac when there is ice  
+         mincloud=0.1           ! min co2cloudfrac when there is ice  
          zteff(:,:)=pt(:,:) 
-         cloudfrac(:,:)=mincloud
+         co2cloudfrac(:,:)=mincloud
          
 c-----Tendencies
@@ -358 +358 @@
 
 
-         call WRITEDIAGFI(ngrid,"pzlev","pzlev","km",3,
+         call WRITEDIAGFI(ngrid,"co2cloud_pzlev","pzlev","km",3,
      &        pzlev)
-         call WRITEDIAGFI(ngrid,"pzlay","pzlay","km",3,
+         call WRITEDIAGFI(ngrid,"co2cloud_pzlay","pzlay","km",3,
      &        pzlay)
-         call WRITEDIAGFI(ngrid,"pplay","pplay","Pa",3,
+         call WRITEDIAGFI(ngrid,"co2cloud_pplay","pplay","Pa",3,
      &        pplay)
 
@@ -412 +412 @@
      &             .or. tcond(ig,l) .le. 0 ) THEN !The entire fraction is saturated
                   zteff(ig,l)=zt(ig,l)
-                  cloudfrac(ig,l)=1.
+                  co2cloudfrac(ig,l)=1.
                ELSE IF (tcond(ig,l) .le. (zt(ig,l)-zdelt)) THEN ! No saturation at all
                   zteff(ig,l)=zt(ig,l)-zdelt
-                  cloudfrac(ig,l)=mincloud
+                  co2cloudfrac(ig,l)=mincloud
                ELSE
-                  cloudfrac(ig,l)=(tcond(ig,l)-zt(ig,l)+zdelt)/
+                  co2cloudfrac(ig,l)=(tcond(ig,l)-zt(ig,l)+zdelt)/
      &                 (2.0*zdelt)
                   zteff(ig,l)=(tcond(ig,l)+zt(ig,l)-zdelt)/2. !Mean temperature of the cloud fraction
                END IF           !ig if (tcond(ig,l) ...
                zteff(ig,l)=zteff(ig,l)-pdt(ig,l)*ptimestep
-               IF (cloudfrac(ig,l).le. mincloud) THEN
-                  cloudfrac(ig,l)=mincloud
-               ELSE IF (cloudfrac(ig,l).gt. 1) THEN
-                  cloudfrac(ig,l)=1.
+               IF (co2cloudfrac(ig,l).le. mincloud) THEN
+                  co2cloudfrac(ig,l)=mincloud
+               ELSE IF (co2cloudfrac(ig,l).gt. 1) THEN
+                  co2cloudfrac(ig,l)=1.
                END IF
              ENDDO
@@ -431 +431 @@
 !SatIndex not favorable for GW : leave pt untouched
              zteff(ig,l)=pt(ig,l)
-             cloudfrac(ig,l)=mincloud
+             co2cloudfrac(ig,l)=mincloud
            ENDIF                 ! of if(SatIndexmap...
          ENDDO ! of DO ig=1,ngrid
@@ -494 +494 @@
             pqeff(:,:,:)=pq(:,:,:) ! prevent from buggs (A. Pottier)
             pqeff(:,:,igcm_ccnco2_mass) =pq(:,:,igcm_ccnco2_mass)/
-     &           cloudfrac(:,:)
+     &           co2cloudfrac(:,:)
             pqeff(:,:,igcm_ccnco2_number)= 
-     &           pq(:,:,igcm_ccnco2_number)/cloudfrac(:,:)
+     &           pq(:,:,igcm_ccnco2_number)/co2cloudfrac(:,:)
             pqeff(:,:,igcm_co2_ice)= pq(:,:,igcm_co2_ice)/
-     &           cloudfrac(:,:)
+     &           co2cloudfrac(:,:)
         ELSE
             pqeff(:,:,:)=pq(:,:,:)
@@ -869 +869 @@
         enddo
       enddo
-!Everything modified by CO2 microphysics must be wrt cloudfrac
+!Everything modified by CO2 microphysics must be wrt co2cloudfrac
       IF (CLFvaryingCO2) THEN
-            DO l=1,nlay
-               DO ig=1,ngrid
-                  pdqcloudco2(ig,l,igcm_ccn_mass)=
-     &             pdqcloudco2(ig,l,igcm_ccn_mass)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_ccnco2_mass)=
-     &             pdqcloudco2(ig,l,igcm_ccnco2_mass)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_ccn_number)=
-     &             pdqcloudco2(ig,l,igcm_ccn_number)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_ccnco2_number)=
-     &             pdqcloudco2(ig,l,igcm_ccnco2_number)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_dust_mass)=
-     &             pdqcloudco2(ig,l,igcm_dust_mass)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_dust_number)=
-     &             pdqcloudco2(ig,l,igcm_dust_number)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_h2o_ice)=
-     &             pdqcloudco2(ig,l,igcm_h2o_ice)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_co2_ice)=
-     &             pdqcloudco2(ig,l,igcm_co2_ice)*cloudfrac(ig,l)
-                  pdqcloudco2(ig,l,igcm_co2)=
-     &             pdqcloudco2(ig,l,igcm_co2)*cloudfrac(ig,l)
-                  pdtcloudco2(ig,l)=pdtcloudco2(ig,l)*cloudfrac(ig,l)
-                  Qext1bins2(ig,l)=Qext1bins2(ig,l)*cloudfrac(ig,l)
-               ENDDO
-            ENDDO   
+        DO l=1,nlay
+          DO ig=1,ngrid
+            pdqcloudco2(ig,l,igcm_ccn_mass)=
+     &        pdqcloudco2(ig,l,igcm_ccn_mass)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_ccnco2_mass)=
+     &        pdqcloudco2(ig,l,igcm_ccnco2_mass)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_ccn_number)=
+     &        pdqcloudco2(ig,l,igcm_ccn_number)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_ccnco2_number)=
+     &        pdqcloudco2(ig,l,igcm_ccnco2_number)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_dust_mass)=
+     &        pdqcloudco2(ig,l,igcm_dust_mass)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_dust_number)=
+     &        pdqcloudco2(ig,l,igcm_dust_number)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_h2o_ice)=
+     &        pdqcloudco2(ig,l,igcm_h2o_ice)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_co2_ice)=
+     &        pdqcloudco2(ig,l,igcm_co2_ice)*co2cloudfrac(ig,l)
+            pdqcloudco2(ig,l,igcm_co2)=
+     &        pdqcloudco2(ig,l,igcm_co2)*co2cloudfrac(ig,l)
+            pdtcloudco2(ig,l)=pdtcloudco2(ig,l)*co2cloudfrac(ig,l)
+            Qext1bins2(ig,l)=Qext1bins2(ig,l)*co2cloudfrac(ig,l)
+          ENDDO
+        ENDDO   
       ENDIF
 ! opacity in mesh ig is the sum over l of Qext1bins2: Is this true ?
@@ -910 +910 @@
       call WRITEdiagfi(ngrid,"riceco2","ice radius","m"
      &        ,3,riceco2)         
-      call WRITEdiagfi(ngrid,"cloudfrac","co2 cloud fraction"
-     &        ," ",3,cloudfrac)
+      call WRITEdiagfi(ngrid,"co2cloudfrac","co2 cloud fraction"
+     &        ," ",3,co2cloudfrac)
       call WRITEdiagfi(ngrid,"rsedcloudco2","rsed co2"
      &        ,"m",3,rsedcloudco2)