Changeset 4452

Timestamp:

Mar 5, 2023, 11:18:00 AM (2 years ago)

Author:

crisi

Message:

quelques corrections dans les verifs isotopiques

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• isotopes_routines_mod.F90 (modified) (5 diffs)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -1731 +1731 @@
        else
            write(*,*) 'iso_fractcal 1734: non prévu: ixt=',ixt
-#ifdef ISOVERIF
-           stop
-#endif
+!#ifdef ISOVERIF
+           CALL abort_physic('isotopes_routines_mod', 'iso_fractcal 1734', 1)
+!#endif
        endif
 
@@ -1949 +1949 @@
        else
            write(*,*) 'iso_fractcal 1954: non prévu: ixt=',ixt
-#ifdef ISOVERIF
-           stop
-#endif
+!#ifdef ISOVERIF
+          CALL abort_physic('isotopes_routines_mod', 'iso_fractcal 1954', 1)
+!#endif
        endif
 
@@ -2185 +2185 @@
         write(*,*) 'qsol(i)=',qsol(i),' mais evap(i)=',evap(i)
         write(*,*) 'q1lay(i)=',q1lay(i)
-        stop
+        CALL abort_physic('isotopes_routines_mod', 'iso_surf 2187', 1)
  endif !if (q1lay(i).gt.ridicule) then
 endif !if (qsol(i).gt.ridicule_rain) then
@@ -2414 +2414 @@
     write(*,*) 'iso_surf>iso_rosee_givre 3189: evap=',evap(i)
     write(*,*) 'q1lay(i)=',q1lay(i)
-    stop
+    CALL abort_physic('isotopes_routines_mod', 'iso_surf 2416', 1)
 endif !if (q1lay(i).gt.0) then
 
@@ -2552 +2552 @@
   write(*,*) 'il,Pqisup(il),Eqi(il),Pqiinf(il)=', &
 &          il,Pqisup(il),Eqi(il),Pqiinf(il) 
-  stop
+  CALL abort_physic('isotopes_routines_mod', 'stewart 2554', 1)
 endif !if (iso_verif_egalite
 enddo !do il=1,ncas 

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -2682 +2682 @@
              DO i = 1, klon
               if (q_seri(i,k).gt.3e-3) then
-              call iso_verif_positif(deltaD(xt_seri(iso_eau,i,k) &
+              call iso_verif_positif(deltaD(xt_seri(iso_HDO,i,k) &
      &           /q_seri(i,k))+400.0,'physiq 2045a')
-              call iso_verif_positif(deltaD(xt_ancien(iso_eau,i,k) &
+              call iso_verif_positif(deltaD(xt_ancien(iso_HDO,i,k) &
      &            /q_ancien(i,k))+400.0,'physiq 2045b')
 !              call iso_verif_egalite_choix(d_xt_dyn(iso_hdo,i,k) &
@@ -3602 +3602 @@
            endif ! if ((iso_HDO.gt.0).and.(iso_O18.gt.0)) then
            if ((iso_O17.gt.0).and.(iso_O18.gt.0)) then
-             if ((q_seri(i,k).gt.ridicule).and.(l.lt.nlevmaxO17)) then
+             if ((q_seri(i,k).gt.ridicule).and.(k.lt.nlevmaxO17)) then
               call iso_verif_aberrant_o17(xt_seri(iso_o17,i,k) &
      &           /q_seri(i,k),xt_seri(iso_o18,i,k) &