Changeset 3606

Timestamp:

Nov 28, 2019, 5:07:28 PM (5 years ago)

Author:

acozic

Message:

several commit for branche IPSLCM5A2

• comment a lot of write on infotrac
• add initialization for variable pbl_tke (it's use before to be calculed)
• comment condition to call aerosol_meteo_calc because this routine is now call by all inca version
• add a condition on output write of od550aer, o865aer, ...loaddust (there are calculed by lmdz only when we work in new physic)

Location:

LMDZ5/branches/IPSLCM5A2.1/libf

Files:

• dyn3d_common/infotrac.F90 (modified) (6 diffs)
• phylmd/phys_output_write_mod.F90 (modified) (1 diff)
• phylmd/phys_state_var_mod.F90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (1 diff)

LMDZ5/branches/IPSLCM5A2.1/libf/dyn3d_common/infotrac.F90

@@ -562 +562 @@
 
 
-    WRITE(lunout,*) trim(modname),': Information stored in infotrac :'
-    WRITE(lunout,*) trim(modname),': iadv  niadv tname  ttext :'
-    DO iq=1,nqtot
-       WRITE(lunout,*) iadv(iq),niadv(iq),&
-       ' ',trim(tname(iq)),' ',trim(ttext(iq))
-    END DO
+!    WRITE(lunout,*) trim(modname),': Information stored in infotrac :'
+!    WRITE(lunout,*) trim(modname),': iadv  niadv tname  ttext :'
+!    DO iq=1,nqtot
+!       WRITE(lunout,*) iadv(iq),niadv(iq),&
+!       ' ',trim(tname(iq)),' ',trim(ttext(iq))
+!    END DO
 
 !
@@ -599 +599 @@
       if (tnom_transp(iq) == 'air') then
         ! ceci est un traceur père
-        WRITE(lunout,*) 'Le traceur',iq,', appele ',trim(tnom_0(iq)),', est un pere'
+!        WRITE(lunout,*) 'Le traceur',iq,', appele ',trim(tnom_0(iq)),', est un pere'
         nqperes=nqperes+1
         iqpere(iq)=0
       else !if (tnom_transp(iq) == 'air') then
         ! ceci est un fils. Qui est son père?
-        WRITE(lunout,*) 'Le traceur',iq,', appele ',trim(tnom_0(iq)),', est un fils'
+!        WRITE(lunout,*) 'Le traceur',iq,', appele ',trim(tnom_0(iq)),', est un fils'
         continu=.true.
         ipere=1
@@ -610 +610 @@
           if (tnom_transp(iq) == tnom_0(ipere)) then
             ! Son père est ipere
-            WRITE(lunout,*) 'Le traceur',iq,'appele ', &
-      &          trim(tnom_0(iq)),' est le fils de ',ipere,'appele ',trim(tnom_0(ipere))
+!            WRITE(lunout,*) 'Le traceur',iq,'appele ', &
+!      &          trim(tnom_0(iq)),' est le fils de ',ipere,'appele ',trim(tnom_0(ipere))
             nqfils(ipere)=nqfils(ipere)+1  
             iqfils(nqfils(ipere),ipere)=iq
@@ -619 +619 @@
             ipere=ipere+1 
             if (ipere.gt.nqtot) then
-                WRITE(lunout,*) 'Le traceur',iq,'appele ', &
-      &          trim(tnom_0(iq)),', est orpelin.'
+!                WRITE(lunout,*) 'Le traceur',iq,'appele ', &
+!      &          trim(tnom_0(iq)),', est orpelin.'
                 CALL abort_gcm('infotrac_init','Un traceur est orphelin',1)
             endif !if (ipere.gt.nqtot) then
@@ -627 +627 @@
       endif !if (tnom_transp(iq) == 'air') then
     enddo !DO iq=1,nqtot
-    WRITE(lunout,*) 'infotrac: nqperes=',nqperes    
-    WRITE(lunout,*) 'nqfils=',nqfils
-    WRITE(lunout,*) 'iqpere=',iqpere
-    WRITE(lunout,*) 'iqfils=',iqfils
+!    WRITE(lunout,*) 'infotrac: nqperes=',nqperes    
+!    WRITE(lunout,*) 'nqfils=',nqfils
+!    WRITE(lunout,*) 'iqpere=',iqpere
+!    WRITE(lunout,*) 'iqfils=',iqfils
 
 ! Calculer le nombre de descendants à partir de iqfils et de nbfils
@@ -649 +649 @@
         endif !if (ipere.gt.0) then
       enddo !do while (continu)    
-      WRITE(lunout,*) 'Le traceur ',iq,', appele ',trim(tnom_0(iq)),' est un traceur de generation: ',generation
+!      WRITE(lunout,*) 'Le traceur ',iq,', appele ',trim(tnom_0(iq)),' est un traceur de generation: ',generation
     enddo !DO iq=1,nqtot
-    WRITE(lunout,*) 'infotrac: nqdesc=',nqdesc
-    WRITE(lunout,*) 'iqfils=',iqfils
-    WRITE(lunout,*) 'nqdesc_tot=',nqdesc_tot
+!    WRITE(lunout,*) 'infotrac: nqdesc=',nqdesc
+!    WRITE(lunout,*) 'iqfils=',iqfils
+!    WRITE(lunout,*) 'nqdesc_tot=',nqdesc_tot
 
 ! Interdire autres schémas que 10 pour les traceurs fils, et autres schémas

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/phys_output_write_mod.F90

@@ -1009 +1009 @@
 !--OLIVIER
 !This is warranted by treating INCA aerosols as offline aerosols
-!       IF (new_aod .and. (.not. aerosol_couple)) THEN
-       IF (new_aod) THEN
+       IF (new_aod .and. (.not. aerosol_couple)) THEN
+!       IF (new_aod) THEN
           IF (flag_aerosol.GT.0) THEN
              CALL histwrite_phy(o_od550aer, od550aer)

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/phys_state_var_mod.F90

@@ -455 +455 @@
       ALLOCATE(ratqs(klon,klev))
       ALLOCATE(pbl_tke(klon,klev+1,nbsrf+1))
+      pbl_tke(:,:,:) = 0. 
 !nrlmd<
       ALLOCATE(delta_tsurf(klon,nbsrf))

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/physiq_mod.F90

@@ -3359 +3359 @@
 
        call chemtime(itap+itau_phy-1, date0, dtime, itap)
-       IF (config_inca == 'aero' .OR. config_inca == 'aeNP') THEN
-          CALL AEROSOL_METEO_CALC( &
-               calday,pdtphys,pplay,paprs,t,pmflxr,pmflxs, &
-               prfl,psfl,pctsrf,cell_area, &
-               latitude_deg,longitude_deg,u10m,v10m)
-       END IF
+       CALL AEROSOL_METEO_CALC( &
+            calday,pdtphys,pplay,paprs,t,pmflxr,pmflxs, &
+            prfl,psfl,pctsrf,cell_area, &
+           latitude_deg,longitude_deg,u10m,v10m)
 
        zxsnow_dummy(:) = 0.0