Changeset 3310 for trunk/LMDZ.GENERIC

Timestamp:

Apr 22, 2024, 4:34:50 PM (8 months ago)

Author:

sglmd

Message:

include updated H2-H2 and H2-He CIA files by G. Milcareck for equilibrium case

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• interpolateH2H2.F90 (modified) (1 diff)
• interpolateH2He.F90 (modified) (6 diffs)

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

@@ -133 +133 @@
          if (is_master) print*,'Initialising H2-H2 continuum from HITRAN database...'
 
-!     1.1 Open the ASCII files and set nS according to version
+         !     1.1 Open the ASCII files and set nS according to version
          ! Only two possible versions for now : 2011 or 2018 (sanity check in inifis_mod)
          if (versH2H2cia.eq.2011) then
-           nS = 2428
-           if (H2orthopara_mixture.eq."normal") then
-             dt_file=TRIM(datadir)//'/continuum_data/H2-H2_norm_2011.cia'
-           else if (H2orthopara_mixture.eq."equilibrium") then
-             dt_file=TRIM(datadir)//'/continuum_data/H2-H2_eq_2011.cia'
-           else if (H2orthopara_mixture.eq."hot") then 
-            dt_file=TRIM(datadir)//'/continuum_data/H2-H2_2011_extended.cia'
-            ns = 800
-           endif
-         else if (versH2H2cia.eq.2018) then
-           nS = 9600
-           if (H2orthopara_mixture.eq."normal") then
-             dt_file=TRIM(datadir)//'/continuum_data/H2-H2_norm_2018.cia'
-           else if (H2orthopara_mixture.eq."equilibrium") then
-             dt_file=TRIM(datadir)//'/continuum_data/H2-H2_eq_2018.cia'
-           endif
-         endif
+            nS = 2428
+            if (H2orthopara_mixture.eq."normal") then
+               dt_file=TRIM(datadir)//'/continuum_data/H2-H2_norm_2011.cia'
+            else if (H2orthopara_mixture.eq."equilibrium") then
+               dt_file=TRIM(datadir)//'/continuum_data/H2-H2_eq_2011.cia'
+            else if (H2orthopara_mixture.eq."hot") then 
+               dt_file=TRIM(datadir)//'/continuum_data/H2-H2_2011_extended.cia'
+               ns = 800
+            endif
+         else if (versH2H2cia.eq.2018 .and. H2orthopara_mixture.eq."normal") then
+            nS = 9600
+            dt_file=TRIM(datadir)//'/continuum_data/H2-H2_norm_2018.cia'
+         else if (versH2H2cia.eq.2018 .and. H2orthopara_mixture.eq."equilibrium") then
+            nS = 10860
+            dt_file=TRIM(datadir)//'/continuum_data/H2-H2_eq_0-15000cm-1_40-400K.cia'
+         endif
+      
 
          if(.not.allocated(wn_arr))  allocate(wn_arr(nS)) 

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

@@ -46 +46 @@
       logical firstcall
 
-      save wn_arr, temp_arr, abs_arr !read by master
+      save ns, wn_arr, temp_arr, abs_arr !read by master
 
       character*100 dt_file
@@ -64 +64 @@
       if (H2orthopara_mixture .eq. "hot") then ! .and. (temp .gt. 3000.0)) then 
         ! print*,"We're in the Hot Jupiter case "
-        nS = 19981
         if (ztemp .gt. 9900) then
           if (strictboundcia) then
@@ -86 +85 @@
         endif ! temp .gt. 9900
       else !not in Hot Jupiter case
-        nS = 2428
         if(ztemp.gt.400)then
           if (strictboundcia) then
@@ -128 +126 @@
       endif ! of (H2orthopara_mixture .eq. "hot") 
 
-      if (.not. allocated(wn_arr)) allocate(wn_arr(nS))
-      if (.not. allocated(abs_arr)) allocate(abs_arr(nS,nT))
 
       amagatH2 = (273.15/temp)*(presH2/101325.0)
@@ -140 +136 @@
 !     1.1 Open the ASCII files
          if (H2orthopara_mixture.eq."normal") then
-           dt_file=TRIM(datadir)//'/continuum_data/H2-He_norm_2011.cia'
+            nS = 2428
+            dt_file=TRIM(datadir)//'/continuum_data/H2-He_norm_2011.cia'
          else if (H2orthopara_mixture.eq."equilibrium") then
-           dt_file=TRIM(datadir)//'/continuum_data/H2-He_eq_2011.cia'
+            nS = 1501
+            dt_file=TRIM(datadir)//'/continuum_data/H2-He_eq_0-15000cm-1_40-400K.cia'
          else if (H2orthopara_mixture .eq. "hot") then !we use a dataset than can go as high as 9900 K
-          dt_file=TRIM(datadir)//'/continuum_data/H2-He_2011.cia'
+            nS = 19981
+            dt_file=TRIM(datadir)//'/continuum_data/H2-He_2011.cia'
          endif
+
+         if (.not. allocated(wn_arr)) allocate(wn_arr(nS))
+         if (.not. allocated(abs_arr)) allocate(abs_arr(nS,nT))
+
          
 !$OMP MASTER
@@ -190 +193 @@
            print*,'   and He partial pressure     ',presHe,' Pa'
          endif
-      endif
+      endif !! if (firstcall)
 
          call bilinearbig(nS,nT,wn_arr,temp_arr,abs_arr,wn,ztemp,abcoef,ind)