Changeset 1649 for trunk

Timestamp:

Jan 24, 2017, 6:41:02 PM (8 years ago)

Author:

jaudouard

Message:

Cleaning of the CO2 clouds scheme outputs, now 3D ready; Added callphys.def and traceur.def co2clouds files in the deftank

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• deftank/callphys.def.co2clouds (added)
• deftank/traceur.def.co2clouds (added)
• libf/phymars/co2cloud.F (modified) (7 diffs)
• libf/phymars/improvedCO2clouds.F (modified) (11 diffs)
• libf/phymars/physiq_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/README

@@ -2369 +2369 @@
 -  Moved CO2 clouds outuputs from physiq_mod.F to co2cloud.F
 -  Removed some CO2 clouds properties computation in physiq_mod.F (now done in post-treatment)
+
+== 24/01/2017 == JA
+-Modification of CO2 clouds routines : removal of some screen ouputs, modification for 3D of the writediagfi outputs in co2cloud.F, improvedCO2clouds.F and physiq_mod.F
+-callphys.def.co2clouds was added in deftank. It contains the necessary flags and constant for including co2clouds
+-traceur.def.co2clouds was added in deftank. It supplies the necessary tracers for running the co2 clouds scheme

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

@@ -256 +256 @@
        DO l=1, nlay
           DO ig=1,ngrid
-             Niceco2=tempo_traceurs(ig,l,igcm_co2_ice)
+             Niceco2=max(tempo_traceurs(ig,l,igcm_co2_ice),1.e-30)
              Nccnco2=max(tempo_traceurs(ig,l,igcm_ccnco2_number),
      &            1.e-30)
@@ -271 +271 @@
                 rdust(ig,l)=max(rdust(ig,l),1.e-9)    
              end if
-             rhocloudco2t(ig,l) = (Niceco2 *rho_ice_co2 
-     &            + Qccnco2*rho_dust)
-     &            / (Niceco2 + Qccnco2)
+c             rhocloudco2t(ig,l) = (Niceco2 *rho_ice_co2 
+c     &            + Qccnco2*rho_dust)
+c     &            / (Niceco2 + Qccnco2)
              riceco2(ig,l)= Niceco2*3.0/
      &            (4.0*rho_ice_co2*pi*Nccnco2)
      &            +rdust(ig,l)*rdust(ig,l)*rdust(ig,l)
              riceco2(ig,l)=riceco2(ig,l)**(1.0/3.0)
-             write(*,*) "in co2clouds, rice = ",riceco2(ig,l)
-             write(*,*) "in co2clouds, rho = ",rhocloudco2t(ig,l)
-
-              call updaterice_microCO2(Niceco2,Qccnco2,Nccnco2,
+c             write(*,*) "in co2clouds, rice = ",riceco2(ig,l)
+c             write(*,*) "in co2clouds, rho = ",rhocloudco2t(ig,l)
+
+             call updaterice_microCO2(Niceco2,Qccnco2,Nccnco2,
      &            tauscaling(ig),riceco2(ig,l),rhocloudco2t(ig,l)) 
-              write(*,*) "in co2clouds, rice update = ",riceco2(ig,l)
-              write(*,*) "in co2clouds, rho update = "
-     &             ,rhocloudco2t(ig,l)
+c              write(*,*) "in co2clouds, rice update = ",riceco2(ig,l)
+c              write(*,*) "in co2clouds, rho update = "
+c     &             ,rhocloudco2t(ig,l)
 
               rsedcloudco2(ig,l)=max(riceco2(ig,l)*
@@ -291 +291 @@
      &            rdust(ig,l))
              rsedcloudco2(ig,l)=min(rsedcloudco2(ig,l),5.e-4)
-             write(*,*) 'Rsedcloud = ',rsedcloudco2(ig,l)
+c             write(*,*) 'Rsedcloud = ',rsedcloudco2(ig,l)
              !write(*,*) 'Rhocloudco2 = ',rhocloudco2t(ig,l)
 
@@ -657 +657 @@
      &       pdqcloudco2(ig,l,igcm_ccnco2_mass))*ptimestep)*
      &       tauscaling(ig),1.e-30)
-        rhocloudco2t(ig,l) = (Niceco2 *rho_ice_co2 + Qccnco2*rho_dust)
-     &       / (Niceco2 + Qccnco2)
+c        rhocloudco2t(ig,l) = (Niceco2 *rho_ice_co2 + Qccnco2*rho_dust)
+c     &       / (Niceco2 + Qccnco2)
 c        rhocloudco2(ig,l) = min(max(rhocloudco2t,rho_ice_co2),rho_dust)
 
@@ -669 +669 @@
 
         riceco2(ig,l)=riceco2(ig,l)**(1.0/3.0)
