Changeset 4050 for LMDZ6/trunk/libf/dyn3d/iniacademic.F90

Timestamp:

Dec 23, 2021, 6:54:17 PM (2 years ago)

Author:

dcugnet

Message:

Second commit for new tracers.

• include most of the keys in the tracers descriptor vector "tracers(:)".
• fix in phylmdiso/cv3_routines: fq_* variables were used where their fxt_* counterparts were expected.
• multiple IF(nqdesc(iq)>0) and IF(nqfils(iq)>0) tests suppressed, because they are not needed: "do ... enddo" loops with 0 upper bound are not executed.
• remove French accents from comments (encoding problem) in phylmdiso/cv3_routines and phylmdiso/cv30_routines.
• modifications in "isotopes_verif_mod", where the call to function "iso_verif_tag17_q_deltad_chn" in "iso_verif_tag17_q_deltad_chn" was not detected at linking stage, although defined in the same module (?).

File:

• LMDZ6/trunk/libf/dyn3d/iniacademic.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/dyn3d/iniacademic.F90

@@ -5 +5 @@
 
   USE filtreg_mod, ONLY: inifilr
-  USE infotrac
+  USE infotrac,    ONLY: nqtot,niso_possibles,ok_isotopes,ok_iso_verif,tnat,alpha_ideal, &
+        & iqiso,iso_indnum, tracers
   USE control_mod, ONLY: day_step,planet_type
 #ifdef CPP_IOIPSL
@@ -61 +62 @@
   real tetastrat ! potential temperature in the stratosphere, in K
   real tetajl(jjp1,llm)
-  INTEGER i,j,l,lsup,ij
+  INTEGER i,j,l,lsup,ij, iq
 
   REAL teta0,ttp,delt_y,delt_z,eps ! Constantes pour profil de T
@@ -70 +71 @@
 
   real zz,ran1
-  integer idum
+  integer idum, iqParent, iName, iZone, iPhase
 
   REAL zdtvr
@@ -275 +276 @@
         if (planet_type=="earth") then
            ! Earth: first two tracers will be water
-           do i=1,nqtot
-              if (i == 1) q(:,:,i)=1.e-10
-              if (i == 2) q(:,:,i)=1.e-15
-              if (i.gt.2) q(:,:,i)=0.
+           do iq=1,nqtot
+              q(:,:,iq)=0.
+              IF(tracers(iq)%name == 'H2Ov') q(:,:,iq)=1.e-10
+              IF(tracers(iq)%name == 'H2Ol') q(:,:,iq)=1.e-15
 
               ! CRisi: init des isotopes
               ! distill de Rayleigh très simplifiée
-              if (ok_isotopes) then
-                if ((iso_num(i).gt.0).and.(zone_num(i).eq.0)) then          
-                   q(:,:,i)=q(:,:,iqpere(i))             &
-      &                  *tnat(iso_num(i))               &
-      &                  *(q(:,:,iqpere(i))/30.e-3)      &
-      &                  **(alpha_ideal(iso_num(i))-1)
-                endif                
-                if ((iso_num(i).gt.0).and.(zone_num(i).eq.1)) then
-                  q(:,:,i)=q(:,:,iqiso(iso_indnum(i),phase_num(i)))
-                endif
+              iName = tracers(iq)%iso_iName
+              iZone = tracers(iq)%iso_iZone
+              iPhase= tracers(iq)%iso_iPhase
+              iqParent = tracers(iq)%iqParent
+              if (ok_isotopes .AND. iName > 0) then
+                if (iZone == 0) q(:,:,iq) = q(:,:,iqParent)*tnat(iName) &
+                                          *(q(:,:,iqParent)/30.e-3)**(alpha_ideal(iName)-1)
+                if (iZone == 1) q(:,:,iq) = q(:,:,iqiso(iso_indnum(iq),iPhase))
               endif !if (ok_isotopes) then