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

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -16525 +16525 @@
       !USE write_field_phy
       USE indice_sol_mod, only: nbsrf  
-  USE isotopes_mod, ONLY: striso,iso_HDO,iso_eau
+  USE isotopes_mod, ONLY: isoName,iso_HDO,iso_eau
 #ifdef ISOVERIF
   USE isotopes_verif_mod
@@ -16563 +16563 @@
         CHARACTER*5 str5
         real xmin,xmax    
-        CHARACTER*50 striso_sortie  
+        CHARACTER*50 outiso  
         integer lnblnk
         LOGICAL :: found,phyetat0_get,phyetat0_srf
@@ -16581 +16581 @@
    write(*,*) 'phyiso_etat0_fichier 3'
    write(*,*) 'niso=',niso
-   write(*,*) 'striso(1)=',striso(1)
+   write(*,*) 'isoName(1)='//TRIM(isoName(1))
 
    do ixt=1,ntraciso
 
-     if (ixt.le.niso) then
-        striso_sortie=striso(ixt)
-     else
-#ifdef ISOTRAC
-        iiso=index_iso(ixt)
-        izone=index_zone(ixt)       
-        striso_sortie=striso(iiso)//strtrac(izone)
-#else
-        write(*,*) 'phyredem 546: ixt,ntraciso=', ixt,ntraciso
-        stop
-#endif
-     endif !if (ixt.le.niso) then
-     write(*,*) 'phyiso_etat0_fichier 16621: ixt,striso_sortie=',ixt,striso_sortie(1:lnblnk(striso_sortie))
+      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)
 
            
@@ -16606 +16597 @@
 #endif
 
-      found=phyetat0_srf(1,iso_tmp_lonsrf,"XTSNOW"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &     "Surface snow",0.)
-      if (.NOT.found) then
-        CALL abort_physic('isotopes_routines_mod', &
-                'phyiso_etat0_fichier 16581: variable isotopique not found',1)
-      endif
+      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)
       xtsnow(ixt,:,:)=iso_tmp_lonsrf(:,:)
       
-      found=phyetat0_srf(1,iso_tmp_lonsrf,"XTEVAP"//striso_sortie &
-     &   (1:lnblnk(striso_sortie)),"evaporation",0.)
+      found=phyetat0_srf(1,iso_tmp_lonsrf,"XTEVAP"//TRIM(outiso),"evaporation",0.)
       fxtevap(ixt,:,:)=iso_tmp_lonsrf(:,:)
 
-      found=phyetat0_get(1,iso_tmp,"xtrain_f"//striso_sortie &
-     &   (1:lnblnk(striso_sortie)),"xrain fall",0.)
+      found=phyetat0_get(1,iso_tmp,"xtrain_f"//TRIM(outiso),"xrain fall",0.)
       xtrain_fall(ixt,:)=iso_tmp(:)
 
-      found=phyetat0_get(1,iso_tmp,"xtsnow_f"//striso_sortie &
-     &   (1:lnblnk(striso_sortie)),"snow fall",0.)
+      found=phyetat0_get(1,iso_tmp,"xtsnow_f"//TRIM(outiso),"snow fall",0.)
       xtsnow_fall(ixt,:)=iso_tmp(:)
 
-      found=phyetat0_get(klev,iso_tmp_lonlev,"XTANCIEN"//striso_sortie &
-     &       (1:lnblnk(striso_sortie)),"QANCIEN",0.)
+      found=phyetat0_get(klev,iso_tmp_lonlev,"XTANCIEN"//TRIM(outiso),"QANCIEN",0.)
       xt_ancien(ixt,:,:)=iso_tmp_lonlev(:,:)
 
-      found=phyetat0_get(klev,iso_tmp_lonlev,"XTLANCIEN"//striso_sortie &
-     &       (1:lnblnk(striso_sortie)),"QLANCIEN",0.)
+      found=phyetat0_get(klev,iso_tmp_lonlev,"XTLANCIEN"//TRIM(outiso),"QLANCIEN",0.)
       xtl_ancien(ixt,:,:)=iso_tmp_lonlev(:,:)
 
-      found=phyetat0_get(klev,iso_tmp_lonlev,"XTSANCIEN"//striso_sortie &
-     &       (1:lnblnk(striso_sortie)),"QSANCIEN",0.)
+      found=phyetat0_get(klev,iso_tmp_lonlev,"XTSANCIEN"//TRIM(outiso),"QSANCIEN",0.)
       xts_ancien(ixt,:,:)=iso_tmp_lonlev(:,:)
 
-
-      found=phyetat0_get(1,iso_tmp,"XTRUNOFFLIC0"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &          "RUNOFFLIC0",0.)  
+      found=phyetat0_get(1,iso_tmp,"XTRUNOFFLIC0"//TRIM(outiso),"RUNOFFLIC0",0.)  
       xtrun_off_lic_0(ixt,:)=iso_tmp(:)
 
-
-      found=phyetat0_get(klev,iso_tmp_lonlev,"WAKE_DELTAXT"//striso_sortie &
-     &   (1:lnblnk(striso_sortie)),"Delta hum. wake/env",0.)  
+      found=phyetat0_get(klev,iso_tmp_lonlev,"WAKE_DELTAXT"//TRIM(outiso),"Delta hum. wake/env",0.)  
       wake_deltaxt(ixt,:,:)=iso_tmp_lonlev(:,:)
 
@@ -16687 +16665 @@
        ! ces variables n'ont pas de traceurs:
        if (ixt.le.niso) then
-        found=phyetat0_get(1,iso_tmp,"XTSOL"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &     "Surface hmidity / bucket",0.)  
+        found=phyetat0_get(1,iso_tmp,"XTSOL"//TRIM(outiso),"Surface hmidity / bucket",0.)  
         xtsol(ixt,:)=iso_tmp(:)
 
-        found=phyetat0_get(1,iso_tmp,"Rland_ice"//striso_sortie &
-     &     (1:lnblnk(striso_sortie)),"R land ice",0.)
+        found=phyetat0_get(1,iso_tmp,"Rland_ice"//TRIM(outiso),"R land ice",0.)
         Rland_ice(ixt,:)=iso_tmp(:)