Changeset 4325 for LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

Timestamp:

Nov 7, 2022, 3:09:43 AM (23 months ago)

Author:

dcugnet

Message:

• simplify the parser usage:
  • the getKey_init routine is now embedded in the readTracersFile routine.
  • the initIsotopes routine is now embedded in the readIsotopesFile routine.
  • the database is now unique, but can be changed using the get/setKeysDBase.
  • the derived types descriptions, originally located in trac_types_mod, are moved to readTracFiles_mod.
  • few checkings moved from infotrac to the routine testIsotopes, contained in the readIsotopesFile function from readTracFiles_mod.
  • the readTracersFiles and readIsotopesFile routines no longer use a tracers/isotopes argument.
• remove tnat and alpha_ideal from infotrac ; use instead getKey to get them where they are used (check_isotopes, dynetat0, iniacademic)
• the trac_type field %Childs is renamed %Children
• move the isoSelect routine and the corresponding variables routine from infotrac and infotrac_phy to readTracFiles_mod
• infotrac_phy routine is now fully independant of the (very similar) routine infotrac (init_infotrac_phy has no arguments left).
• all the explicit keys of the trac_type are now included in the embedded keys database, accessible using the getKey function.
• the getKey/addKey routines are expanded to handle vectors of integers, reals, logicals or strings.
• few subroutines converted into functions with error return value.
• corrections for isotopic tagging tracers mode (to be continued).

File:

• LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -16532 +16532 @@
  USE isotrac_mod, ONLY: strtrac,initialisation_isotrac,index_iso, &
 &       index_zone,izone_init
+ USE readTracFiles_mod, ONLY: newH2Oiso, oldH2Oiso
+ USE strings_mod, ONLY: strIdx, strHead, strTail
+
 #endif
         implicit none
@@ -16563 +16566 @@
         CHARACTER*5 str5
         real xmin,xmax    
-        CHARACTER*50 outiso  
+        CHARACTER*50 outiso, oldIso
         integer lnblnk
         LOGICAL :: found,phyetat0_get,phyetat0_srf
@@ -16585 +16588 @@
    do ixt=1,ntraciso
 
-      outiso=TRIM(isoName(ixt))
-      i = INDEX(outiso, '_', .TRUE.)
-      outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso))
-      write(*,*) 'phyiso_etat0_fichier 16621: ixt,outiso=',ixt,TRIM(outiso)
-
+      outiso = isoName(ixt)
+      k = strIdx(newH2Oiso, strHead(outiso, '_'))
+      oldIso = outiso; IF(k /= 0) oldIso = oldH2Oiso(k)
+      IF(INDEX(outiso, '_') /= 0) THEN
+        outiso = TRIM(outiso)//TRIM(strTail(outiso, '_'))
+        oldIso = TRIM(oldIso)//TRIM(strTail(outiso, '_'))
+      END IF
            
       ! on lit seulement si ixt<=niso ou si on initialise les traceurs d'après
@@ -16598 +16603 @@
 
       found=phyetat0_srf(1,iso_tmp_lonsrf,"XTSNOW"//TRIM(outiso),"Surface snow",0.)
-      if (.NOT.found) CALL abort_physic('isotopes_routines_mod', &
-                            'phyiso_etat0_fichier 16581: variable isotopique not found',1)
+      if (.NOT.found.AND.k/=0) found=phyetat0_srf(1,iso_tmp_lonsrf,"XTSNOW"//TRIM(oldIso),"Surface snow",0.)
+      if (.NOT.found) CALL abort_physic('isotopes_routines_mod', 'phyiso_etat0_fichier 16581: variable isotopique not found',1)
       xtsnow(ixt,:,:)=iso_tmp_lonsrf(:,:)
       
       found=phyetat0_srf(1,iso_tmp_lonsrf,"XTEVAP"//TRIM(outiso),"evaporation",0.)
+      if (.NOT.found.AND.k/=0) found=phyetat0_srf(1,iso_tmp_lonsrf,"XTEVAP"//TRIM(oldIso),"evaporation",0.)
       fxtevap(ixt,:,:)=iso_tmp_lonsrf(:,:)
 
       found=phyetat0_get(1,iso_tmp,"xtrain_f"//TRIM(outiso),"xrain fall",0.)
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp,"xtrain_f"//TRIM(oldIso),"xrain fall",0.)
       xtrain_fall(ixt,:)=iso_tmp(:)
 
       found=phyetat0_get(1,iso_tmp,"xtsnow_f"//TRIM(outiso),"snow fall",0.)
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp,"xtsnow_f"//TRIM(oldIso),"snow fall",0.)
       xtsnow_fall(ixt,:)=iso_tmp(:)
 
       found=phyetat0_get(klev,iso_tmp_lonlev,"XTANCIEN"//TRIM(outiso),"QANCIEN",0.)
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp_lonlev,"XTANCIEN"//TRIM(oldIso),"QANCIEN",0.)
       xt_ancien(ixt,:,:)=iso_tmp_lonlev(:,:)
 
       found=phyetat0_get(klev,iso_tmp_lonlev,"XTLANCIEN"//TRIM(outiso),"QLANCIEN",0.)
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp_lonlev,"XTLANCIEN"//TRIM(oldIso),"QLANCIEN",0.)
       xtl_ancien(ixt,:,:)=iso_tmp_lonlev(:,:)
 
       found=phyetat0_get(klev,iso_tmp_lonlev,"XTSANCIEN"//TRIM(outiso),"QSANCIEN",0.)
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp_lonlev,"XTSANCIEN"//TRIM(oldIso),"QSANCIEN",0.)
       xts_ancien(ixt,:,:)=iso_tmp_lonlev(:,:)
 
       found=phyetat0_get(1,iso_tmp,"XTRUNOFFLIC0"//TRIM(outiso),"RUNOFFLIC0",0.)  
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp,"XTRUNOFFLIC0"//TRIM(oldIso),"RUNOFFLIC0",0.)
       xtrun_off_lic_0(ixt,:)=iso_tmp(:)
 
       found=phyetat0_get(klev,iso_tmp_lonlev,"WAKE_DELTAXT"//TRIM(outiso),"Delta hum. wake/env",0.)  
+      if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp_lonlev,"WAKE_DELTAXT"//TRIM(oldIso),"Delta hum. wake/env",0.)
       wake_deltaxt(ixt,:,:)=iso_tmp_lonlev(:,:)
 
@@ -16666 +16679 @@
        if (ixt.le.niso) then
         found=phyetat0_get(1,iso_tmp,"XTSOL"//TRIM(outiso),"Surface hmidity / bucket",0.)  
+        if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp,"XTSOL"//TRIM(oldIso),"Surface hmidity / bucket",0.)
         xtsol(ixt,:)=iso_tmp(:)
 
         found=phyetat0_get(1,iso_tmp,"Rland_ice"//TRIM(outiso),"R land ice",0.)
+        if (.NOT.found.AND.k/=0) found=phyetat0_get(1,iso_tmp,"Rland_ice"//TRIM(oldIso),"R land ice",0.)
         Rland_ice(ixt,:)=iso_tmp(:)