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

LMDZ6/trunk/libf/phylmdiso/phys_output_mod.F90

@@ -52 +52 @@
 #endif
 #ifdef ISO
-    USE isotopes_mod, ONLY: striso,iso_HTO
+    USE isotopes_mod, ONLY: isoName,iso_HTO
 #ifdef ISOTRAC
     use isotrac_mod, only: index_zone,index_iso,strtrac
@@ -122 +122 @@
 
 #ifdef ISO
-    CHARACTER(LEN=LEN(striso)) :: outiso
+    CHARACTER(LEN=maxlen) :: outiso
     CHARACTER(LEN=20) :: unit
 #endif
@@ -546 +546 @@
     write(*,*) 'phys_output_mid 589'
     do ixt=1,ntraciso
-      if (ixt <= niso) then
-        outiso=striso(ixt)
-      else
-#ifdef ISOTRAC
-        iiso=index_iso(ixt)
-        izone=index_zone(ixt)       
-        outiso=striso(iiso)//strtrac(izone)
-#else
-        write(*,*) 'phys_output_mod 546: ixt,ntraciso=', ixt,ntraciso
-        stop
-#endif
-      endif
+      outiso = TRIM(isoName(ixt))
+      i = INDEX(outiso, '_', .TRUE.)
+      outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso))
 
       flag = [1,  1,  1, 10,  5, 10, 11, 11, 11, 11]; unit = 'kg/(s*m2)'