Changeset 2296 for trunk/LMDZ.COMMON/libf/dyn3d/vlsplt.F

Timestamp:

Apr 24, 2020, 6:55:59 PM (5 years ago)

Author:

mvals

Message:

Mars GCM:
dyn3dpar: Implementation in the parallel version of the dynamics of the dynamical transport of the isotopes using the same scheme as the one
implemented by Camille Risi in the Earth GCM (see LMDZ6/libf/dyn3dmem, and Risi et al. 2009: genealogy of the tracers+transport of the isotopic
ratio). This is added to prepare the future implementation of the HDO cycle in the GCM. These changes had been already added in the sequential part.
dyn3d: corrections to prevent from dividing by zero in the case of the use of the isotopes scheme.
traceur.def.isotopes: example of how to write the traceur.def if you want to use the new dynamics with the genealogy of the isotopes: air is the
father of all, H2O is the father of HDO.
MV

File:

• trunk/LMDZ.COMMON/libf/dyn3d/vlsplt.F (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/vlsplt.F

@@ -456 +456 @@
           DO ij=iip2,ip1jm
            ! On a besoin de q et masse seulement entre iip2 et ip1jm 
-           masseq(ij,l,iq2)=masse(ij,l,iq)*q(ij,l,iq)
-           Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           !masseq(ij,l,iq2)=masse(ij,l,iq)*q(ij,l,iq)
+           !Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           !MVals: veiller a ce qu'on n'ait pas de denominateur nul
+           masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),1e-16)
+           if (q(ij,l,iq).gt.1e-16) then
+             Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           else
+             Ratio(ij,l,iq2)=0.
+           endif
           enddo   
          enddo
@@ -473 +480 @@
       DO l=1,llm
          DO ij=iip2+1,ip1jm
-            new_m=masse(ij,l,iq)+u_m(ij-1,l)-u_m(ij,l)
+            !MVals: veiller a ce qu'on n'ait pas de denominateur nul
+            new_m=max(masse(ij,l,iq)+u_m(ij-1,l)-u_m(ij,l),1e-16)
             q(ij,l,iq)=(q(ij,l,iq)*masse(ij,l,iq)+
      &      u_mq(ij-1,l)-u_mq(ij,l))
@@ -777 +785 @@
            ! attention, chaque fils doit avoir son masseq, sinon, le 1er
            ! fils ecrase le masseq de ses freres.
-           masseq(ij,l,iq2)=masse(ij,l,iq)*q(ij,l,iq)
-           Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)     
+           !masseq(ij,l,iq2)=masse(ij,l,iq)*q(ij,l,iq)
+           !Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           !MVals: veiller a ce qu'on n'ait pas de denominateur nul
+           masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),1e-16)
+           if (q(ij,l,iq).gt.1e-16) then
+             Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           else
+             Ratio(ij,l,iq2)=0.
+           endif 
           enddo   
          enddo
@@ -997 +1012 @@
          DO l=1,llm
           DO ij=1,ip1jmp1
-           masseq(ij,l,iq2)=masse(ij,l,iq)*q(ij,l,iq)
-           Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)        
+           !masseq(ij,l,iq2)=masse(ij,l,iq)*q(ij,l,iq)
+           !Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           !MVals: veiller a ce qu'on n'ait pas de denominateur nul
+           masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),1e-16)
+           if (q(ij,l,iq).gt.1e-16) then
+             Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
+           else
+             Ratio(ij,l,iq2)=0.
+           endif      
           enddo   
          enddo