Changeset 4143 for LMDZ6/trunk/libf/dyn3dmem/vlspltgen_loc.F

Timestamp:

May 9, 2022, 12:35:40 PM (2 years ago)

Author:

dcugnet

Message:

• Some variables are renamed or replaced by direct equivalents:
  • iso_indnum -> tracers(:)%iso_iName
  • niso_possibles -> niso
  • iqiso -> iqIsoPha ; index_trac -> itZonIso
  • ok_iso_verif -> isoCheck
  • ntraceurs_zone -> nzone ; ntraciso -> ntiso
  • qperemin -> min_qparent ; masseqmin -> min_qmass ; ratiomin -> min_ratio
• Some renamed variables are only aliased with the older name (using USE <module>, ONLY: <oldName> => <newName>) in routines where they are repeated many times.
• Few hard-coded indexes are now computed (examples: ilic, iso, ivap, irneb, iq_vap, iq_liq, iso_H2O, iso_HDO, iso_HTO, iso_O17, iso_O18).
• The IF(isoCheck) test is now embedded in the check_isotopes_seq and check_isotopes_loc routines (lighter calling).

File:

• LMDZ6/trunk/libf/dyn3dmem/vlspltgen_loc.F (modified) (11 diffs)

LMDZ6/trunk/libf/dyn3dmem/vlspltgen_loc.F

@@ -28 +28 @@
       USE VAMPIR
       ! CRisi: on rajoute variables utiles d'infotrac  
-      USE infotrac, ONLY : nqtot, tracers,ok_iso_verif
+      USE infotrac, ONLY : nqtot, tracers, isoCheck
       USE vlspltgen_mod
       USE comconst_mod, ONLY: cpp
@@ -191 +191 @@
       ijb=ij_begin
       ije=ij_end  
-      if (ok_iso_verif) then
-        call check_isotopes(zq,ijb,ije,'vlspltgen_loc 191')
-      endif !if (ok_iso_verif) then   
+      call check_isotopes(zq,ijb,ije,'vlspltgen_loc 191')
 
 c$OMP BARRIER           
@@ -285 +283 @@
       if (pole_nord) ijb=ij_begin
       if (pole_sud)  ije=ij_end  
-      if (ok_iso_verif) then
-           call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 280')
-      endif !if (ok_iso_verif) then
+      call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 280')
 
       do iq=1,nqtot
@@ -328 +324 @@
 
       
-      if (ok_iso_verif) then
+      IF(isoCheck) THEN
            call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 326')
            ijb=ij_begin-2*iip1
@@ -335 +331 @@
            if (pole_sud)  ije=ij_end
            call check_isotopes(zq,ijb,ije,'vlspltgen_loc 336')
-      endif !if (ok_iso_verif) then  
+      END IF
 
       do iq = 1, nqtot
@@ -355 +351 @@
        enddo
 
-      if (ok_iso_verif) then
-           call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 357')
-      endif !if (ok_iso_verif) then
+      call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 357')
 
       do iq = 1, nqtot
@@ -416 +410 @@
 
 
-      if (ok_iso_verif) then
-           call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 429')
-      endif !if (ok_iso_verif) then 
+      call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 429')
 
 c$OMP BARRIER
@@ -461 +453 @@
 
       !write(*,*) 'vlspltgen_loc 494'
-      if (ok_iso_verif) then
-           call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 461')
-      endif !if (ok_iso_verif) then
+      call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 461')
 
       do iq=1,nqtot
@@ -481 +471 @@
        enddo !do iq=1,nqtot
 
-      if (ok_iso_verif) then
-           call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 493')
-      endif !if (ok_iso_verif) then
+      call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 493')
 
       do iq=1,nqtot
@@ -504 +492 @@
 
       !write(*,*) 'vlspltgen 550: apres derniere serie de call vlx'
-      if (ok_iso_verif) then
-           call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 521')
-      endif !if (ok_iso_verif) then
+      call check_isotopes(zq,ij_begin,ij_end,'vlspltgen_loc 521')
      
       ijb=ij_begin
@@ -541 +527 @@
       ENDDO !DO iq=1,nqtot
         
-      if (ok_iso_verif) then
-           call check_isotopes(q,ij_begin,ij_end,'vlspltgen_loc 557')
-      endif !if (ok_iso_verif) then
+      call check_isotopes(q,ij_begin,ij_end,'vlspltgen_loc 557')
 
 c$OMP BARRIER