Changeset 7 for readTracFiles_mod.f90

Timestamp:

Jan 28, 2022, 6:37:28 PM (3 years ago)

Author:

dcugnet

Message:

• Add a function version of the strReduce subroutine.
• Modify delPhase to accomodate old style names for isotopes and isotopic tagging tarcers.
• Add 2 funtions to convert old to new and new to old phases.

File:

• readTracFiles_mod.f90 (modified) (4 diffs)

readTracFiles_mod.f90

@@ -15 +15 @@
 
   PUBLIC :: known_phases, old_phases, nphases, phases_names, &       !--- VARIABLES RELATED TO THE PHASES
-            phases_sep, delPhase, addPhase                           !--- + ROUTINES TO ADD/REMOVE PHASE TO/FROM A NAME
+            phases_sep, delPhase, addPhase, &                        !--- + ROUTINES TO ADD/REMOVE PHASE TO/FROM A NAME
+            old2newPhase, new2oldPhase
 
   PUBLIC :: tran0, idxAncestor, ancestor                             !--- GENERATION 0 TRACER + TOOLS FOR GENERATIONS
@@ -1255 +1256 @@
   CHARACTER(LEN=*), INTENT(IN) :: s
   INTEGER :: l, i, ix
+  CHARACTER(LEN=maxlen) :: sh, st
   out = s
   IF(s == '') RETURN                                                           !--- Empty string: nothing to do
 
   !--- Special case: old phases for water, no phases separator
-  IF(ANY([('H2O'//old_phases(ix:ix), ix=1, nphases)] == s)) THEN; out='H2O'; RETURN; END IF
+  i = INDEX(s,'_'); sh = s; IF(i/=0) sh=s(1:i-1); st='H2O'; IF(i/=0) st='H2O_'//s(i+1:LEN_TRIM(s))
+  IF(ANY([('H2O'//old_phases(ix:ix), ix=1, nphases)] == sh)) THEN; out=st; RETURN; END IF
 
   !--- Index of found phase in "known_phases"
@@ -1300 +1303 @@
 !------------------------------------------------------------------------------------------------------------------------------
 
+CHARACTER(LEN=1) FUNCTION old2newPhase(op) RESULT(np)
+  CHARACTER(LEN=1), INTENT(IN) :: op
+  np = known_phases(INDEX(old_phases,op):INDEX(old_phases,op))
+END FUNCTION old2newPhase
+
+CHARACTER(LEN=1) FUNCTION new2oldPhase(np) RESULT(op)
+  CHARACTER(LEN=1), INTENT(IN) :: np
+  op = old_phases(INDEX(known_phases,np):INDEX(known_phases,np))
+END FUNCTION new2oldPhase
 
 !==============================================================================================================================
@@ -1360 +1372 @@
 
 END MODULE readTracFiles_mod
+