Changeset 4149 for LMDZ6/trunk/libf/phylmdiso/phyredem.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/phyredem.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmdiso/phyredem.F90

@@ -489 +489 @@
       USE indice_sol_mod, ONLY: nbsrf
       USE iostart, ONLY: put_field
-      USE isotopes_mod, ONLY: striso,iso_eau
+      USE isotopes_mod, ONLY: isoName,iso_eau
 #ifdef ISOVERIF
       USE isotopes_verif_mod
@@ -568 +568 @@
    do ixt=1,ntiso
 
-     if (ixt.le.niso) then
-        outiso=striso(ixt)
-     else
-#ifdef ISOTRAC
-        iiso=index_iso(ixt)
-        izone=index_zone(ixt)       
-        outiso=striso(iiso)//strtrac(izone)
-#else
-        write(*,*) 'phyredem 546: ixt,ntiso=', ixt,ntiso
-        stop
-#endif
-     endif !if (ixt.le.niso) then
+      outiso = TRIM(isoName(ixt))
+      i = INDEX(outiso, '_', .TRUE.)
+      outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso))
       write(*,*) 'phyredem 550: ixt,outiso=',ixt,TRIM(outiso)