Changeset 2408 for LMDZ5/branches/testing/libf/dyn3d_common

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d_common/caldyn0.F (deleted)
• libf/dyn3d_common/caldyn0.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90)
• libf/dyn3d_common/conf_dat2d.F (deleted)
• libf/dyn3d_common/conf_dat3d.F (deleted)
• libf/dyn3d_common/conf_dat_m.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/conf_dat_m.F90)
• libf/dyn3d_common/convmas.F (deleted)
• libf/dyn3d_common/convmas.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/convmas.F90)
• libf/dyn3d_common/covcont.F (deleted)
• libf/dyn3d_common/covcont.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/covcont.F90)
• libf/dyn3d_common/enercin.F (deleted)
• libf/dyn3d_common/enercin.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/enercin.F90)
• libf/dyn3d_common/flumass.F (deleted)
• libf/dyn3d_common/flumass.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/flumass.F90)
• libf/dyn3d_common/grid_atob.F (deleted)
• libf/dyn3d_common/grid_noro.F (deleted)
• libf/dyn3d_common/infotrac.F90 (modified) (15 diffs)
• libf/dyn3d_common/massbar.F (deleted)
• libf/dyn3d_common/massbar.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/massbar.F90)
• libf/dyn3d_common/massbarxy.F (deleted)
• libf/dyn3d_common/massbarxy.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/massbarxy.F90)
• libf/dyn3d_common/misc_mod.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/misc_mod.F90)
• libf/dyn3d_common/pression.F (deleted)
• libf/dyn3d_common/pression.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/pression.F90)
• libf/dyn3d_common/q_sat.F (deleted)
• libf/dyn3d_common/startvar.F90 (deleted)
• libf/dyn3d_common/tourpot.F (deleted)
• libf/dyn3d_common/tourpot.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/tourpot.F90)
• libf/dyn3d_common/vitvert.F (deleted)
• libf/dyn3d_common/vitvert.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/vitvert.F90)
• libf/dyn3d_common/write_field.F90 (deleted)

LMDZ5/branches/testing/libf/dyn3d_common/infotrac.F90

@@ -59 +59 @@
 
   SUBROUTINE infotrac_init
-    USE control_mod
+    USE control_mod, ONLY: planet_type, config_inca
 #ifdef REPROBUS
     USE CHEM_REP, ONLY : Init_chem_rep_trac
@@ -196 +196 @@
           nqo=2
        ENDIF
-       IF (nqo /= 2 .OR. nqo /= 3 ) THEN
+       IF (nqo /= 2 .AND. nqo /= 3 ) THEN
           WRITE(lunout,*) trim(modname),': nqo=',nqo, ' is not allowded. Only 2 or 3 water phases allowed'
           CALL abort_gcm('infotrac_init','Bad number of water phases',1)
        END IF
        ! nbtr has been read from INCA by init_const_lmdz() in gcm.F 
+#ifdef INCA
+       CALL Init_chem_inca_trac(nbtr) 
+#endif       
        nqtrue=nbtr+nqo
-!!       nqtrue=nbtr+2
     END IF   ! type_trac
 !>jyg
@@ -274 +276 @@
              ! Y-a-t-il 1 ou 2 noms de traceurs? -> On regarde s'il y a un
              ! espace ou pas au milieu de la chaine.
-             continu=1
-             nouveau_traceurdef=0
+             continu=.true.
+             nouveau_traceurdef=.false.
              iiq=1
              do while (continu)
                 if (tchaine(iiq:iiq).eq.' ') then
-                  nouveau_traceurdef=1
-                  continu=0
+                  nouveau_traceurdef=.true.
+                  continu=.false.
                 else if (iiq.lt.LEN_TRIM(tchaine)) then
                   iiq=iiq+1
                 else
-                  continu=0      
+                  continu=.false.
                 endif
              enddo
@@ -384 +386 @@
 #endif
        tnom_0(1)='H2Ov'
+       tnom_transp(1) = 'air'
        tnom_0(2)='H2Ol'
-       IF (nqo == 3) tnom_0(3)='H2Oi'     !! jyg
+       tnom_transp(2) = 'air'
+       IF (nqo == 3) then 
+          tnom_0(3)='H2Oi'     !! jyg
+          tnom_transp(3) = 'air'
+       endif
 
 !jyg<
        DO iq = nqo+1, nqtrue
           tnom_0(iq)=solsym(iq-nqo)
+          tnom_transp(iq) = 'air'
        END DO
 !!       DO iq =3,nqtrue
@@ -672 +680 @@
 
     do iq=nqo+1,nqtot
-       write(lunout,*) 'infotrac 569: iq,tnom_0(iq)=',iq,tnom_0(iq)
+!       write(lunout,*) 'infotrac 569: iq,tnom_0(iq)=',iq,tnom_0(iq)
        do phase=1,nqo    
         do ixt= 1,niso_possibles   
          tnom_trac=trim(tnom_0(phase))//'_'
          tnom_trac=trim(tnom_trac)//trim(tnom_iso(ixt))
-         write(*,*) 'phase,ixt,tnom_trac=',phase,ixt,tnom_trac      
+!         write(*,*) 'phase,ixt,tnom_trac=',phase,ixt,tnom_trac      
          IF (tnom_0(iq) == tnom_trac) then
-          write(lunout,*) 'Ce traceur est un isotope'
+!          write(lunout,*) 'Ce traceur est un isotope'
           nb_iso(ixt,phase)=nb_iso(ixt,phase)+1   
           nb_isoind(phase)=nb_isoind(phase)+1   
