Changeset 4368 for LMDZ6/branches/Ocean_skin/libf/phylmdiso/cva_driver.F90

Timestamp:

Dec 6, 2022, 12:01:16 AM (20 months ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmdiso/cva_driver.F90 (modified) (11 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmdiso/cva_driver.F90

@@ -54 +54 @@
   USE add_phys_tend_mod, ONLY: fl_cor_ebil
 #ifdef ISO
-  USE infotrac_phy, ONLY: ntraciso,niso,niso,index_trac,ntraceurs_zone
-  USE isotopes_mod, ONLY: iso_eau,iso_HDO,ridicule,bidouille_anti_divergence
+  USE infotrac_phy, ONLY: ntraciso=>ntiso,niso,niso,itZonIso,nzone
+  USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,ridicule,bidouille_anti_divergence
 #ifdef ISOVERIF
     use isotopes_verif_mod
@@ -963 +963 @@
 #ifdef ISO
 #ifdef ISOVERIF
-       write(*,*) 'cva_driver 621: après cv3_undilute1'
+       write(*,*) 'cva_driver 621: apres cv3_undilute1'
        do k=1,nd
         do i = 1, len
@@ -1121 +1121 @@
 #ifdef ISO
 #ifdef ISOVERIF
-       write(*,*) 'cva_driver 720: après cv3_compress'
-       write(*,*) 'len, nloc, ncum,nd=',len, nloc, ncum,nd
+       write(*,*) 'cva_driver 720: apres cv3_compress'
+!       write(*,*) 'len, nloc, ncum,nd=',len, nloc, ncum,nd
        do k=1,nd
         do i = 1, ncum
@@ -1149 +1149 @@
          call iso_verif_positif(qnk(i),'cva_driver 966b')  
        enddo !do i = 1, ncum
-       write(*,*) 'cva_driver 1142: après cv3_compress OK'
+!       write(*,*) 'cva_driver 1142: apres cv3_compress OK'
 #endif
 #endif
@@ -1357 +1357 @@
 #ifdef ISO
 #ifdef ISOVERIF
-       write(*,*) 'cva_driver 837: après cv3_mixing'
-       write(*,*) 'qent,xtent(1,1,1)=',qent(1,1,1),xtent(iso_eau,1,1,1)
+       write(*,*) 'cva_driver 837: apres cv3_mixing'
+!       write(*,*) 'qent,xtent(1,1,1)=',qent(1,1,1),xtent(iso_eau,1,1,1)
        do k=1,nd
        do j = 1, nd
@@ -1388 +1388 @@
            call iso_verif_traceur(xt(1,i,k),'cva_driver 856')
            if (option_tmin.eq.1) then
-             if (iso_verif_positif_nostop(xtclw(index_trac( &
+             if (iso_verif_positif_nostop(xtclw(itZonIso( &
      &           izone_cond,iso_eau),i,k)-xtclw(iso_eau,i,k) &
      &           ,'cva_driver 909').eq.1) then
@@ -1394 +1394 @@
                write(*,*) 'xtclw=',xtclw(:,i,k)
                stop
-             endif !if (iso_verif_positif_nostop(xtclw(index_trac(
+             endif !if (iso_verif_positif_nostop(xtclw(itZonIso(
            endif !if ((option_traceurs.eq.17).or.
 #endif  
@@ -1509 +1509 @@
             do i = 1, ncum
                do iiso=1,niso
-                  ixt_ddft=index_trac(izone_ddft,iiso)
-                  ixt_poubelle=index_trac(izone_poubelle,iiso)
+                  ixt_ddft=itZonIso(izone_ddft,iiso)
+                  ixt_poubelle=itZonIso(izone_poubelle,iiso)
                   xtp(ixt_ddft,i,k)=xtp(ixt_ddft,i,k) &
      &                    +xtp(ixt_poubelle,i,k)
@@ -1524 +1524 @@
           do k=1,nd
             do i = 1, ncum
-               do izone=1,ntraceurs_zone
+               do izone=1,nzone
                  if (izone.eq.izone_ddft) then
                    do iiso=1,niso
-                     ixt_ddft=index_trac(izone,iiso)
-                     ixt_revap=index_trac(izone_revap,iiso)
+                     ixt_ddft=itZonIso(izone,iiso)
+                     ixt_revap=itZonIso(izone_revap,iiso)
                      xtp(ixt_ddft,i,k)=xtp(iiso,i,k)-xtp(ixt_revap,i,k)
                    enddo !do iiso=1,niso
@@ -1535 +1535 @@
                  else !if (izone.eq.izone_ddft) then
                    do iiso=1,niso
-                     ixt=index_trac(izone,iiso)
+                     ixt=itZonIso(izone,iiso)
                      xtp(ixt,i,k)=0.0
                    enddo !do iiso=1,niso
                  endif !if (izone.eq.izone_ddft) then
-               enddo !do izone=1,ntraceurs_zone
+               enddo !do izone=1,nzone
 #ifdef ISOVERIF
                call iso_verif_traceur(xtp(1,i,k),'cva_driver 1059')
@@ -1597 +1597 @@
             call iso_verif_aberrant( &
      &          (xt(iso_HDO,i,k)+delt*fxt(iso_HDO,i,k)) &
-     &          /(q(i,k)+delt*fq(i,k)),'cva_driver 855')
+     &          /(q(i,k)+delt*fq(i,k)),'cva_driver 855a')
+                if (iso_O18.gt.0) then
+            call iso_verif_O18_aberrant( &
+     &          (xt(iso_HDO,i,k)+delt*fxt(iso_HDO,i,k)) &
+     &          /(q(i,k)+delt*fq(i,k)), &
+     &          (xt(iso_O18,i,k)+delt*fxt(iso_O18,i,k)) &
+     &          /(q(i,k)+delt*fq(i,k)),'cva_driver 855b')
+                endif
           endif
          endif