-        write(*,*) "In co2cloud, after loop, riceco2 =",riceco2(ig,l)
-        write(*,*) "In co2cloud, after loop, rhoco2 ="
-     &       ,rhocloudco2t(ig,l)
+c        write(*,*) "In co2cloud, after loop, riceco2 =",riceco2(ig,l)
+c        write(*,*) "In co2cloud, after loop, rhoco2 ="
+c     &       ,rhocloudco2t(ig,l)
 
         call updaterice_microCO2(Niceco2,Qccnco2,Nccnco2,
      &             tauscaling(ig),riceco2(ig,l),rhocloudco2t(ig,l))
 
-        write(*,*) "In co2cloud, after loop and update, riceco2 ="
-     &       ,riceco2(ig,l)
-        write(*,*) "In co2cloud, after loop and update, rhoco2 ="
-     &       ,rhocloudco2t(ig,l)
+c        write(*,*) "In co2cloud, after loop and update, riceco2 ="
+c     &       ,riceco2(ig,l)
+c        write(*,*) "In co2cloud, after loop and update, rhoco2 ="
+c     &       ,rhocloudco2t(ig,l)
 
         if ( Niceco2 
@@ -752 +752 @@
      &              (mmean(ig,l)/44.01)*pplay(ig,l)/zqsatco2(ig,l)
                   
-               write(*,*) "In CO2 pt,sat ",pt(ig,l),satuco2(ig,l)
+c               write(*,*) "In CO2 pt,sat ",pt(ig,l),satuco2(ig,l)
             enddo
          enddo
-       call WRITEDIAGFI(ngrid,"satuco2","vap in satu","kg/kg",1,
+       call WRITEDIAGFI(ngrid,"satuco2","vap in satu","kg/kg",3,
      &        satuco2)
        call WRITEdiagfi(ngrid,"riceco2","ice radius","m"
-     &        ,1,riceco2)
+     &        ,3,riceco2)
 ! or output in diagfi.nc (for testphys1d)
 c         call WRITEDIAGFI(ngrid,'ps','Surface pressure','Pa',0,ps)
@@ -764 +764 @@
 c     &                       'K JA',1,pt)
          
-      call WRITEdiagfi(ngrid,"rsedcloudco2","rsed co2","m",1,
+      call WRITEdiagfi(ngrid,"rsedcloudco2","rsed co2","m",3,
      &   rsedcloudco2)
       

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

@@ -302 +302 @@
 
            IF ( satu .ge. 1d0 ) THEN ! if there is condensation
-              write(*,*)
-              write(*,*) "l, pco2, satu= ",l,pco2,satu
+c              write(*,*)
+c              write(*,*) "l, pco2, satu= ",l,pco2,satu
 c              Masse_atm=mmean(ig,l)*1.e-3*pplay(ig,l)/rgp/zt(ig,l) !Kg par couche
 
@@ -309 +309 @@
               call updaterccn(zq(ig,l,igcm_dust_mass),
      &             zq(ig,l,igcm_dust_number),rdust(ig,l),tauscaling(ig))
-              write(*,*) "Improved, l,Rdust = ",l,rdust(ig,l)
+c              write(*,*) "Improved, l,Rdust = ",l,rdust(ig,l)
 
               rdust(ig,l)= zq(ig,l,igcm_dust_mass)
@@ -315 +315 @@
      &             / zq(ig,l,igcm_dust_number)
               rdust(ig,l)= rdust(ig,l)**(1./3.)
-              write(*,*) "Improved2, l,Rdust = ",l,rdust(ig,l)
+c              write(*,*) "Improved2, l,Rdust = ",l,rdust(ig,l)
             rdust(ig,l)=max(1.e-9,rdust(ig,l))
             rdust(ig,l)=min(2e-6,rdust(ig,l))
-              write(*,*) "Improved3, l,Rdust = ",l,rdust(ig,l)
+c              write(*,*) "Improved3, l,Rdust = ",l,rdust(ig,l)
 
 c       Expand the dust moments into a binned distribution
               Mo = zq(ig,l,igcm_dust_mass)* tauscaling(ig)
               No = zq(ig,l,igcm_dust_number)* tauscaling(ig)
-              write(*,*) "dust number, mass = ",
-     &             zq(ig,l,igcm_dust_number)* tauscaling(ig),
-     &             zq(ig,l,igcm_dust_mass)* tauscaling(ig)
+c              write(*,*) "dust number, mass = ",
+c     &             zq(ig,l,igcm_dust_number)* tauscaling(ig),
+c     &             zq(ig,l,igcm_dust_mass)* tauscaling(ig)
 c              write(*,*) "No, Mo = ",No, Mo 
               Rn = rdust(ig,l)
@@ -461 +461 @@
 c + enlever les CCN a la distri de dust
 
-              write(*,*) "new dust_mass, number =",
-     &             zq(ig,l,igcm_dust_mass)* tauscaling(ig), 
-     &             zq(ig,l,igcm_dust_number)*tauscaling(ig)
-              write(*,*) "new ccn mass, number =",
-     &             zq(ig,l,igcm_ccnco2_mass)* tauscaling(ig)
-     &             ,zq(ig,l,igcm_ccnco2_number)*tauscaling(ig)
+c              write(*,*) "new dust_mass, number =",
+c     &             zq(ig,l,igcm_dust_mass)* tauscaling(ig), 
+c     &             zq(ig,l,igcm_dust_number)*tauscaling(ig)
+c              write(*,*) "new ccn mass, number =",
+c     &             zq(ig,l,igcm_ccnco2_mass)* tauscaling(ig)
+c     &             ,zq(ig,l,igcm_ccnco2_number)*tauscaling(ig)
            
            ENDIF                ! of is satu >1
@@ -497 +497 @@
      &             zq(ig,l,igcm_dust_number) .lt. 0. ) THEN
                