@@ -686 +694 @@
           indnum_fn_num(ixt)=iso_indnum(iq)
           phase_num(iq)=phase
-          write(lunout,*) 'iso_num(iq)=',iso_num(iq)
-          write(lunout,*) 'iso_indnum(iq)=',iso_indnum(iq)
-          write(lunout,*) 'indnum_fn_num(ixt)=',indnum_fn_num(ixt)
-          write(lunout,*) 'phase_num(iq)=',phase_num(iq)
+!          write(lunout,*) 'iso_num(iq)=',iso_num(iq)
+!          write(lunout,*) 'iso_indnum(iq)=',iso_indnum(iq)
+!          write(lunout,*) 'indnum_fn_num(ixt)=',indnum_fn_num(ixt)
+!          write(lunout,*) 'phase_num(iq)=',phase_num(iq)
           goto 20
          else if (iqpere(iq).gt.0) then          
           if (tnom_0(iqpere(iq)) == tnom_trac) then
-           write(lunout,*) 'Ce traceur est le fils d''un isotope'
+!           write(lunout,*) 'Ce traceur est le fils d''un isotope'
            ! c'est un traceur d'isotope
            nb_traciso(ixt,phase)=nb_traciso(ixt,phase)+1
@@ -700 +708 @@
            zone_num(iq)=nb_traciso(ixt,phase)
            phase_num(iq)=phase
-           write(lunout,*) 'iso_num(iq)=',iso_num(iq)
-           write(lunout,*) 'phase_num(iq)=',phase_num(iq)
-           write(lunout,*) 'zone_num(iq)=',zone_num(iq)
+!           write(lunout,*) 'iso_num(iq)=',iso_num(iq)
+!           write(lunout,*) 'phase_num(iq)=',phase_num(iq)
+!           write(lunout,*) 'zone_num(iq)=',zone_num(iq)
            goto 20
           endif !if (tnom_0(iqpere(iq)) == trim(tnom_0(phase))//trim(tnom_iso(ixt))) then
@@ -711 +719 @@
       enddo !do iq=1,nqtot
 
-      write(lunout,*) 'iso_num=',iso_num
-      write(lunout,*) 'iso_indnum=',iso_indnum
-      write(lunout,*) 'zone_num=',zone_num  
-      write(lunout,*) 'phase_num=',phase_num
-      write(lunout,*) 'indnum_fn_num=',indnum_fn_num
+!      write(lunout,*) 'iso_num=',iso_num
+!      write(lunout,*) 'iso_indnum=',iso_indnum
+!      write(lunout,*) 'zone_num=',zone_num  
+!      write(lunout,*) 'phase_num=',phase_num
+!      write(lunout,*) 'indnum_fn_num=',indnum_fn_num
 
       do ixt= 1,niso_possibles  
@@ -724 +732 @@
           do phase=2,nqo
             if (nb_iso(ixt,phase).ne.nb_iso(ixt,1)) then
-              write(lunout,*) 'ixt,phase,nb_iso=',ixt,phase,nb_iso(ixt,phase)
+!              write(lunout,*) 'ixt,phase,nb_iso=',ixt,phase,nb_iso(ixt,phase)
               CALL abort_gcm('infotrac_init','Phases must have same number of isotopes',1)
             endif
@@ -763 +771 @@
     ! dimensions isotopique:
     ntraciso=niso*(ntraceurs_zone+1)
-    WRITE(lunout,*) 'niso=',niso
-    WRITE(lunout,*) 'ntraceurs_zone,ntraciso=',ntraceurs_zone,ntraciso    
+!    WRITE(lunout,*) 'niso=',niso
+!    WRITE(lunout,*) 'ntraceurs_zone,ntraciso=',ntraceurs_zone,ntraciso    
  
     ! flags isotopiques:
@@ -772 +780 @@
         ok_isotopes=.false.
     endif 
-    WRITE(lunout,*) 'ok_isotopes=',ok_isotopes
+!    WRITE(lunout,*) 'ok_isotopes=',ok_isotopes
  
     if (ok_isotopes) then
@@ -782 +790 @@
         alpha_ideal=(/1.0,1.01,1.006,1.003,1.0/)
     endif !if (ok_isotopes) then  
-    WRITE(lunout,*) 'ok_iso_verif=',ok_iso_verif
-    WRITE(lunout,*) 'ok_init_iso=',ok_init_iso
+!    WRITE(lunout,*) 'ok_iso_verif=',ok_iso_verif
+!    WRITE(lunout,*) 'ok_init_iso=',ok_init_iso
 
     if (ntraceurs_zone.gt.0) then
@@ -790 +798 @@
         ok_isotrac=.false.
     endif   
-    WRITE(lunout,*) 'ok_isotrac=',ok_isotrac
+!    WRITE(lunout,*) 'ok_isotrac=',ok_isotrac
 
     ! remplissage du tableau iqiso(ntraciso,phase)
@@ -801 +809 @@
         endif
     enddo
-    WRITE(lunout,*) 'iqiso=',iqiso
+!    WRITE(lunout,*) 'iqiso=',iqiso
 
     ! replissage du tableau index_trac(ntraceurs_zone,niso)
@@ -814 +822 @@
         index_trac(:,:)=0.0
     endif !if (ok_isotrac) then
-    write(lunout,*) 'index_trac=',index_trac    
+!    write(lunout,*) 'index_trac=',index_trac    
 
 ! Finalize :