Changeset 4149 for LMDZ6/trunk/libf/phylmdiso/isotopes_verif_mod.F90

Timestamp:

May 14, 2022, 8:13:22 PM (2 years ago)

Author:

dcugnet

Message:

• remove striso (use isoName instead)
• few fixes for the lOldCode=.FALSE. code
• add the « isotopes_params.def » file, used in the lOldCode=.FALSE. part of the isotopes_mod module.

File:

• LMDZ6/trunk/libf/phylmdiso/isotopes_verif_mod.F90 (modified) (9 diffs)

LMDZ6/trunk/libf/phylmdiso/isotopes_verif_mod.F90

@@ -1939 +1939 @@
 
         function iso_verif_tracpos_choix_nostop(x,err_msg,seuil)
-        use isotrac_mod, only: index_iso,strtrac,index_zone
-        use isotopes_mod, only: striso
+        use isotopes_mod, only: isoName
         implicit none
 
@@ -1959 +1958 @@
 
        do ixt=niso+1,ntraciso
-          iiso=index_iso(ixt)
           if (iso_verif_positif_choix_nostop(x(ixt),seuil,err_msg// &
-     &           ', verif positif, iso'//striso(iiso) &
-     &           //strtrac(index_zone(ixt))).eq.1) then
+     &           ', verif positif, iso'//TRIM(isoName(ixt))).eq.1) then
             iso_verif_tracpos_choix_nostop=1
           endif
@@ -1971 +1968 @@
 
         function iso_verif_traceur_noNaN_nostop(x,err_msg)
-        use isotrac_mod, only: index_iso
-        use isotopes_mod, only: striso
+        use isotopes_mod, only: isoName
         implicit none
 
@@ -1991 +1987 @@
 
         do ixt=niso+1,ntraciso
-          iiso=index_iso(ixt)
 !          write(*,*) 'iso_verif_traceurs 154: iiso,ixt=',iiso,ixt
           if (iso_verif_noNaN_nostop(x(ixt),err_msg// &
-     &           ', verif trac no NaN, iso'//striso(iiso)) &
+     &           ', verif trac no NaN, iso'//TRIM(isoName(ixt))) &
      &           .eq.1) then
             iso_verif_traceur_noNaN_nostop=1
@@ -2005 +2000 @@
      &           errmaxin,errmaxrelin)
 
-        use isotopes_mod, ONLY: ridicule,striso
+        use isotopes_mod, ONLY: ridicule,isoName
         ! on vérifie juste bilan de masse
         implicit none
@@ -2033 +2028 @@
 
           if (iso_verif_egalite_choix_nostop(xtractot,x(iiso), &
-     &        err_msg//', verif trac egalite, iso '//striso(iiso), &
+     &        err_msg//', verif trac egalite, iso '// &
+     &        TRIM(isoName(iiso)), &
      &        errmaxin,errmaxrelin).eq.1) then
             write(*,*) 'iso_verif_traceur 202: x=',x
@@ -2044 +2040 @@
      &           (abs(x(iiso)).gt.ridicule)) then
             write(*,*) err_msg,', verif masse traceurs, iso ', &
-     &          striso(iiso)
+     &          TRIM(isoName(iiso))
             write(*,*) 'iso_verif_traceur 209: x=',x
 !            iso_verif_tracm_choix_nostop=1
@@ -2371 +2367 @@
         subroutine iso_verif_trac_masse_vect(x,n,m,err_msg, &
      &            errmax,errmaxrel)
-        use isotopes_mod, only: striso
+        use isotopes_mod, only: isoName
         implicit none
        
@@ -2402 +2398 @@
         call iso_verif_egalite_std_vect( &
      &           xtractot,xiiso, &
-     &           err_msg//', verif trac egalite, iso '//striso(iiso), &
+     &           err_msg//', verif trac egalite, iso ' &
+     &           //TRIM(isoName(iiso)), &
      &           n,m,errmax,errmaxrel)
         enddo !do iiso=1,niso