Changeset 2722 for trunk/LMDZ.GENERIC

Timestamp:

Jun 21, 2022, 11:05:45 AM (3 years ago)

Author:

aslmd

Message:

some modifications for call_ice_vap_generic

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• condensation_generic_mod.F90 (modified) (3 diffs)
• generic_tracer_index_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (2 diffs)
• rain_generic.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/condensation_generic_mod.F90

@@ -52 +52 @@
 
         ! to call only one time the ice/vap pair of a tracer
-        logical one_call_ice_vap_generic
+        logical call_ice_vap_generic
 
         INTEGER i, k , nn, iq
@@ -97 +97 @@
         ! Let's loop on tracers 
         do iq=1,nq
-                one_call_ice_vap_generic = .false.
 
-                call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,one_call_ice_vap_generic)
+                call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
 
-                if(one_call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
+                if(call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
                         m=constants_mass(iq)
                         delta_vapH=constants_delta_vapH(iq)
@@ -154 +153 @@
                                 pdqvaplsc(1:ngrid,1,igcm_generic_vap) = (qvap_deep - pq(1:ngrid,1,igcm_generic_vap))/tau - pdq(1:ngrid,1,igcm_generic_vap)
                         endif
-                endif !if(one_call_ice_vap_generic)
+                endif !if(call_ice_vap_generic)
         enddo ! iq=1,nq
 

trunk/LMDZ.GENERIC/libf/phystd/generic_tracer_index_mod.F90

@@ -3 +3 @@
 !======================================================================C
 !
-!     This module is to get back the index of a generic condensable tracer, for both the vap & ice parts of the tracer
+!     This module is to get back the index of a generic condensable tracer
+!     for both the vap & ice parts of the tracer
 !
-!     
+!     call_ice_vap_generic is a boolean which tells if the tracer is condensable
+!     and allows, if it is condensable, to call the vap/ice pair 
+!
+!     Noé Clément & Lucas Teinturier (2022)
 !
 !======================================================================C
@@ -13 +17 @@
     contains
 
-    subroutine generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,one_call_ice_vap_generic)
+    subroutine generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
 
         USE tracer_h, only: noms, is_condensable
         integer nq,iq, igcm_generic_vap, igcm_generic_ice
-        logical one_call_ice_vap_generic
+        logical call_ice_vap_generic
 
         if((is_condensable(iq)==1) .and. (index(noms(iq),"vap") .ne. 0) &
@@ -42 +46 @@
             endif
 
-            one_call_ice_vap_generic = .true.
+            call_ice_vap_generic = .true.
+        
+        else
+
+            call_ice_vap_generic = .false.
 
         end if ! if((is_condensable(iq)==1) .and. (index(noms(iq),"vap") .ne. 0))

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -265 +265 @@
 
       integer l,ig,ierr,iq,nw,isoil,iesp, igcm_generic_vap, igcm_generic_ice
-      logical one_call_ice_vap_generic ! to call only one time the ice/vap pair of a tracer
+      logical call_ice_vap_generic ! to call only one time the ice/vap pair of a tracer
       
       real zls                       ! Solar longitude (radians).
@@ -1609 +1609 @@
                do iq=1,nq
 
-                  one_call_ice_vap_generic = .false.
-
-                  call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,one_call_ice_vap_generic)
+                  call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
                   
-                  if (one_call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
+                  if (call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
 
                      call planetwide_sumval(massarea(:,:)*dq_rain_generic_cld(:,:,igcm_generic_ice)/totarea_planet*RLVTT/cpp,dItot_tmp)

trunk/LMDZ.GENERIC/libf/phystd/rain_generic.F90

@@ -115 +115 @@
 
    ! to call only one time the ice/vap pair of a tracer
-   logical one_call_ice_vap_generic
+   logical call_ice_vap_generic
 
    ! Online functions
@@ -126 +126 @@
    do iq=1,nq
 
-      one_call_ice_vap_generic = .false.
-
-      call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,one_call_ice_vap_generic)
-
-      if(one_call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
+      call generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
+
+      if(call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
 
          ! Let's get the index of our tracers (we look for igcm _generic_vap and igcm_generic_ice)
@@ -468 +466 @@
          dq_rain_generic_cld(1:ngrid,1:nlayer,i_ice_generic) = d_ql(1:ngrid,1:nlayer)/ptimestep
 
-      end if ! if(one_call_ice_vap_generic)
+      end if ! if(call_ice_vap_generic)
 
    end do ! do iq=1,nq loop on tracers