-                 write(*,*) "before growth CCN N,M = "          
+                 write(*,*) "CO2 clouds before growth CCN N,M = "          
      &                ,zq(ig,l,igcm_ccnco2_number)*tauscaling(ig)
      &                ,zq(ig,l,igcm_ccnco2_mass)*tauscaling(ig)
@@ -522 +522 @@
           ! WATCH OUT: CO2 nuclei is supposed to be dust
           ! only when deriving rhocloud (otherwise would need to keep info on  water embedded in co2) - listo
-              write(*,*) "Rdust before growth = ",rdust(ig,l)
-              write(*,*) "Riceco2 before growth = ",riceco2(ig,l)
+c              write(*,*) "Rdust before growth = ",rdust(ig,l)
+c              write(*,*) "Riceco2 before growth = ",riceco2(ig,l)
 
               !! Niceco2,Qccnco2,Nccnco2
@@ -531 +531 @@
               call updaterice_microCO2(Niceco2,Qccnco2,Nccnco2,
      &             tauscaling(ig),riceco2(ig,l),rhocloudco2(ig,l)) 
-              write(*,*) "Riceco2 update before growth = ",riceco2(ig,l)
+c              write(*,*) "Riceco2 update before growth = ",riceco2(ig,l)
 
               No   = zq(ig,l,igcm_ccnco2_number)* tauscaling(ig)
@@ -550 +550 @@
      &             riceco2(ig,l)*rho_ice_co2)*Ic_rice
               dMice =  No * Ic_rice * ptimestep ! Kg par kg d'air, <0 si croissance !           
-              write(*,*) "dMicev0 in improved = " , dMice
+c              write(*,*) "dMicev0 in improved = " , dMice
 
              if (dMice .gt. 0) dMice = min(dMice,zq0(ig,l,igcm_co2_ice))
@@ -561 +561 @@
 c              write(*,*) "riceco2+dr/dt = ", riceco2(ig,l)
 
-              write(*,*) "dMice in improved = " , dMice
+c              write(*,*) "dMice in improved = " , dMice
               
               
@@ -574 +574 @@
      &             *tauscaling(ig)) +rdust(ig,l)*rdust(ig,l)
      &             *rdust(ig,l) )**(1.0/3.0)
-              write(*,*) "new riceco2 = ",riceco2(ig,l) 
+c              write(*,*) "new riceco2 = ",riceco2(ig,l) 
                
               !! Niceco2,Qccnco2,Nccnco2
@@ -582 +582 @@
               call updaterice_microCO2(Niceco2,Qccnco2,Nccnco2,
      &             tauscaling(ig),riceco2(ig,l),rhocloudco2(ig,l)) 
-              write(*,*) "new riceco2 updaterad= ",riceco2(ig,l) 
+c              write(*,*) "new riceco2 updaterad= ",riceco2(ig,l) 
 
 ! latent heat release        

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

@@ -1165 +1165 @@
      &           nq,tau,tauscaling,rdust,rice,riceco2,nuice,
      &           rsedcloudco2,rhocloudco2,zzlev,zdqssed_co2)
-            
-            
-            call WRITEdiagfi(ngrid,"rhocloudco2","rho cloud co2","kk",1,
-     &           rhocloudco2)
-            
+                
 
 c Temperature variation due to latent heat release
@@ -2282 +2278 @@
 c        call WRITEDIAGFI(ngrid,'lw_htrt','lw heat. rate',
 c    &                   'w.m-2',3,zdtlw)
+  
+         if (co2clouds) then
+            do iq=1, nq
+               call WRITEDIAGFI(ngrid,trim(noms(iq)),
+     &              trim(noms(iq)),'kg/kg',3,zq(:,:,iq))
+            end do
+         endif
             if (.not.activice) then
                CALL WRITEDIAGFI(ngrid,'tauTESap',