Changeset 2520 for trunk/LMDZ.GENERIC/libf

Timestamp:

May 12, 2021, 2:45:26 PM (4 years ago)

Author:

Guillaume Chaverot

Message:

update of the H2O continuum

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• callkeys_mod.F90 (modified) (1 diff)
• inifis_mod.F90 (modified) (1 diff)
• interpolateH2O_self_foreign.F90 (added)
• interpolateH2Ocont_CKD.F90 (deleted)
• interpolateH2Ocont_PPC.F90 (deleted)
• optci.F90 (modified) (2 diffs)
• optcv.F90 (modified) (2 diffs)
• sugas_corrk.F90 (modified) (2 diffs)

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

@@ -10 +10 @@
       logical,save :: callstats,calleofdump
 !$OMP THREADPRIVATE(callstats,calleofdump)
-      logical,save :: callgasvis,continuum,H2Ocont_simple,graybody
-!$OMP THREADPRIVATE(callgasvis,continuum,H2Ocont_simple,graybody)
+      logical,save :: callgasvis,continuum,graybody
+!$OMP THREADPRIVATE(callgasvis,continuum,graybody)
       logical,save :: strictboundcorrk                                     
 !$OMP THREADPRIVATE(strictboundcorrk)

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

@@ -265 +265 @@
      call getin_p("continuum",continuum)
      write(*,*) " continuum = ",continuum
-
-     write(*,*) "use analytic function for H2O continuum ?"
-     H2Ocont_simple=.false. ! default value
-     call getin_p("H2Ocont_simple",H2Ocont_simple)
-     write(*,*) " H2Ocont_simple = ",H2Ocont_simple
  
      write(*,*) "version for H2H2 CIA file ?"

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

@@ -14 +14 @@
   use gases_h, only: gfrac, ngasmx, igas_N2, igas_He, igas_H2O, igas_H2
   use comcstfi_mod, only: g, r, mugaz
-  use callkeys_mod, only: kastprof,continuum,graybody,H2Ocont_simple
+  use callkeys_mod, only: kastprof,continuum,graybody
   implicit none
 
@@ -205 +205 @@
                  enddo
 
-              elseif(igas.eq.igas_H2O.and.T_cont.gt.200.0)then
-
+              elseif(igas.eq.igas_H2O.and.T_cont.gt.100.0)then
+                 ! Compute self and foreign (with air) continuum of H2O 
                  p_air = dble(PMID(k)*scalep) - p_cont ! note assumes background is air!
-                 if(H2Ocont_simple)then
-                    call interpolateH2Ocont_PPC(wn_cont,T_cont,p_cont,p_air,dtemp,.false.)
-                 else
-                    interm = indi(nw,igas,igas)
-                    call interpolateH2Ocont_CKD(wn_cont,T_cont,p_cont,p_air,dtemp,.false.,interm)
-                    indi(nw,igas,igas) = interm
-                 endif
+                 interm = indi(nw,igas,igas)
+                 call interpolateH2O_self_foreign(wn_cont,T_cont,p_cont,p_air,dtemp,.false.,interm) ! MTCKD v3.3
+                 indi(nw,igas,igas) = interm
 
               endif

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

@@ -13 +13 @@
   use gases_h, only: gfrac, ngasmx, igas_H2, igas_H2O, igas_He, igas_N2
   use comcstfi_mod, only: g, r, mugaz
-  use callkeys_mod, only: kastprof,continuum,graybody,H2Ocont_simple,callgasvis
+  use callkeys_mod, only: kastprof,continuum,graybody,callgasvis
 
   implicit none
@@ -214 +214 @@
                  enddo
 
-              elseif(igas.eq.igas_H2O.and.T_cont.gt.200.0)then
-
+              elseif(igas.eq.igas_H2O.and.T_cont.gt.100.0)then
+                 ! Compute self and foreign (with air) continuum of H2O 
                  p_air = dble(PMID(k)*scalep) - p_cont ! note assumes background is air!
-                 if(H2Ocont_simple)then
-                    call interpolateH2Ocont_PPC(wn_cont,T_cont,p_cont,p_air,dtemp,.false.)
-                 else
-                    interm = indv(nw,igas,igas)
-                    call interpolateH2Ocont_CKD(wn_cont,T_cont,p_cont,p_air,dtemp,.false.,interm)
-                    indv(nw,igas,igas) = interm
-                 endif
+                 interm = indv(nw,igas,igas)
+                 call interpolateH2O_self_foreign(wn_cont,T_cont,p_cont,p_air,dtemp,.false.,interm) ! MTCKD v3.3
+                 indv(nw,igas,igas) = interm
 
               endif

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

@@ -32 +32 @@
       use ioipsl_getin_p_mod, only: getin_p
       use callkeys_mod, only: varactive,varfixed,graybody,callgasvis,&
-                continuum,H2Ocont_simple
+                continuum
       implicit none
 
@@ -643 +643 @@
          elseif (igas .eq. igas_H2O) then
 
-            ! H2O is special 
-            if(H2Ocont_simple)then
-               call interpolateH2Ocont_PPC(990.D+0,296.D+0,683.2D+0*2,0.D+0,testcont,.true.)
-            else
-               dummy = -9999
-               call interpolateH2Ocont_CKD(990.D+0,296.D+0,683.2D+0*2,0.D+0,testcont,.true.,dummy)
-            endif
+            ! Compute self and foreign (with air) continuum of H2O 
+            dummy = -9999
+            call interpolateH2O_self_foreign(990.D+0,296.D+0,683.2D+0*2,0.D+0,testcont,.true.,dummy)  
 
          endif