Changeset 4399 for LMDZ6/trunk/libf

Timestamp:

Jan 27, 2023, 12:35:36 AM (23 months ago)

Author:

dcugnet

Message:

Change the names of the water isotopes: no more "and?" separators for atomic numbers.

Location:

LMDZ6/trunk/libf

Files:

• dyn3d/check_isotopes.F90 (modified) (1 diff)
• dyn3dmem/check_isotopes_loc.F90 (modified) (1 diff)
• misc/readTracFiles_mod.f90 (modified) (1 diff)
• phylmdiso/isotopes_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d/check_isotopes.F90

@@ -29 +29 @@
    IF(niso == 0)        RETURN                   !--- No isotopes => finished
    IF(first) THEN
-      iso_eau = strIdx(isoName,'H2[16]O')
-      iso_HDO = strIdx(isoName,'H[2]HO')
-      iso_O18 = strIdx(isoName,'H2[18]O')
-      iso_O17 = strIdx(isoName,'H2[17]O')
-      iso_HTO = strIdx(isoName,'H[3]HO')
+      iso_eau = strIdx(isoName,'H216O')
+      iso_HDO = strIdx(isoName,'HDO')
+      iso_O18 = strIdx(isoName,'H218O')
+      iso_O17 = strIdx(isoName,'H217O')
+      iso_HTO = strIdx(isoName,'HTO')
       IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
       first = .FALSE.

LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F90

@@ -32 +32 @@
    IF(first) THEN
 !$OMP MASTER
-      iso_eau = strIdx(isoName,'H2[16]O')
-      iso_HDO = strIdx(isoName,'H[2]HO')
-      iso_O18 = strIdx(isoName,'H2[18]O')
-      iso_O17 = strIdx(isoName,'H2[17]O')
-      iso_HTO = strIdx(isoName,'H[3]HO')
+      iso_eau = strIdx(isoName,'H216O')
+      iso_HDO = strIdx(isoName,'HDO')
+      iso_O18 = strIdx(isoName,'H218O')
+      iso_O17 = strIdx(isoName,'H217O')
+      iso_HTO = strIdx(isoName,'HTO')
       IF(getKey('tnat', tnat)) CALL abort_gcm(modname, 'missing isotopic parameter', 1)
 !$OMP END MASTER

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -125 +125 @@
 
   !--- CORRESPONDANCE BETWEEN OLD AND NEW WATER NAMES
-  CHARACTER(LEN=maxlen), SAVE :: oldH2OIso(5) = ['eau',     'HDO',     'O18',     'O17',     'HTO'    ]
-  CHARACTER(LEN=maxlen), SAVE :: newH2OIso(5) = ['H2[16]O', 'H[2]HO ', 'H2[18]O', 'H2[17]O', 'H[3]HO ']
+  CHARACTER(LEN=maxlen), SAVE :: oldH2OIso(5) = ['eau',   'HDO',    'O18',   'O17',   'HTO'   ]
+  CHARACTER(LEN=maxlen), SAVE :: newH2OIso(5) = ['H216O', 'HDO   ', 'H218O', 'H217O', 'HTO   ']
 
   !--- CORRESPONDANCE BETWEEN OLD AND NEW HNO3 RELATED SPECIES NAMES

LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90

@@ -174 +174 @@
 
    !--- Type of water isotopes:
-   iso_eau = strIdx(isoName, 'H2[16]O'); CALL msg('iso_eau='//int2str(iso_eau), modname)
-   iso_HDO = strIdx(isoName, 'H[2]HO');  CALL msg('iso_HDO='//int2str(iso_HDO), modname)
-   iso_O18 = strIdx(isoName, 'H2[18]O'); CALL msg('iso_O18='//int2str(iso_O18), modname)
-   iso_O17 = strIdx(isoName, 'H2[17]O'); CALL msg('iso_O17='//int2str(iso_O17), modname)
-   iso_HTO = strIdx(isoName, 'H[3]HO');  CALL msg('iso_HTO='//int2str(iso_HTO), modname)
+   iso_eau = strIdx(isoName, 'H216O'); CALL msg('iso_eau='//int2str(iso_eau), modname)
+   iso_HDO = strIdx(isoName, 'HDO');   CALL msg('iso_HDO='//int2str(iso_HDO), modname)
+   iso_O18 = strIdx(isoName, 'H218O'); CALL msg('iso_O18='//int2str(iso_O18), modname)
+   iso_O17 = strIdx(isoName, 'H217O'); CALL msg('iso_O17='//int2str(iso_O17), modname)
+   iso_HTO = strIdx(isoName, 'HTO');   CALL msg('iso_HTO='//int2str(iso_HTO), modname)
 
    !--- Initialiaation: reading the isotopic parameters.
@@ -246 +246 @@
    ! bugs quand temperature dans ascendances convs est mal calculee
    CALL get_in('cond_temp_env',        cond_temp_env,        .FALSE.)
-   IF(ANY(isoName == 'H[3]HO')) &
+   IF(ANY(isoName == 'HTO')) &
    CALL get_in('ok_prod_nucl_tritium', ok_prod_nucl_tritium, .FALSE., .FALSE.)