Changeset 1647 for trunk/LMDZ.TITAN/libf/phytitan/calc_cpp_mugaz.F90

Timestamp:

Jan 11, 2017, 3:33:51 PM (8 years ago)

Author:

jvatant

Message:

+ Major clean of the new LMDZ.TITAN from too-generic options and routines (water, co2, ocean, surface type ...)
+ From this revision LMDZ.TITAN begins to be really separated from LMDZ.GENERIC
+ Partial desactivation of aerosols, only the dummy case is still enabled to keep the code running ( new aerosol routines to come in followings commits )

JVO

File:

• trunk/LMDZ.TITAN/libf/phytitan/calc_cpp_mugaz.F90 (modified) (2 diffs)

trunk/LMDZ.TITAN/libf/phytitan/calc_cpp_mugaz.F90

@@ -38 +38 @@
          else
             ! all values at 300 K from Engineering Toolbox
-            if(igas.eq.igas_CO2)then
-               mugaz_c = mugaz_c + 44.01*gfrac(igas)
-            elseif(igas.eq.igas_N2)then
+            if(igas.eq.igas_N2)then
                mugaz_c = mugaz_c + 28.01*gfrac(igas)
             elseif(igas.eq.igas_H2)then
                mugaz_c = mugaz_c + 2.01*gfrac(igas)
-            elseif(igas.eq.igas_He)then
-               mugaz_c = mugaz_c + 4.003*gfrac(igas)
-            elseif(igas.eq.igas_H2O)then
-               mugaz_c = mugaz_c + 18.02*gfrac(igas)
-            elseif(igas.eq.igas_SO2)then
-               mugaz_c = mugaz_c + 64.066*gfrac(igas)
-            elseif(igas.eq.igas_H2S)then
-               mugaz_c = mugaz_c + 34.08*gfrac(igas)
             elseif(igas.eq.igas_CH4)then
                mugaz_c = mugaz_c + 16.04*gfrac(igas)
-            elseif(igas.eq.igas_NH3)then
-               mugaz_c = mugaz_c + 17.03*gfrac(igas)
             elseif(igas.eq.igas_C2H6)then 
                ! C2H6 http://encyclopedia.airliquide.com/Encyclopedia.asp?GasID=28
@@ -77 +65 @@
          else
             ! all values at 300 K from Engineering Toolbox
-            if(igas.eq.igas_CO2)then
-               !cpp_c   = cpp_c   + 0.744*gfrac(igas) ! @ ~210 K (better for
-               !Mars conditions) 
-               cpp_c   = cpp_c   + 0.846*gfrac(igas)*44.01/mugaz_c
-            elseif(igas.eq.igas_N2)then
+            if(igas.eq.igas_N2)then
                cpp_c   = cpp_c   + 1.040*gfrac(igas)*28.01/mugaz_c
             elseif(igas.eq.igas_H2)then
                cpp_c   = cpp_c   + 14.31*gfrac(igas)*2.01/mugaz_c
-            elseif(igas.eq.igas_He)then
-               cpp_c   = cpp_c   + 5.19*gfrac(igas)*4.003/mugaz_c
-            elseif(igas.eq.igas_H2O)then
-               cpp_c   = cpp_c   + 1.864*gfrac(igas)*18.02/mugaz_c
-            elseif(igas.eq.igas_SO2)then
-               cpp_c   = cpp_c   + 0.64*gfrac(igas)*64.066/mugaz_c
-            elseif(igas.eq.igas_H2S)then
-               cpp_c   = cpp_c   + 1.003*gfrac(igas)*34.08/mugaz_c ! from wikipedia...
             elseif(igas.eq.igas_CH4)then
                cpp_c   = cpp_c   + 2.226*gfrac(igas)*16.04/mugaz_c
-            elseif(igas.eq.igas_NH3)then
-               cpp_c   = cpp_c   + 2.175*gfrac(igas)*17.03/mugaz_c
-               print*,'WARNING, cpp for NH3 may be for liquid'
             elseif(igas.eq.igas_C2H6)then
                ! C2H6