Changeset 3275 for trunk/LMDZ.PLUTO/libf/phypluto/generic_tracer_index_mod.F90

Timestamp:

Mar 20, 2024, 3:05:14 PM (8 months ago)

Author:

afalco

Message:

Pluto PCM:
Changed _vap to _gas;
Included surfprop.F90;
callcorrk includes methane
AF

Location:

trunk/LMDZ.PLUTO/libf/phypluto

Files:

• . (modified) (1 prop)
• generic_tracer_index_mod.F90 (modified) (5 diffs)

trunk/LMDZ.PLUTO/libf/phypluto/generic_tracer_index_mod.F90

@@ -6 +6 @@
 !     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 
+!     call_ice_gas_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)
@@ -17 +17 @@
     contains
 
-    subroutine generic_tracer_index(nq,iq,igcm_generic_vap,igcm_generic_ice,call_ice_vap_generic)
+    subroutine generic_tracer_index(nq,iq,igcm_generic_gas,igcm_generic_ice,call_ice_gas_generic)
 
         USE tracer_h, only: noms, is_condensable
-        integer nq,iq, igcm_generic_vap, igcm_generic_ice, i_shortname, ii
-        logical call_ice_vap_generic
+        integer nq,iq, igcm_generic_gas, igcm_generic_ice, i_shortname, ii
+        logical call_ice_gas_generic
         character(len=10) :: shortname
-        if((is_condensable(iq)==1) .and. (index(noms(iq),"vap") .ne. 0) &
+        if((is_condensable(iq)==1) .and. (index(noms(iq),"gas") .ne. 0) &
                                                     .and. (index(noms(iq),"h2o") .eq. 0) .and. (index(noms(iq),"n2") .eq. 0)) then
-            ! Let's get the index of our tracers (we look for igcm _generic_vap and igcm_generic_ice)
+            ! Let's get the index of our tracers (we look for igcm _generic_gas and igcm_generic_ice)
 
-            igcm_generic_vap = iq
+            igcm_generic_gas = iq
             igcm_generic_ice = -1
 
@@ -46 +46 @@
             ! ! endif
 
-            ! ! call_ice_vap_generic = .true.
+            ! ! call_ice_gas_generic = .true.
             i_shortname = index(noms(iq),'_')-1
             shortname=noms(iq)(1:i_shortname)
@@ -59 +59 @@
             endif
             ! if we didn't find it before, we look after the vap tracer in pq
-            if (igcm_generic_ice .eq. -1 .and. (iq<nq)) then 
+            if (igcm_generic_ice .eq. -1 .and. (iq<nq)) then
                 do ii=iq+1,nq
-                    if (index(noms(ii),adjustl(trim(shortname))) .ne. 0) then 
+                    if (index(noms(ii),adjustl(trim(shortname))) .ne. 0) then
                         igcm_generic_ice=ii
                         exit
@@ -67 +67 @@
                 enddo
             endif
-            call_ice_vap_generic = .true.
+            call_ice_gas_generic = .true.
         else
 
-            call_ice_vap_generic = .false.
+            call_ice_gas_generic = .false.
 
         end if ! if((is_condensable(iq)==1) .and. (index(noms(iq),"vap") .ne. 0))