Changeset 4052 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Dec 26, 2021, 10:27:36 PM (3 years ago)

Author:

dcugnet

Message:

Fixes for previous commit:

• few tracers(:)%nqChilds were errouneously replaced with tarcers(:)%nqDesc
• minor changes

Location:

LMDZ6/trunk/libf/dyn3d

Files:

• dynetat0.f90 (modified) (1 diff)
• iniacademic.F90 (modified) (2 diffs)
• vlsplt.F (modified) (2 diffs)
• vlspltqs.F (modified) (1 diff)

LMDZ6/trunk/libf/dyn3d/dynetat0.f90

@@ -137 +137 @@
    !           Rayleigh distillation law.
     iName = tracers(iq)%iso_iName
+    IF(.NOT.ok_isotopes .OR. iName<=0) CYCLE
     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))
-    END IF
+    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))
   END DO
 

LMDZ6/trunk/libf/dyn3d/iniacademic.F90

@@ -278 +278 @@
            do iq=1,nqtot
               q(:,:,iq)=0.
+!              IF(tracers(iq)%name == 'H2O'//phases_sep//'g') q(:,:,iq)=1.e-10
+!              IF(tracers(iq)%name == 'H2O'//phases_sep//'l') q(:,:,iq)=1.e-15
               IF(tracers(iq)%name == 'H2Ov') q(:,:,iq)=1.e-10
               IF(tracers(iq)%name == 'H2Ol') q(:,:,iq)=1.e-15
@@ -284 +286 @@
               ! distill de Rayleigh très simplifiée
               iName = tracers(iq)%iso_iName
+              if (.NOT.ok_isotopes .OR. iName <= 0) CYCLE
               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
-
+              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))
            enddo
         else

LMDZ6/trunk/libf/dyn3d/vlsplt.F

@@ -464 +464 @@
         enddo
       enddo
-      do ifils=1,tracers(iq)%nqDescen
+      do ifils=1,tracers(iq)%nqChilds
         iq2=tracers(iq)%iqDescen(ifils)
         call vlx(Ratio,pente_max,masseq,u_mq,iq2)
@@ -1015 +1015 @@
       enddo
         
-      do ifils=1,tracers(iq)%nqDescen
+      do ifils=1,tracers(iq)%nqChilds
         iq2=tracers(iq)%iqDescen(ifils)
         call vlz(Ratio,pente_max,masseq,wq,iq2)

LMDZ6/trunk/libf/dyn3d/vlspltqs.F

@@ -786 +786 @@
 ! CRisi: appel récursif de l'advection sur les fils.
 ! Il faut faire ça avant d'avoir mis à jour q et masse
-      !write(*,*) 'vlyqs 689: iq,nqDesc(iq)=',iq,tracers(iq)%nqDescen
+      !write(*,*) 'vlyqs 689: iq,nqChilds(iq)=',iq,tracers(iq)%nqChilds
    
       do ifils=1,tracers(iq)%nqDescen